[SCM] felix-main packaging branch, master, updated. debian/2.0.5-2-13-gb29eee4

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 032bae1dcf4419610ee1b333a77488d113e04687
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sat Nov 5 14:40:09 2011 +0100

    No default versions..

diff --git a/debian/changelog b/debian/changelog
index 0dda0fb..5374fa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ felix-main (4.0.1-1) UNRELEASED; urgency=low
   [ Damien Raude-Morvan ]
   * New upstream release.
   * d/watch: fix for upstream tarball new name.
+  * d/patches/default_version.diff: Drop, not needed anymore.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 05 Nov 2011 14:25:16 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 05 Nov 2011 15:39:44 +0100
 
 felix-main (2.0.5-2) unstable; urgency=low
 
diff --git a/debian/patches/default_version.diff b/debian/patches/default_version.diff
deleted file mode 100644
index 7e59169..0000000
--- a/debian/patches/default_version.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/pom.xml
-+++ b/pom.xml
-@@ -109,10 +109,10 @@
-   <properties>
-     <log.level>1</log.level>
-     <dollar>$</dollar>
--    <framework.version>2.0.5</framework.version>
--    <shell.version>1.4.2</shell.version>
--    <shell.tui.version>1.4.1</shell.tui.version>
--    <obr.version>1.4.3</obr.version>
-+    <framework.version>debian</framework.version>
-+    <shell.version>debian</shell.version>
-+    <shell.tui.version>debian</shell.tui.version>
-+    <obr.version>debian</obr.version>
-   </properties>
-   <profiles>
-     <profile>
diff --git a/debian/patches/series b/debian/patches/series
index f52496f..1274845 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 # Only for bootstrapping
 #bootstrap_packaging_jar.diff
-default_version.diff
+#default_version.diff

-- 
felix-main packaging