This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository xmlgraphics-commons.
commit 8a8b5eb4fcd6cb68847f87ced5998da9439da9d9 Author: Mathieu Malaterre <[email protected]> Date: Tue Oct 30 09:45:38 2012 +0000 Prepare 1.5 --- debian/changelog | 6 ++-- debian/control | 37 ++++++++++++---------- ...ibxmlgraphics-commons-java-doc.doc-base.javadoc | 9 ++++++ debian/libxmlgraphics-commons-java-doc.javadoc | 1 + debian/libxmlgraphics-commons-java.jlibs | 1 + debian/new-upstream | 30 ------------------ debian/patches/series | 3 +- debian/patches/xml-top-level.patch | 6 ++-- debian/rules | 28 ++++++++-------- debian/watch | 3 +- 10 files changed, 54 insertions(+), 70 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7abee26..f1877cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,13 @@ -xmlgraphics-commons (1.4.dfsg-5) UNRELEASED; urgency=low +xmlgraphics-commons (1.5-1) experimental; urgency=low * Use my @d.o alias, remove DMUA flag (not required) * Update the xmlgraphics-commons Uploaders list. Closes: #654142 * Bump Std-Vers to 3.9.3, no changes needed * Fix VCS urls + * Use javahelper for repack and d/rules + * Build documentation package - -- Mathieu Malaterre <[email protected]> Sun, 22 Apr 2012 13:58:47 +0200 + -- Mathieu Malaterre <[email protected]> Mon, 29 Oct 2012 08:59:08 +0100 xmlgraphics-commons (1.4.dfsg-4) unstable; urgency=low diff --git a/debian/control b/debian/control index 9fecbe1..c2ae5ef 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Vincent Fourmond <[email protected]>, Mathieu Malaterre <[email protected]> -Build-Depends: debhelper (>= 7), cdbs -Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk, ant-optional, - libcommons-io-java (>= 1.3.1), junit, libcommons-logging-java, maven-repo-helper +Build-Depends: debhelper (>= 7), javahelper +Build-Depends-Indep: default-jdk, default-jdk-doc, ant-optional, libmockito-java, + libcommons-io-java (>= 1.3.1), junit4, libcommons-logging-java, maven-repo-helper Standards-Version: 3.9.3 Homepage: http://xmlgraphics.apache.org/commons/ Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/xmlgraphics-commons @@ -13,7 +13,8 @@ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/xmlgraphics-commons Package: libxmlgraphics-commons-java Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, ${java:Depends} +Suggests: libxmlgraphics-commons-java-doc Description: reusable components used by Batik and FOP Apache XML Graphics Commons is a library that consists of several reusable components used by Apache Batik and Apache FOP. Many of these @@ -22,16 +23,18 @@ Description: reusable components used by Batik and FOP Graphics2D implementations that let you generate PDF & PostScript files, and much more. -#Package: libxmlgraphics-commons-java-doc -#Section: contrib/doc -#Architecture: all -#Suggests: libxmlgraphics-commons-java -#Description: reusable components used by Batik and FOP -# Apache XML Graphics Commons is a library that consists of several -# reusable components used by Apache Batik and Apache FOP. Many of these -# components can easily be used separately outside the domains of SVG and -# XSL-FO. You will find components such as a PDF library, an RTF library, -# Graphics2D implementations that let you generate PDF & PostScript -# files, and much more. -# . -# This package includes the documentation. +Package: libxmlgraphics-commons-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${java:Depends} +Recommends: ${java:Recommends} +Suggests: libxmlgraphics-commons-java +Description: reusable components used by Batik and FOP + Apache XML Graphics Commons is a library that consists of several + reusable components used by Apache Batik and Apache FOP. Many of these + components can easily be used separately outside the domains of SVG and + XSL-FO. You will find components such as a PDF library, an RTF library, + Graphics2D implementations that let you generate PDF & PostScript + files, and much more. + . + This package includes the documentation. diff --git a/debian/libxmlgraphics-commons-java-doc.doc-base.javadoc b/debian/libxmlgraphics-commons-java-doc.doc-base.javadoc new file mode 100644 index 0000000..6a55f1b --- /dev/null +++ b/debian/libxmlgraphics-commons-java-doc.doc-base.javadoc @@ -0,0 +1,9 @@ +Document: libxmlgraphics-commons-java-doc +Title: API JavaDoc for libxmlgraphics-commons-java-doc +Author: +Abstract: This the API JavaDoc for libxmlgraphics-commons-java-doc +Section: Programming/Java + +Format: HTML +Index: /usr/share/doc/libxmlgraphics-commons-java-doc/api +Files: /usr/share/doc/libxmlgraphics-commons-java-doc/api/*.html diff --git a/debian/libxmlgraphics-commons-java-doc.javadoc b/debian/libxmlgraphics-commons-java-doc.javadoc new file mode 100644 index 0000000..527bcd4 --- /dev/null +++ b/debian/libxmlgraphics-commons-java-doc.javadoc @@ -0,0 +1 @@ +src/documentation diff --git a/debian/libxmlgraphics-commons-java.jlibs b/debian/libxmlgraphics-commons-java.jlibs new file mode 100644 index 0000000..b9ac8ce --- /dev/null +++ b/debian/libxmlgraphics-commons-java.jlibs @@ -0,0 +1 @@ +build/xmlgraphics-commons-1.5.jar diff --git a/debian/new-upstream b/debian/new-upstream deleted file mode 100755 index 131cf97..0000000 --- a/debian/new-upstream +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# new-upstream: copyright 2007,2008 by Vincent Fourmond. -# See debian/copyright file for details. -# -# Called by uscan; from uscan(1): -# -# Finally, if a third parameter (an action) is given in the watchfile -# line, this is taken as the name of a command, and the command -# command --upstream-version version filename -# -# is executed, using either the original file or the symlink name. -# -# Thanks to Sam Morris <[email protected]> for giving me the idea - -set -e - -version=$2 -filename=$3 - -dir=xmlgraphics-commons-* - -# We repackage the upstream tarball, removing the jars in the library and -# the examples, which have dubious copyright status -tar xzf $filename --exclude '*/lib/*.jar' - -# We repackage excluding the lib/ subdir -tar cz -f $filename xml* - -rm -rf $dir diff --git a/debian/patches/series b/debian/patches/series index 0e95cd0..73b64eb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -xml-top-level.patch -xml-rdf-resource.patch +#xml-top-level.patch diff --git a/debian/patches/xml-top-level.patch b/debian/patches/xml-top-level.patch index 549a304..5c80438 100644 --- a/debian/patches/xml-top-level.patch +++ b/debian/patches/xml-top-level.patch @@ -5,9 +5,9 @@ Author: brian m. carlson <[email protected]> Index: xmlgraphics-commons-1.4.dfsg/src/java/org/apache/xmlgraphics/xmp/XMPHandler.java =================================================================== ---- xmlgraphics-commons-1.4.dfsg.orig/src/java/org/apache/xmlgraphics/xmp/XMPHandler.java 2010-12-20 21:38:39.391336779 +0100 -+++ xmlgraphics-commons-1.4.dfsg/src/java/org/apache/xmlgraphics/xmp/XMPHandler.java 2010-12-20 21:39:04.295336685 +0100 -@@ -188,6 +188,12 @@ +--- xmlgraphics-commons-1.5.orig/src/java/org/apache/xmlgraphics/xmp/XMPHandler.java 2012-10-16 19:54:12.000000000 +0000 ++++ xmlgraphics-commons-1.5/src/java/org/apache/xmlgraphics/xmp/XMPHandler.java 2012-10-29 08:07:29.898012902 +0000 +@@ -187,6 +187,12 @@ throw new SAXException("Unexpected element in the RDF namespace: " + localName); } } else { diff --git a/debian/rules b/debian/rules index 1248565..a54fcd1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,21 +1,21 @@ #!/usr/bin/make -f +#export DH_VERBOSE=1 -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +JAVA_HOME=/usr/lib/jvm/default-java +export CLASSPATH=/usr/share/java/commons-io.jar:/usr/share/java/commons-logging.jar:/usr/share/java/junit4.jar:/usr/share/java/mockito-core.jar +PACKAGE = xmlgraphics-commons +VERSION = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-) -export VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/.dfsg.*//') +%: + dh $@ --with javahelper -JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun)) +override_dh_auto_build: + dh_auto_build -- -noinput -Dpwd=none all maven-artifacts -# no junit test at the moment -DEB_JARS := commons-io commons-logging #junit ant-junit -DEB_ANT_BUILD_TARGET := all maven-artifacts - -install/libxmlgraphics-commons-java:: - # Install pom and jar - mh_installpom -v -plibxmlgraphics-commons-java build/maven/pom.xml - mh_installjar -plibxmlgraphics-commons-java -l build/maven/pom.xml \ - -nxmlgraphics-commons -i${VERSION} build/xmlgraphics-commons-$(VERSION).jar +override_dh_install: + #mh_installpoms -plib$(PACKAGE)-java + mh_installpom -plib$(PACKAGE)-java build/maven/pom.xml + mh_installjar -plib$(PACKAGE)-java -l build/maven/pom.xml build/$(PACKAGE)-$(VERSION).jar get-orig-source: - uscan --force-download --verbose --rename + uscan --force-download --verbose --repack --rename diff --git a/debian/watch b/debian/watch index d8acaf4..9916a10 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,2 @@ version=3 -opts=dversionmangle=s/.dfsg// \ - http://www.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-(.*)-src\.tar\.gz debian debian/new-upstream +http://www.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-([\d\.]+)-src\.zip debian jh_repack -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/xmlgraphics-commons.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
