diff -pruN 2.6-3/build.xml 2.6-3ubuntu1/build.xml
--- 2.6-3/build.xml	2011-01-13 23:05:11.000000000 +0000
+++ 2.6-3ubuntu1/build.xml	2011-12-14 15:54:17.000000000 +0000
@@ -30,7 +30,7 @@
     <property file="${basedir}/build.properties"/>
     <property file="${basedir}/default.properties"/>
     <!-- The Sun Javadoc for versions prior to 1.3 are off-line. -->
-    <property name="jdk.javadoc" value="http://java.sun.com/j2se/1.3/docs/api/"/>
+    <property name="jdk.javadoc" value="file:///usr/share/doc/default-jdk-doc/api/"/>
 
     <!-- ========== Construct compile classpath =============================== -->
     <path id="compile.classpath">
@@ -52,8 +52,12 @@
         <filter token="version" value="${component.version}"/>
         <filter token="compile.source" value="${compile.source}"/>
         <filter token="compile.target" value="${compile.target}"/>
+        <filter token="lastmodified" value="${lastmodified}"/>
         <mkdir dir="${build.home}"/>
         <available property="jdk.1.5.present" classname="java.lang.StringBuilder"/>
+        <copy todir="${build.home}/conf" filtering="on">
+               <fileset dir="${conf.home}" includes="*.MF"/>
+        </copy>
     </target>
 
     <!-- ========== Compile Targets ========================================= -->
@@ -159,18 +163,7 @@
         <mkdir dir="${build.home}/classes/META-INF"/>
         <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
         <copy file="NOTICE.txt"  tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
-        <jar jarfile="${build.home}/${final.name}.jar">
-            <manifest>
-                <attribute name="Specification-Title" value="Commons Lang"/>
-                <attribute name="Specification-Version" value="${component.version}"/>
-                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
-                <attribute name="Implementation-Title" value="Commons Lang"/>
-                <attribute name="Implementation-Version" value="${component.version}"/> 
-                <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-                <attribute name="Implementation-Vendor-Id" value="org.apache"/>
-                <attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
-                <attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
-            </manifest>
+        <jar jarfile="${build.home}/${final.name}.jar" manifest="${build.home}/conf/MANIFEST.MF">
             <fileset dir="${build.home}/classes">
                 <include name="**/*.class"/>
                 <include name="**/LICENSE.txt"/>
diff -pruN 2.6-3/debian/build-classpath 2.6-3ubuntu1/debian/build-classpath
--- 2.6-3/debian/build-classpath	2011-11-13 23:40:09.000000000 +0000
+++ 2.6-3ubuntu1/debian/build-classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/usr/share/java/junit.jar
diff -pruN 2.6-3/debian/changelog 2.6-3ubuntu1/debian/changelog
--- 2.6-3/debian/changelog	2011-12-04 01:59:42.000000000 +0000
+++ 2.6-3ubuntu1/debian/changelog	2011-12-14 13:49:41.000000000 +0000
@@ -1,3 +1,10 @@
+libcommons-lang-java (2.6-3ubuntu1) precise; urgency=low
+
+  * Revert to 2.6-1 packaging, as 2.6-2 would pull in a plethora of Java/maven
+    libraries into main.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 14 Dec 2011 14:48:44 +0100
+
 libcommons-lang-java (2.6-3) unstable; urgency=low
 
   * Team upload.
diff -pruN 2.6-3/debian/commons-lang.bnd 2.6-3ubuntu1/debian/commons-lang.bnd
--- 2.6-3/debian/commons-lang.bnd	2011-11-13 23:40:09.000000000 +0000
+++ 2.6-3ubuntu1/debian/commons-lang.bnd	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-version=VERSION
-Extension-Name: commons-lang
-Package: org.apache.commons.lang
-Export-Package: org.apache.commons.lang;version=${version},\
-	org.apache.commons.lang.*;version=${version}
-Import-Package: *
-Bundle-Version: ${version}
-Bundle-Description: Commons Lang, a package of Java utility classes for \
-  the classes that are in java.lang's hierarchy, or are considered to \
-  be so standard as to justify existence in java.lang.
-Bundle-Name: Commons Lang
-Bundle-DocURL: http://commons.apache.org/lang/
-Bundle-Vendor: The Apache Software Foundation
-Bundle-SymbolicName: org.apache.commons.lang
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
diff -pruN 2.6-3/debian/compat 2.6-3ubuntu1/debian/compat
--- 2.6-3/debian/compat	2011-11-13 23:40:09.000000000 +0000
+++ 2.6-3ubuntu1/debian/compat	2009-07-02 12:07:30.000000000 +0000
@@ -1 +1 @@
-7
+6
diff -pruN 2.6-3/debian/control 2.6-3ubuntu1/debian/control
--- 2.6-3/debian/control	2011-12-04 01:55:14.000000000 +0000
+++ 2.6-3ubuntu1/debian/control	2011-12-14 13:49:43.000000000 +0000
@@ -1,10 +1,11 @@
 Source: libcommons-lang-java
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror@gmx.de>, Kumar Appaiah <akumar@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), default-jdk, maven-repo-helper (>= 1.7), ant
-Build-Depends-Indep: libcommons-parent-java (>= 12), junit (>= 3.8.1), bnd, default-jdk-doc
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: Arnaud Vandyck <avdyk@debian.org>, Michael Koch <konqueror@gmx.de>, Kumar Appaiah <akumar@debian.org>
+Build-Depends: debhelper (>= 6), cdbs, default-jdk
+Build-Depends-Indep: maven-repo-helper, ant, junit (>= 3.8.1), default-jdk-doc
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-lang-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-lang-java
@@ -12,9 +13,8 @@ Homepage: http://commons.apache.org/lang
 
 Package: libcommons-lang-java
 Architecture: all
-Depends: ${misc:Depends}, libcommons-parent-java (>= 12)
-Suggests: libcommons-lang-java-doc
-Description: Commons Lang - an extension of the java.lang package
+Depends: ${misc:Depends}
+Description: Extension of the java.lang package
  The Lang Component contains a set of Java classes that provide helper
  methods for standard Java classes, especially those found in the
  java.lang package in the Sun JDK. The following classes are included:
@@ -38,8 +38,8 @@ Package: libcommons-lang-java-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libcommons-lang-java, default-jdk-doc
-Description: Documentation for Commons Lang - an extension of the java.lang package
+Suggests: default-jdk-doc
+Description: Documentation for an extension of the java.lang package
  The Lang Component contains a set of Java classes that provide helper
  methods for standard Java classes, especially those found in the
  java.lang package in the Sun JDK. The following classes are included:
diff -pruN 2.6-3/debian/copyright 2.6-3ubuntu1/debian/copyright
--- 2.6-3/debian/copyright	2011-11-13 23:40:09.000000000 +0000
+++ 2.6-3ubuntu1/debian/copyright	2009-07-02 12:07:30.000000000 +0000
@@ -1,16 +1,43 @@
-Format: http://dep.debian.net/deps/dep5/
-Upstream-Name: Commons Lang
-Source: http://commons.apache.org/lang/
+This package was debianized by Arnaud Vandyck <arnaud.vandyck@ulg.ac.be> on
+Tue,  1 Jul 2003 14:43:32 +0200.
 
-Files: *
-Copyright: 2001-2010, The Apache Software Foundation
-License: Apache-2.0
+It was downloaded from http://commons.apache.org/lang/
 
-Files: debian/*
-Copyright: 2003, Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
-           2010, Ludovic Claude <ludovic.claude@laposte.net>
-License: Apache-2.0
+Upstream Authors: Daniel Rall <dlr@finemaltcoding.com>,
+                  Stephen Colebourne <scolebourne@joda.org>,
+                  Henri Yandell <bayard@apache.org>,
+                  Steven Caswell <stevencaswell@apache.org>,
+                  Robert Burrell Donkin <rdonkin@apache.org>,
+                  Gary D. Gregory <ggregory@seagullsw.com>,
+                  Phil Steitz <phil@steitz.com>,
+                  Fredrik Westermarck,
+                  James Carman <jcarman@apache.org>,
+                  Niall Pemberton, Matt Benson, C. Scott Ananian, Chris Audley,
+                  Stephane Bailliez, Michael Becke, Ola Berg, Nathan Beyer,
+                  Stefan Bodewig, Janek Bogucki, Mike Bowler, Sean Brown,
+                  Alexander Day Chaffee, Al Chou, Greg Coladonato,
+                  Maarten Coene, Justin Couch, Michael Davey, Norm Deane,
+                  Ringo De Smet, Russel Dittmar, Steve Downey, Matthias Eichel,
+                  Christopher Elkins, Chris Feldhacker, Pete Gieser,
+                  Jason Gritman, Matthew Hawthorne, Michael Heuer,
+                  Oliver Heger, Chris Hyzer, Marc Johnson, Shaun Kalley,
+                  Tetsuya Kaneuchi, Nissim Karpenstein, Ed Korthof,
+                  Holger Krauth, Rafal Krupinski, Rafal Krzewski,
+                  Craig R. McClanahan, Rand McNeely, Dave Meikle,
+                  Nikolay Metchev, Kasper Nielsen, Tim O'Brien,
+                  Brian S O'Neill, Andrew C. Oliver, Alban Peignier,
+                  Moritz Petersen, Dmitri Plotnikov, Neeme Praks, Eric Pugh,
+                  Stephen Putman, Travis Reeder, Antony Riley, Scott Sanders,
+                  Ralph Schaer, Henning P. Schmiedehausen, Sean Schofield,
+                  Reuben Sivan, Ville Skytta, Jan Sorensen, Glen Stampoultzis,
+                  Scott Stanchfield, Jon S. Stevens, Sean C. Sullivan,
+                  Ashwin Suresh, Helge Tesgaard, Arun Mammen Thomas,
+                  Masato Tezuka, Jeff Varszegi, Chris Webb, Mario Winterer,
+                  Stepan Koltsov, Holger Hoffstatte
 
-License: Apache-2.0
-  On Debian GNU/Linux system you can find the complete text of the
-  Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
+Copyright: 2001-2008 The Apache Software Foundation
+
+License: Apache 2.0
+
+On Debian systems the full text of the Apache License can be found
+in `/usr/share/common-licenses/Apache-2.0'.
diff -pruN 2.6-3/debian/libcommons-lang-java-doc.doc-base 2.6-3ubuntu1/debian/libcommons-lang-java-doc.doc-base
--- 2.6-3/debian/libcommons-lang-java-doc.doc-base	1970-01-01 00:00:00.000000000 +0000
+++ 2.6-3ubuntu1/debian/libcommons-lang-java-doc.doc-base	2009-07-02 12:07:30.000000000 +0000
@@ -0,0 +1,11 @@
+Document: libcommons-lang-java
+Title: Programmer API for Commons Lang
+Author: Apache Commons Lang developers
+Abstract: The Lang Component contains a set of Java classes that provide helper
+ methods for standard Java classes, especially those found in the
+ java.lang package in the Sun JDK.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcommons-lang-java-doc/api/index.html
+Files: /usr/share/doc/libcommons-lang-java-doc/api/*
diff -pruN 2.6-3/debian/libcommons-lang-java-doc.doc-base.api 2.6-3ubuntu1/debian/libcommons-lang-java-doc.doc-base.api
--- 2.6-3/debian/libcommons-lang-java-doc.doc-base.api	2011-11-13 23:40:09.000000000 +0000
+++ 2.6-3ubuntu1/debian/libcommons-lang-java-doc.doc-base.api	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-Document: libcommons-lang-java
-Title: Programmer API for Commons Lang
-Author: Apache Commons Lang developers
-Abstract: The Lang Component contains a set of Java classes that provide helper
- methods for standard Java classes, especially those found in the
- java.lang package in the Sun JDK.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libcommons-lang-java/api/index.html
-Files: /usr/share/doc/libcommons-lang-java/api/*
diff -pruN 2.6-3/debian/libcommons-lang-java-doc.docs 2.6-3ubuntu1/debian/libcommons-lang-java-doc.docs
--- 2.6-3/debian/libcommons-lang-java-doc.docs	1970-01-01 00:00:00.000000000 +0000
+++ 2.6-3ubuntu1/debian/libcommons-lang-java-doc.docs	2011-08-02 16:51:38.000000000 +0000
@@ -0,0 +1 @@
+build/api
diff -pruN 2.6-3/debian/libcommons-lang-java-doc.install 2.6-3ubuntu1/debian/libcommons-lang-java-doc.install
--- 2.6-3/debian/libcommons-lang-java-doc.install	2011-11-13 23:40:09.000000000 +0000
+++ 2.6-3ubuntu1/debian/libcommons-lang-java-doc.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-target/apidocs/* usr/share/doc/libcommons-lang-java/api
diff -pruN 2.6-3/debian/libcommons-lang-java-doc.poms 2.6-3ubuntu1/debian/libcommons-lang-java-doc.poms
--- 2.6-3/debian/libcommons-lang-java-doc.poms	2011-11-13 23:40:09.000000000 +0000
+++ 2.6-3ubuntu1/debian/libcommons-lang-java-doc.poms	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-#   --ignore: ignore this POM or
-#   --no-parent: remove the <parent> tag from the POM
-#   --package=<package>: an alternative package to use when installing this POM
-#      and its artifact
-#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-#      of the version for the package.
-#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
-#      during a clean operation with mh_cleanpom or mh_installpom
-#   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install
-#   --java-lib: install the jar into /usr/share/java to comply with Debian
-#      packaging guidelines
-#   --usj-name=<name>: name to use when installing the library in /usr/share/java
-#   --usj-version=<version>: version to use when installing the library in /usr/share/java
-#   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar
-#   it will be installed with mh_install.
-#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-#   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
-#     temporarily for certain artifacts such as Javadoc jars.
-#
-pom.xml --ignore-pom --has-package-version --artifact=target/commons-lang-*-javadoc.jar --classifier=javadoc
diff -pruN 2.6-3/debian/libcommons-lang-java.poms 2.6-3ubuntu1/debian/libcommons-lang-java.poms
--- 2.6-3/debian/libcommons-lang-java.poms	2011-11-13 23:40:09.000000000 +0000
+++ 2.6-3ubuntu1/debian/libcommons-lang-java.poms	2009-07-02 12:07:30.000000000 +0000
@@ -1,27 +1 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-#   --ignore: ignore this POM or
-#   --no-parent: remove the <parent> tag from the POM
-#   --package=<package>: an alternative package to use when installing this POM
-#      and its artifact
-#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-#      of the version for the package.
-#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
-#      during a clean operation with mh_cleanpom or mh_installpom
-#   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install
-#   --java-lib: install the jar into /usr/share/java to comply with Debian
-#      packaging guidelines
-#   --usj-name=<name>: name to use when installing the library in /usr/share/java
-#   --usj-version=<version>: version to use when installing the library in /usr/share/java
-#   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar
-#   it will be installed with mh_install.
-#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-#   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
-#     temporarily for certain artifacts such as Javadoc jars.
-#
-pom.xml --has-package-version --artifact=target/commons-lang.bnd.jar --java-lib
-
+pom.xml --no-parent
diff -pruN 2.6-3/debian/maven.ignoreRules 2.6-3ubuntu1/debian/maven.ignoreRules
--- 2.6-3/debian/maven.ignoreRules	2011-11-13 23:40:09.000000000 +0000
+++ 2.6-3ubuntu1/debian/maven.ignoreRules	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-# Maven ignore rules - ignore some Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM
-#   junit junit jar s/3\\..*/3.x/
-
-org.apache.maven.plugins maven-assembly-plugin * * * *
diff -pruN 2.6-3/debian/maven.rules 2.6-3ubuntu1/debian/maven.rules
--- 2.6-3/debian/maven.rules	2011-11-13 23:40:09.000000000 +0000
+++ 2.6-3ubuntu1/debian/maven.rules	2009-07-02 12:07:30.000000000 +0000
@@ -1,20 +1,2 @@
-# Maven rules - transform Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-#   in this case, elements that match are transformed using
-#   the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-#   junit junit jar s/3\\..*/3.x/
+junit junit jar s/3\..*/3.x/
 
-junit junit jar s/3\..*/3.x/ * *
-org.apache.commons commons-parent pom s/.*/debian/ * *
diff -pruN 2.6-3/debian/patches/OSGi_Manifest.patch 2.6-3ubuntu1/debian/patches/OSGi_Manifest.patch
--- 2.6-3/debian/patches/OSGi_Manifest.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.6-3ubuntu1/debian/patches/OSGi_Manifest.patch	2011-08-02 20:02:40.000000000 +0000
@@ -0,0 +1,94 @@
+Description: Add OSGi metadata
+Author: Ludovic Claude <ludovic.claude@laposte.net>
+Forwarded: no
+Last-Update: 2011-08-02
+
+--- libcommons-lang-java-2.6.orig/build.xml
++++ libcommons-lang-java-2.6/build.xml
+@@ -30,7 +30,7 @@
+     <property file="${basedir}/build.properties"/>
+     <property file="${basedir}/default.properties"/>
+     <!-- The Sun Javadoc for versions prior to 1.3 are off-line. -->
+-    <property name="jdk.javadoc" value="http://java.sun.com/j2se/1.3/docs/api/"/>
++    <property name="jdk.javadoc" value="file:///usr/share/doc/default-jdk-doc/api/"/>
+ 
+     <!-- ========== Construct compile classpath =============================== -->
+     <path id="compile.classpath">
+@@ -52,8 +52,12 @@
+         <filter token="version" value="${component.version}"/>
+         <filter token="compile.source" value="${compile.source}"/>
+         <filter token="compile.target" value="${compile.target}"/>
++        <filter token="lastmodified" value="${lastmodified}"/>
+         <mkdir dir="${build.home}"/>
+         <available property="jdk.1.5.present" classname="java.lang.StringBuilder"/>
++        <copy todir="${build.home}/conf" filtering="on">
++               <fileset dir="${conf.home}" includes="*.MF"/>
++        </copy>
+     </target>
+ 
+     <!-- ========== Compile Targets ========================================= -->
+@@ -159,18 +163,7 @@
+         <mkdir dir="${build.home}/classes/META-INF"/>
+         <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+         <copy file="NOTICE.txt"  tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+-        <jar jarfile="${build.home}/${final.name}.jar">
+-            <manifest>
+-                <attribute name="Specification-Title" value="Commons Lang"/>
+-                <attribute name="Specification-Version" value="${component.version}"/>
+-                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
+-                <attribute name="Implementation-Title" value="Commons Lang"/>
+-                <attribute name="Implementation-Version" value="${component.version}"/> 
+-                <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+-                <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+-                <attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
+-                <attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
+-            </manifest>
++        <jar jarfile="${build.home}/${final.name}.jar" manifest="${build.home}/conf/MANIFEST.MF">
+             <fileset dir="${build.home}/classes">
+                 <include name="**/*.class"/>
+                 <include name="**/LICENSE.txt"/>
+--- /dev/null
++++ libcommons-lang-java-2.6/src/conf/MANIFEST.MF
+@@ -0,0 +1,42 @@
++Manifest-Version: 1.0
++Package: org.apache.commons.lang
++Extension-Name: commons-lang
++Specification-Version: @version@
++Specification-Vendor: The Apache Software Foundation
++Specification-Title: Commons Lang
++Implementation-Version: @version@
++Implementation-Vendor: The Apache Software Foundation
++Implementation-Title: Commons Lang
++Implementation-Vendor-Id: org.apache
++X-Compile-Source-JDK: @compile.source@
++X-Compile-Target-JDK: @compile.target@
++Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
++Import-Package: org.apache.commons.lang;version="@version@",
++ org.apache.commons.lang.builder;version="@version@",
++ org.apache.commons.lang.enum;version="@version@",
++ org.apache.commons.lang.enums;version="@version@",
++ org.apache.commons.lang.exception;version="@version@",
++ org.apache.commons.lang.math;version="@version@",
++ org.apache.commons.lang.mutable;version="@version@",
++ org.apache.commons.lang.text;version="@version@",
++ org.apache.commons.lang.time;version="@version@"
++Bnd-LastModified: @lastmodified@
++Export-Package: org.apache.commons.lang.math;version="@version@",
++ org.apache.commons.lang.enums;version="@version@",
++ org.apache.commons.lang.builder;version="@version@",
++ org.apache.commons.lang.exception;version="@version@",
++ org.apache.commons.lang.enum;version="@version@",
++ org.apache.commons.lang.mutable;version="@version@",
++ org.apache.commons.lang.text;version="@version@",
++ org.apache.commons.lang.time;version="@version@",
++ org.apache.commons.lang;version="@version@"
++Bundle-Version: @version@
++Bundle-Description: Commons Lang, a package of Java utility classes fo
++ r the classes that are in java.lang's hierarchy, or are considered
++  to be so standard as to justify existence in java.lang.
++Bundle-Name: Commons Lang
++Bundle-DocURL: http://commons.apache.org/lang/
++Bundle-ManifestVersion: 2
++Bundle-Vendor: The Apache Software Foundation
++Bundle-SymbolicName: org.apache.commons.lang
++Tool: Bnd-0.0.238
diff -pruN 2.6-3/debian/patches/series 2.6-3ubuntu1/debian/patches/series
--- 2.6-3/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 2.6-3ubuntu1/debian/patches/series	2009-07-02 12:07:30.000000000 +0000
@@ -0,0 +1 @@
+OSGi_Manifest.patch
diff -pruN 2.6-3/debian/rules 2.6-3ubuntu1/debian/rules
--- 2.6-3/debian/rules	2011-11-13 23:40:09.000000000 +0000
+++ 2.6-3ubuntu1/debian/rules	2011-08-02 16:51:38.000000000 +0000
@@ -1,19 +1,28 @@
 #!/usr/bin/make -f
 
-DEB_SOURCE_PACKAGE   := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
-DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//')
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
 
-export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done)
-
-%:
-	dh $@ --buildsystem=ant --with maven_repo_helper
-
-override_dh_auto_build:
-	ANT_ARGS="-Dbasedir=$(realpath .) -Djdk.javadoc=file:///usr/share/doc/default-jdk-doc/api/ jar javadoc javadoc-jar" dh_auto_build
-	cat debian/commons-lang.bnd | sed s/VERSION/$(DEB_UPSTREAM_VERSION)/ > debian/.commons-lang-versioned.bnd
-	echo debian/.commons-lang-versioned.bnd >> debian/.mh_clean
-	bnd wrap -properties debian/.commons-lang-versioned.bnd -output target/commons-lang.bnd.jar target/commons-lang-$(DEB_UPSTREAM_VERSION).jar
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := junit
+DEB_ANT_BUILD_TARGET := jar javadoc
+LAST_MODIFIED        := $(shell date +%s%N | cut -c -13)
+DEB_ANT_ARGS         := -Dlastmodified=$(LAST_MODIFIED)
+
+common-post-build-indep::
+	mv build/apidocs build/api
+
+install/libcommons-lang-java::
+	mh_installpoms -p$(PACKAGE)
+	mh_installjar -p$(PACKAGE) -l pom.xml build/commons-lang-$(VERSION).jar
+
+clean::
+	-rm gjdoc_rawcomment.cache
+	-rm -rf docs/api/*
+	-rm -rf debian/tmp
+	mh_clean
 
 get-orig-source:
 	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
diff -pruN 2.6-3/.pc/applied-patches 2.6-3ubuntu1/.pc/applied-patches
--- 2.6-3/.pc/applied-patches	1970-01-01 00:00:00.000000000 +0000
+++ 2.6-3ubuntu1/.pc/applied-patches	2011-12-14 15:54:17.000000000 +0000
@@ -0,0 +1 @@
+OSGi_Manifest.patch
diff -pruN 2.6-3/.pc/OSGi_Manifest.patch/build.xml 2.6-3ubuntu1/.pc/OSGi_Manifest.patch/build.xml
--- 2.6-3/.pc/OSGi_Manifest.patch/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ 2.6-3ubuntu1/.pc/OSGi_Manifest.patch/build.xml	2011-01-13 23:05:11.000000000 +0000
@@ -0,0 +1,258 @@
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+ -->
+<!--
+   "Lang" component of the Apache Commons Subproject
+   $Id: build.xml 918244 2010-03-02 23:07:02Z sebb $
+-->
+<project name="Lang" default="compile" basedir=".">
+
+    <!-- ========== Initialize Properties ===================================== -->
+    <property file="${user.home}/${component.name}.build.properties"/>
+    <property file="${user.home}/build.properties"/>
+    <property file="${basedir}/build.properties"/>
+    <property file="${basedir}/default.properties"/>
+    <!-- The Sun Javadoc for versions prior to 1.3 are off-line. -->
+    <property name="jdk.javadoc" value="http://java.sun.com/j2se/1.3/docs/api/"/>
+
+    <!-- ========== Construct compile classpath =============================== -->
+    <path id="compile.classpath">
+        <pathelement location="${build.home}/classes"/>
+    </path>
+
+    <!-- ========== Construct unit test classpath ============================= -->
+    <path id="test.classpath">
+        <pathelement location="${build.home}/classes"/>
+        <pathelement location="${build.home}/tests"/>
+        <pathelement location="${junit.jar}"/>
+    </path>
+
+    <!-- ========== Executable Targets ======================================== -->
+    <target name="init" description="Initialize and evaluate conditionals">
+        <echo message="-------- ${component.name} ${component.version} --------"/>
+        <filter token="name" value="${component.name}"/>
+        <filter token="package" value="${component.package}"/>
+        <filter token="version" value="${component.version}"/>
+        <filter token="compile.source" value="${compile.source}"/>
+        <filter token="compile.target" value="${compile.target}"/>
+        <mkdir dir="${build.home}"/>
+        <available property="jdk.1.5.present" classname="java.lang.StringBuilder"/>
+    </target>
+
+    <!-- ========== Compile Targets ========================================= -->
+    <target name="compile" depends="init" description="Compile shareable components">
+        <mkdir dir="${build.home}/classes"/>
+        <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}">
+            <classpath refid="compile.classpath"/>
+        </javac>
+        <copy todir="${build.home}/classes" filtering="on">
+            <fileset dir="${source.home}" excludes="**/*.java"/>
+        </copy>
+    </target>
+
+    <!-- Compile EnumUtilsLang76Test using source/target 1.5 if JDK 1.5 present (see LANG-76) -->
+    <target name="test.compile.jdk15" depends="compile" description="Run test for LANG-76" if="jdk.1.5.present">
+        <echo message="Compiling EnumUtilsLang76Test using source/target 1.5"/>
+        <mkdir dir="${build.home}/tests"/>
+        <javac srcdir="${test.home}" destdir="${build.home}/tests"
+               target="1.5" source="1.5"
+               includes="org/apache/commons/lang/enums/EnumUtilsLang76Test.java">
+            <classpath refid="test.classpath"/>
+        </javac>
+    </target>
+
+    <target name="compile.tests" depends="compile,test.compile.jdk15" description="Compile unit test cases">
+        <mkdir dir="${build.home}/tests"/>
+        <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}">
+            <exclude name="org/apache/commons/lang/enums/EnumUtilsLang76Test.java" if="jdk.1.5.present"/>
+            <classpath refid="test.classpath"/>
+        </javac>
+        <copy todir="${build.home}/tests" filtering="on">
+            <fileset dir="${test.home}" excludes="**/*.java"/>
+        </copy>
+    </target>
+
+    <!-- ========== Unit Tests ========================================= -->
+    <target name="test" depends="compile.tests" description="Run all unit test cases">
+        <echo message="Running unit tests ..."/>
+        <mkdir dir="${build.home}/test-reports"/>
+        <junit printsummary="true" showoutput="true" fork="yes" haltonfailure="${test.failonerror}">
+            <classpath refid="test.classpath"/>
+            <formatter type="plain" usefile="true" />
+            <!-- If test.entry is defined, run a single test, otherwise run all valid tests -->
+            <test name="${test.entry}" todir="${build.home}/test-reports" if="test.entry"/>
+            <batchtest fork="yes" todir="${build.home}/test-reports" unless="test.entry">
+                <fileset dir="${test.home}">
+                    <include name="**/*Test.java"/>
+                    <exclude name="**/Abstract*Test.java"/>
+                    <exclude name="**/EntitiesPerformanceTest.java"/>
+                    <exclude name="**/RandomUtilsFreqTest.java"/>
+                </fileset>
+            </batchtest>
+        </junit>
+    </target>
+
+    <!--
+     RandomUtils frequency tests have been put in a separate test case which
+     is only run when using this target because it fails too frequently.
+     See https://issues.apache.org/jira/browse/LANG-592
+     -->
+    <target name="test-random-freq" depends="compile.tests" description="Run RandomUtilsFreqTest">
+        <echo message="Running RandomUtilsFreqTest unit test ..."/>
+        <mkdir dir="${build.home}/test-reports"/>
+        <junit printsummary="true" showoutput="true" fork="yes" haltonfailure="${test.failonerror}">
+            <classpath refid="test.classpath"/>
+            <formatter type="plain" usefile="true" />
+            <test name="org.apache.commons.lang.math.RandomUtilsFreqTest" todir="${build.home}/test-reports"/>
+        </junit>
+    </target>
+
+    <target name="clean" description="Clean build and distribution directories">
+        <delete dir="${build.home}"/>
+    </target>
+
+    <target name="all" depends="clean,test,compile" description="Clean and compile all components"/>
+
+    <!-- ========== JavaDocs ========================================= -->
+    <target name="javadoc" depends="compile" description="Create component Javadoc documentation">
+        <mkdir dir="${build.home}"/>
+        <mkdir dir="${build.home}/apidocs"/>
+        <tstamp>
+            <format property="current.year" pattern="yyyy"/>
+        </tstamp>
+        <javadoc sourcepath="${source.home}" 
+                 destdir="${build.home}/apidocs" 
+                 overview="${source.home}/org/apache/commons/lang/overview.html" 
+                 packagenames="org.apache.commons.*" 
+                 excludepackagenames="${javadoc.excludepackagenames}" 
+                 author="false" 
+                 version="true" 
+                 doctitle="&lt;h1&gt;Commons Lang ${component.version}&lt;/h1&gt;"
+                 windowtitle="Lang ${component.version}" 
+                 bottom="Copyright &amp;copy; 2001-${current.year} - Apache Software Foundation" 
+                 use="true" 
+                 link="${jdk.javadoc}" 
+                 source="${compile.source}">
+            <classpath refid="compile.classpath"/>
+        </javadoc>
+    </target>
+
+    <!-- ========== Jar Targets ========================================= -->
+    <target name="jar" depends="compile" description="Create jar">
+        <mkdir dir="${build.home}/classes/META-INF"/>
+        <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+        <copy file="NOTICE.txt"  tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+        <jar jarfile="${build.home}/${final.name}.jar">
+            <manifest>
+                <attribute name="Specification-Title" value="Commons Lang"/>
+                <attribute name="Specification-Version" value="${component.version}"/>
+                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Implementation-Title" value="Commons Lang"/>
+                <attribute name="Implementation-Version" value="${component.version}"/> 
+                <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+                <attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
+                <attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
+            </manifest>
+            <fileset dir="${build.home}/classes">
+                <include name="**/*.class"/>
+                <include name="**/LICENSE.txt"/>
+                <include name="**/NOTICE.txt"/>
+            </fileset>
+        </jar>
+    </target>
+
+    <target name="javadoc-jar" depends="javadoc" description="Create JavaDoc jar">
+        <jar jarfile="${build.home}/${final.name}-javadoc.jar">
+            <manifest>
+                <attribute name="Specification-Title" value="Commons Lang API"/>
+                <attribute name="Specification-Version" value="${component.version}"/>
+                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Implementation-Title" value="Commons Lang API"/>
+                <attribute name="Implementation-Version" value="${component.version}"/> 
+                <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+            </manifest>
+            <fileset dir="${build.home}/apidocs"/>
+            <fileset dir="${basedir}">
+                <include name="LICENSE.txt"/>
+                <include name="NOTICE.txt"/>
+            </fileset>
+        </jar>
+    </target>
+
+    <target name="source-jar" depends="init" description="Create JavaDoc jar">
+        <jar jarfile="${build.home}/${final.name}-sources.jar">
+            <manifest>
+                <attribute name="Specification-Title" value="Commons Lang Source"/>
+                <attribute name="Specification-Version" value="${component.version}"/>
+                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Implementation-Title" value="Commons Lang Source"/>
+                <attribute name="Implementation-Version" value="${component.version}"/> 
+                <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+            </manifest>
+            <fileset dir="${source.home}">
+                <include name="**/*.java"/>
+            </fileset>
+            <fileset dir="${basedir}">
+                <include name="LICENSE.txt"/>
+                <include name="NOTICE.txt"/>
+            </fileset>
+        </jar>
+    </target>
+
+    <!-- ========== Distribution ========================================= -->
+    <target name="dist" depends="clean,jar,source-jar,javadoc-jar" description="Create binary distribution">
+
+        <!-- binary distro -->
+        <zip destfile="${build.home}/${final.name}.zip">
+            <zipfileset dir="${basedir}" prefix="${final.name}"
+                      includes="LICENSE.txt,
+                                NOTICE.txt,
+                                RELEASE-NOTES.txt"
+             />
+            <zipfileset dir="${build.home}" includes="*.jar," prefix="${final.name}"/>
+            <zipfileset dir="${build.home}/apidocs" prefix="${final.name}/apidocs"/>
+        </zip>
+        <tar destfile="${build.home}/${final.name}.tar.gz" compression="gzip">
+            <zipfileset src="${build.home}/${final.name}.zip"/>
+        </tar>
+
+        <!-- source distro -->
+        <zip destfile="${build.home}/${final.name}-src.zip">
+            <zipfileset dir="${basedir}" prefix="${final.name}-src"
+                      includes="build.xml,
+                                build.xml,
+                                checkstyle.xml,
+                                default.properties,
+                                LICENSE.txt,
+                                NOTICE.txt,
+                                pom.xml,
+                                RELEASE-NOTES.txt"
+             />
+            <zipfileset dir="${basedir}/src"   prefix="${final.name}-src/src"/>
+        </zip>
+        <tar destfile="${build.home}/${final.name}-src.tar.gz" compression="gzip">
+            <zipfileset src="${build.home}/${final.name}-src.zip"/>
+        </tar>
+
+    </target>
+</project>
diff -pruN 2.6-3/src/conf/MANIFEST.MF 2.6-3ubuntu1/src/conf/MANIFEST.MF
--- 2.6-3/src/conf/MANIFEST.MF	1970-01-01 00:00:00.000000000 +0000
+++ 2.6-3ubuntu1/src/conf/MANIFEST.MF	2011-12-14 15:54:17.000000000 +0000
@@ -0,0 +1,42 @@
+Manifest-Version: 1.0
+Package: org.apache.commons.lang
+Extension-Name: commons-lang
+Specification-Version: @version@
+Specification-Vendor: The Apache Software Foundation
+Specification-Title: Commons Lang
+Implementation-Version: @version@
+Implementation-Vendor: The Apache Software Foundation
+Implementation-Title: Commons Lang
+Implementation-Vendor-Id: org.apache
+X-Compile-Source-JDK: @compile.source@
+X-Compile-Target-JDK: @compile.target@
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: org.apache.commons.lang;version="@version@",
+ org.apache.commons.lang.builder;version="@version@",
+ org.apache.commons.lang.enum;version="@version@",
+ org.apache.commons.lang.enums;version="@version@",
+ org.apache.commons.lang.exception;version="@version@",
+ org.apache.commons.lang.math;version="@version@",
+ org.apache.commons.lang.mutable;version="@version@",
+ org.apache.commons.lang.text;version="@version@",
+ org.apache.commons.lang.time;version="@version@"
+Bnd-LastModified: @lastmodified@
+Export-Package: org.apache.commons.lang.math;version="@version@",
+ org.apache.commons.lang.enums;version="@version@",
+ org.apache.commons.lang.builder;version="@version@",
+ org.apache.commons.lang.exception;version="@version@",
+ org.apache.commons.lang.enum;version="@version@",
+ org.apache.commons.lang.mutable;version="@version@",
+ org.apache.commons.lang.text;version="@version@",
+ org.apache.commons.lang.time;version="@version@",
+ org.apache.commons.lang;version="@version@"
+Bundle-Version: @version@
+Bundle-Description: Commons Lang, a package of Java utility classes fo
+ r the classes that are in java.lang's hierarchy, or are considered
+  to be so standard as to justify existence in java.lang.
+Bundle-Name: Commons Lang
+Bundle-DocURL: http://commons.apache.org/lang/
+Bundle-ManifestVersion: 2
+Bundle-Vendor: The Apache Software Foundation
+Bundle-SymbolicName: org.apache.commons.lang
+Tool: Bnd-0.0.238