[SCM] Guice: lightweight dependency injection framework for Java 5 and above branch, master, updated. debian/3.0-1-1-g18dab92

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit 18dab92a962861d0e1eab650eefcd8fa728c3d2d
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Mon Aug 13 19:23:55 2012 -0430

    Enable assistedinject extension

diff --git a/debian/changelog b/debian/changelog
index 604aba7..16e5347 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+guice (3.0-2) UNRELEASED; urgency=low
+
+  * Enable assistedinject extension. (Closes: #683644).
+  * Add Build-Depends on libjarjar-java.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Mon, 13 Aug 2012 19:23:09 -0430
+
 guice (3.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #579121)
diff --git a/debian/control b/debian/control
index ec27d73..4cfa62d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Miguel Landaeta <miguel at miguel.cc>
 Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.32), default-jdk, ant,
  maven-debian-helper, libatinject-jsr330-api-java, libaopalliance-java,
- libcglib-java, libasm3-java, bnd, default-jdk-doc
+ libcglib-java, libasm3-java, bnd, default-jdk-doc, libjarjar-java
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-java/guice.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/guice.git
diff --git a/debian/libguice-java.poms b/debian/libguice-java.poms
index eb25847..09a13bc 100644
--- a/debian/libguice-java.poms
+++ b/debian/libguice-java.poms
@@ -1 +1,3 @@
 core/pom.xml --no-parent
+extensions/pom.xml
+extensions/assistedinject/pom.xml
diff --git a/debian/patches/03_extensions-assistedinject.diff b/debian/patches/03_extensions-assistedinject.diff
new file mode 100644
index 0000000..a00b211
--- /dev/null
+++ b/debian/patches/03_extensions-assistedinject.diff
@@ -0,0 +1,44 @@
+Description: Enable build of assistedinject extension
+Author: Miguel Landaeta <miguel at miguel.cc>
+Bug-Debian: http://bugs.debian.org/683644
+Forwarded: no
+Last-Update: 2012-08-09
+
+--- guice-3.0.orig/extensions/assistedinject/build.properties
++++ guice-3.0/extensions/assistedinject/build.properties
+@@ -5,3 +5,4 @@ build.dir=build
+ test.class=com.google.inject.assistedinject.FactoryProviderTest
+ module=com.google.inject.assistedinject
+ fragment=true
++debian.lib.dir=/usr/share/java
+--- guice-3.0.orig/extensions/assistedinject/build.xml
++++ guice-3.0/extensions/assistedinject/build.xml
+@@ -5,8 +5,9 @@
+   <import file="../../common.xml"/>
+   
+   <path id="compile.classpath">
+-    <fileset dir="${lib.dir}" includes="*.jar"/>
+-    <fileset dir="${lib.dir}/build" includes="*.jar"/>
++    <fileset dir="${debian.lib.dir}">
++        <include name="atinject-jsr330-api.jar"/>
++    </fileset>
+     <pathelement path="../../build/classes"/>
+   </path>
+ 
+--- guice-3.0.orig/common.xml
++++ guice-3.0/common.xml
+@@ -139,11 +139,11 @@
+     <mkdir dir="${build.dir}/dist"/>
+     <dirname property="common.basedir" file="${ant.file.common}"/>
+     <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
+-        classpath="${common.basedir}/lib/build/jarjar-snapshot.jar"/>
++        classpath="${debian.lib.dir}/jarjar.jar"/>
+     <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
+       <fileset dir="${build.dir}/classes"/>
+-      <zipfileset src="${common.basedir}/lib/build/cglib-2.2.1-snapshot.jar"/>
+-      <zipfileset src="${common.basedir}/lib/build/asm-3.1.jar"/>
++      <zipfileset src="${debian.lib.dir}/cglib.jar"/>
++      <zipfileset src="${debian.lib.dir}/asm3.jar"/>
+       <rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/>
+       <rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib. at 1.$@2"/>
+       <rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/>
diff --git a/debian/patches/series b/debian/patches/series
index 6ac912c..4afc842 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_fix_build.diff
 02_link_javadocs.diff
+03_extensions-assistedinject.diff
diff --git a/debian/rules b/debian/rules
index d9376cd..6d93e8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,19 +9,24 @@ VERSION := \$(shell dpkg-parsechangelog | grep ^Version: | sed -r 's/^.*:\ (.*)-
 override_dh_auto_build:
 	dh_auto_build
 	ant -Dversion=$(VERSION) jar javadoc
+	# build assistedinject extension
+	cd extensions/assistedinject && ant -Dversion=$(VERSION) jar
 
 override_dh_auto_install:
 	dh_auto_install
-#	mh_installjar -plibguice-java --set-version=$(VERSION) -l -v \
-#
-	mh_installjar -plibguice-java -l --usj-version=$(VERSION) \
+	# install main jar
+	mh_installjar -plibguice-java --set-version=$(VERSION) -l -v \
 		core/pom.xml build/dist/guice-$(VERSION).jar
 	mh_installpoms -plibguice-java --set-version=$(VERSION)
-	# ugly workaround until #640730 is fixed
-	-find debian/libguice-java -type d -name '*-SNAPSHOT' -exec rm -fr {} \;
+	# install assistedinject extension
+	mh_installjar -plibguice-java --set-version=$(VERSION) -l -v \
+		extensions/assistedinject/pom.xml \
+		extensions/assistedinject/build/guice-assistedinject-$(VERSION).jar
 
 override_dh_auto_clean:
 	dh_auto_clean
+	# clean assistedinject extension build files
+	cd extensions/assistedinject && ant clean
 	mh_clean
 
 override_dh_compress:

-- 
Guice: lightweight dependency injection framework for Java 5 and above