[pkg-java] r13156 - in trunk/qdox/debian: . source

Ludovic Claude ludovicc-guest at alioth.debian.org
Sun Dec 5 19:24:36 UTC 2010 

Author: ludovicc-guest
Date: 2010-12-05 19:24:33 +0000 (Sun, 05 Dec 2010)
New Revision: 13156

Added:
   trunk/qdox/debian/build-classpath
   trunk/qdox/debian/source/
   trunk/qdox/debian/source/format
Modified:
   trunk/qdox/debian/build.xml
   trunk/qdox/debian/changelog
   trunk/qdox/debian/control
   trunk/qdox/debian/libqdox-java.poms
   trunk/qdox/debian/orig-tar.sh
   trunk/qdox/debian/rules
Log:
* New upstream release
* d/control: 
   - Bump up Standards-Version to 3.9.1 (no changes)
   - Update version contraints for maven-repo-helper and maven-ant-helper
   - Remove dependency on cdbs
* d/rules:
   - use dh 7 instead of cdbs
* Use 3.0 (quilt) source format
* Add --has-package-version to the POM file, add new parameters for
  mh_install
* orig-tarball: no need anymore to remove the qdox directory

Added: trunk/qdox/debian/build-classpath
===================================================================
--- trunk/qdox/debian/build-classpath	                        (rev 0)
+++ trunk/qdox/debian/build-classpath	2010-12-05 19:24:33 UTC (rev 13156)
@@ -0,0 +1,4 @@
+/usr/share/java/ant-nodeps.jar
+/usr/share/java/ant-junit.jar
+/usr/share/java/junit.jar
+

Modified: trunk/qdox/debian/build.xml
===================================================================
--- trunk/qdox/debian/build.xml	2010-12-05 19:19:22 UTC (rev 13155)
+++ trunk/qdox/debian/build.xml	2010-12-05 19:24:33 UTC (rev 13156)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
  
-<project name="pkg-java" default="package" basedir="..">
+<project name="pkg-java" default="all" basedir="..">
  
     <property file="debian/build.properties"/>
     <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
@@ -29,7 +29,7 @@
     <macrodef name="javadocmodule">
         <attribute name="dir"/>
             <sequential>
-                <ant target="javadoc"
+                <ant target="javadoc-jar"
                     antfile="${maven.build}" dir="@{dir}"/>
             </sequential>
     </macrodef>
@@ -66,4 +66,6 @@
         <javadocmodule dir="."/>
     </target>
 
+    <target name="all" depends="package,javadoc" />
+
 </project>

Modified: trunk/qdox/debian/changelog
===================================================================
--- trunk/qdox/debian/changelog	2010-12-05 19:19:22 UTC (rev 13155)
+++ trunk/qdox/debian/changelog	2010-12-05 19:24:33 UTC (rev 13156)
@@ -1,3 +1,19 @@
+qdox (1.12-1) experimental; urgency=low
+
+  * New upstream release
+  * d/control: 
+     - Bump up Standards-Version to 3.9.1 (no changes)
+     - Update version contraints for maven-repo-helper and maven-ant-helper
+     - Remove dependency on cdbs
+  * d/rules:
+     - use dh 7 instead of cdbs
+  * Use 3.0 (quilt) source format
+  * Add --has-package-version to the POM file, add new parameters for
+    mh_install
+  * orig-tarball: no need anymore to remove the qdox directory
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 05 Dec 2010 19:14:49 +0100
+
 qdox (1.11-1) unstable; urgency=low
 
   [ Ludovic Claude ]

Modified: trunk/qdox/debian/control
===================================================================
--- trunk/qdox/debian/control	2010-12-05 19:19:22 UTC (rev 13155)
+++ trunk/qdox/debian/control	2010-12-05 19:24:33 UTC (rev 13156)
@@ -4,8 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>, Ludovic Claude <ludovic.claude at laposte.net>,
  Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, byacc-j
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
+Build-Depends: debhelper (>= 7), default-jdk, byacc-j
+Build-Depends-Indep: maven-repo-helper (>= 1.5), maven-ant-helper (>= 7.1), ant, ant-optional, 
  jflex (>= 1.4.3), junit (>= 3.8.1), libjmock-java (>= 1.0.1), default-jdk-doc
 Standards-Version: 3.8.4
 Homepage: http://qdox.codehaus.org/

Modified: trunk/qdox/debian/libqdox-java.poms
===================================================================
--- trunk/qdox/debian/libqdox-java.poms	2010-12-05 19:19:22 UTC (rev 13155)
+++ trunk/qdox/debian/libqdox-java.poms	2010-12-05 19:24:33 UTC (rev 13156)
@@ -1 +1,2 @@
-pom.xml --no-parent
+pom.xml --no-parent --has-package-version --java-lib --artifact=build/qdox-*.jar
+build/qdox.javadoc.pom --has-package-version --artifact=build/qdox.javadoc.jar --classifier=javadoc --ignore-pom --package=libqdox-java-doc

Modified: trunk/qdox/debian/orig-tar.sh
===================================================================
--- trunk/qdox/debian/orig-tar.sh	2010-12-05 19:19:22 UTC (rev 13155)
+++ trunk/qdox/debian/orig-tar.sh	2010-12-05 19:24:33 UTC (rev 13156)
@@ -6,7 +6,7 @@
 TAG=qdox-$VERSION
 
 svn export http://svn.codehaus.org/qdox/tags/$TAG/ $DIR
-rm -r $DIR/bootstrap $DIR/qdox
+rm -r $DIR/bootstrap
 tar -c -z -f $TAR $DIR
 rm -rf $DIR ../$TAG
 

Modified: trunk/qdox/debian/rules
===================================================================
--- trunk/qdox/debian/rules	2010-12-05 19:19:22 UTC (rev 13155)
+++ trunk/qdox/debian/rules	2010-12-05 19:24:33 UTC (rev 13156)
@@ -1,23 +1,15 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+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/-[^-]*$$//')
 
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps ant-junit junit
-DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+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)
+export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -Dversion=$(DEB_UPSTREAM_VERSION) -f debian/build.xml
 
+%:
+	dh $@ --buildsystem=ant --with maven_repo_helper
+
 get-orig-source:
 	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar
-
-clean::
-	-$(RM) -r target debian/tmp
-

Added: trunk/qdox/debian/source/format
===================================================================
--- trunk/qdox/debian/source/format	                        (rev 0)
+++ trunk/qdox/debian/source/format	2010-12-05 19:24:33 UTC (rev 13156)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the pkg-java-commits mailing list