[SCM] eclipse-wtp packaging branch, master, updated. debian/3.4.2-2-1-ga672047

[Jakub Adam]

The following commit has been merged in the master branch:
commit a6720477a831523867f7a1c51f8402e27172ea55
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Jun 3 17:42:34 2013 +0200

    Don't specify version of orbit dependency org.apache.commons.logging
    
    Fixes FTBFS with updated libcommons-logging-java (Closes: #710805).

diff --git a/debian/changelog b/debian/changelog
index ef0604d..6305289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+eclipse-wtp (3.4.2-3) UNRELEASED; urgency=low
+
+  * Don't specify version of orbit dependency org.apache.commons.logging
+    to fix FTBFS (Closes: #710805).
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 03 Jun 2013 17:40:00 +0200
+
 eclipse-wtp (3.4.2-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index 7de0be3..4cb5034 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -24,10 +24,10 @@ Subject: debian-custom-build
  .../META-INF/MANIFEST.MF                           |    2 +-
  org.eclipse.wst.xml_core.feature/feature.xml       |   18 +-
  org.eclipse.wst.xml_ui.feature/feature.xml         |    6 +-
- org.eclipse.wst.xsl.feature/feature.xml            |    8 +-
+ org.eclipse.wst.xsl.feature/feature.xml            |   10 +-
  .../schema/processor.exsd                          |    2 +-
  org.eclipse.wst.xsl.xalan/plugin.xml               |    2 +-
- 24 files changed, 191 insertions(+), 224 deletions(-)
+ 24 files changed, 192 insertions(+), 225 deletions(-)
 
 diff --git a/org.eclipse.wst.jsdt.debug.rhino.ui/META-INF/MANIFEST.MF b/org.eclipse.wst.jsdt.debug.rhino.ui/META-INF/MANIFEST.MF
 index 7c72fd4..25bfcf8 100644
@@ -202,7 +202,7 @@ index 8f5488f..6aae09b 100644
   org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
   org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
 diff --git a/org.eclipse.wst.ws_core.feature/feature.xml b/org.eclipse.wst.ws_core.feature/feature.xml
-index e764d1d..163dcbc 100644
+index e764d1d..0413532 100644
 --- a/org.eclipse.wst.ws_core.feature/feature.xml
 +++ b/org.eclipse.wst.ws_core.feature/feature.xml
 @@ -1,155 +1,145 @@
@@ -446,7 +446,7 @@ index e764d1d..163dcbc 100644
 +         id="org.apache.commons.logging"
 +         download-size="0"
 +         install-size="0"
-+         version="1.0.4.qualifier"
++         version="0.0.0"
 +         unpack="false"/>
 +
 +   <plugin
@@ -698,9 +698,18 @@ index 32fc2f0..23f0183 100644
     <includes
           id="org.eclipse.wst.xml_userdoc.feature"
 diff --git a/org.eclipse.wst.xsl.feature/feature.xml b/org.eclipse.wst.xsl.feature/feature.xml
-index 448b2db..74fa092 100644
+index 448b2db..0d7b634 100644
 --- a/org.eclipse.wst.xsl.feature/feature.xml
 +++ b/org.eclipse.wst.xsl.feature/feature.xml
+@@ -81,7 +81,7 @@
+          id="org.apache.commons.logging"
+          download-size="0"
+          install-size="0"
+-         version="1.0.4.qualifier"
++         version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
 @@ -105,19 +105,19 @@
           version="0.0.0"
           unpack="false"/>

-- 
eclipse-wtp packaging