[SCM] felix-main packaging branch, master, updated. debian/2.0.5-1-5-ge8bb1d2

[Damien Raude-Morvan]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "felix-main packaging".

The branch, master has been updated
       via  e8bb1d246caf0574dd1a270d0a7b04ef8cbd26e5 (commit)
       via  2af6798a07eb0879d99b5626b6286fd880750aab (commit)
      from  092057252b0463db367770104f7d7cfc228a39cd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e8bb1d246caf0574dd1a270d0a7b04ef8cbd26e5
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun May 8 18:16:56 2011 +0200

    Can't unapply-patches because of mh_patchpom call on pom.xml

commit 2af6798a07eb0879d99b5626b6286fd880750aab
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun May 8 18:16:38 2011 +0200

    debian/source/local-options: Fix wrong option for dpkg-source.

-----------------------------------------------------------------------

Summary of changes:
 debian/source/local-options |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/source/local-options b/debian/source/local-options
index 433806b..f74dd46 100644
--- a/debian/source/local-options
+++ b/debian/source/local-options
@@ -1,2 +1,3 @@
-unapply-patches
-abort-on-uptream-changes
+# Can't unapply-patches because of mh_patchpom call on pom.xml
+#unapply-patches
+abort-on-upstream-changes


hooks/post-receive
-- 
felix-main packaging