[SCM] UNNAMED PROJECT branch, master, updated. debian/1.5.3+dfsg1-1-8-gb654f2e

Fri Dec 16 16:55:50 UTC 2011

The following commit has been merged in the master branch:
commit 4464e2905e538b2bfc63ce7aa9f9c2681debfb09
Author: James Page <james.page at ubuntu.com>
Date:   Fri Dec 16 16:46:00 2011 +0000

    Refactoring to use maven-repo-helper

diff --git a/debian/build.xml b/debian/build.xml
index 0842fb9..bc6bbca 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" standalone='yes'?>
 
   <project name="Jackson JSON parser Debian" basedir="..">
-    <import file="../build.xml" />
+      <import file="../build.xml" />
+      <import file="../ant/build-jarjar-asm.xml" />
 
     <target name="javadoc" depends="compile.main">
         <!-- Build a dirpath that contains just the "source" tree -->
@@ -43,4 +44,15 @@
             <group title="Jackson XML Compatibility" packages="org.codehaus.jackson.xc" />
         </javadoc>
     </target> 
+
+    <target name="generate-poms">
+        <copy todir="${dir.dist}">
+            <fileset dir="${dir.src}/maven" includes="*.pom" />
+                <globmapper from="*.pom" to="*-${IMPL_VERSION}.pom" />
+            <filterset>
+                <filter token="VERSION" value="${IMPL_VERSION}" />
+            </filterset>
+        </copy>
+    </target>
+
   </project>
diff --git a/debian/changelog b/debian/changelog
index 27e748d..20ce9e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,12 @@ libjackson-json-java (1.9.2-1) unstable; urgency=low
 
   * New upstream release.
   * Added watch file.
+  * Genarate poms as part of build and switched to using maven-repo-helper
+    to install jars and pom file.
+  * Bumped Standards-Version to 3.9.2; no changes.
   * Added myself to uploaders.
 
- -- James Page <james.page at ubuntu.com>  Fri, 16 Dec 2011 15:39:17 +0000
+ -- James Page <james.page at ubuntu.com>  Fri, 16 Dec 2011 16:18:35 +0000
 
 libjackson-json-java (1.5.3+dfsg1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9fbd797..67468b8 100644
--- a/debian/control
+++ b/debian/control
@@ -6,17 +6,25 @@ Uploaders: Thomas Koch <thomas.koch at ymc.ch>, James Page <james.page at ubuntu.com>
 Homepage: http://jackson.codehaus.org
 Vcs-Browser: http://git.debian.org/?p=pkg-java/libjackson-json-java.git
 Vcs-Git: git://git.debian.org/pkg-java/libjackson-json-java.git
-Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7.4.10), default-jdk, ant (>= 1.6.0), 
- javahelper (>= 0.30), 
- default-jdk-doc,
+Standards-Version: 3.9.2
+Build-Depends:
+ ant (>= 1.6.0),
  bnd,
+ debhelper (>= 7.4.10),
+ default-jdk,
+ default-jdk-doc,
+ javahelper (>= 0.30),
+ groovy,
+ libasm3-java,
+ libjarjar-java,
  libjoda-time-java,
- libjsr311-api-java
+ libjsr311-api-java,
+ libjsr311-api-java-doc,
+ maven-repo-helper
 
 Package: libjackson-json-java
 Architecture: all
-Depends: ${misc:Depends}, libjoda-time-java, libjsr311-api-java
+Depends: libjoda-time-java, libjsr311-api-java, ${misc:Depends}
 Description: streaming fast powerful standard conformant json processor in java
  Jackson is a Java-based JSON-processing package that contains:
  .
diff --git a/debian/libjackson-json-java.jlibs b/debian/libjackson-json-java.jlibs
deleted file mode 100644
index 6e0df06..0000000
--- a/debian/libjackson-json-java.jlibs
+++ /dev/null
@@ -1,6 +0,0 @@
-build/jackson-core-asl-1.5.3.jar
-build/jackson-core-lgpl-1.5.3.jar
-build/jackson-jaxrs-1.5.3.jar
-build/jackson-mapper-asl-1.5.3.jar
-build/jackson-mapper-lgpl-1.5.3.jar
-build/jackson-xc-1.5.3.jar
diff --git a/debian/libjackson-json-java.poms b/debian/libjackson-json-java.poms
new file mode 100644
index 0000000..40aba57
--- /dev/null
+++ b/debian/libjackson-json-java.poms
@@ -0,0 +1,8 @@
+dist/jackson-core-asl-1.9.2.pom --artifact=build/jackson-core-asl-1.9.2.jar --java-lib
+dist/jackson-core-lgpl-1.9.2.pom --artifact=build/jackson-core-lgpl-1.9.2.jar --java-lib
+dist/jackson-jaxrs-1.9.2.pom --artifact=build/jackson-jaxrs-1.9.2.jar --java-lib
+dist/jackson-mapper-asl-1.9.2.pom --artifact=build/jackson-mapper-asl-1.9.2.jar  --java-lib
+dist/jackson-mapper-lgpl-1.9.2.pom --artifact=build/jackson-mapper-lgpl-1.9.2.jar --java-lib
+dist/jackson-mrbean-1.9.2.pom --artifact=build/jackson-mrbean-1.9.2.jar --java-lib
+dist/jackson-smile-1.9.2.pom --artifact=build/jackson-smile-1.9.2.jar --java-lib
+dist/jackson-xc-1.9.2.pom --artifact=build/jackson-xc-1.9.2.jar --java-lib
diff --git a/debian/rules b/debian/rules
index ce30edc..25acfa7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,35 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with javahelper $@
+	dh $@ --with maven-repo-helper
 
 debian/bnd_plugin/net/luminis/build/plugin/bnd/BuildTask.class:
 	CLASSPATH="/usr/share/java/bnd.jar:/usr/share/java/ant.jar" \
-	javac debian/bnd_plugin/net/luminis/build/plugin/bnd/BuildTask.java
+	javac -source 1.5 -target 1.5 debian/bnd_plugin/net/luminis/build/plugin/bnd/BuildTask.java
 
 override_dh_auto_build: mklibdirs debian/bnd_plugin/net/luminis/build/plugin/bnd/BuildTask.class
 	ln -s /usr/share/java/joda-time.jar lib/ext/joda-time.jar || true
 	ln -s /usr/share/java/jsr311-api.jar lib/jaxrs/jsr311-api.jar || true
+	ln -s /usr/share/java/asm3.jar lib/ext/asm/asm-3.3.jar || true
+	ln -s /usr/share/java/jarjar.jar lib/ext/jarjar/jarjar-1.0.jar || true
 	CLASSPATH="debian/bnd_plugin:/usr/share/java/bnd.jar" \
-	ant -buildfile debian/build.xml compile.main jars javadoc
+		ant -buildfile debian/build.xml repackage-asm compile.main jars javadoc \
+			generate-poms
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=libjackson-json-java
 
 override_dh_auto_clean:
-	rm -rf lib build
+	rm -rf lib build test dist
 
 override_jh_manifest:
 
 mklibdirs:
 	mkdir -p lib/ant
 	mkdir -p lib/cobertura
-	mkdir -p lib/ext
+	mkdir -p lib/ext/asm
+	mkdir -p lib/ext/jarjar
 	mkdir -p lib/jaxb
 	mkdir -p lib/jaxrs
+	mkdir -p lib/repackaged
+	mkdir -p lib/junit

-- 
UNNAMED PROJECT

