Author: tmancill Date: 2013-11-21 06:40:33 +0000 (Thu, 21 Nov 2013) New Revision: 17468
Added: trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java-doc.install Modified: trunk/xmlgraphics-commons/debian/changelog trunk/xmlgraphics-commons/debian/compat trunk/xmlgraphics-commons/debian/control trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java-doc.doc-base trunk/xmlgraphics-commons/debian/rules Log: changes for 1.5-4 Modified: trunk/xmlgraphics-commons/debian/changelog =================================================================== --- trunk/xmlgraphics-commons/debian/changelog 2013-11-21 06:33:57 UTC (rev 17467) +++ trunk/xmlgraphics-commons/debian/changelog 2013-11-21 06:40:33 UTC (rev 17468) @@ -1,3 +1,25 @@ +xmlgraphics-commons (1.5-4) unstable; urgency=low + + [ Emmanuel Bourg ] + * Team upload. + * debian/control: + - Removed junit4 and libmockito-java from the dependencies + of libxmlgraphics-commons-java + - Updated Standards-Version to 3.9.5 (no changes) + - Use canonical URLs for the Vcs-* fields + - Fixed the duplicate-short-description lintian warning + * Switch to debhelper level 9 + * debian/rules: Improved the clean target + * Include the Javadoc in the documentation package + instead of the raw xdoc files + * Install the documentation in /usr/share/doc/libxmlgraphics-commons-java + + [ tony mancill ] + * debian/rules: + - unexport DISPLAY to prevent test failures on workstations + + -- Emmanuel Bourg <[email protected]> Thu, 07 Nov 2013 23:11:13 +0100 + xmlgraphics-commons (1.5-3) unstable; urgency=low * Fix lintian error (doc-base-file-references-missing-file) Modified: trunk/xmlgraphics-commons/debian/compat =================================================================== --- trunk/xmlgraphics-commons/debian/compat 2013-11-21 06:33:57 UTC (rev 17467) +++ trunk/xmlgraphics-commons/debian/compat 2013-11-21 06:40:33 UTC (rev 17468) @@ -1 +1 @@ -7 +9 Modified: trunk/xmlgraphics-commons/debian/control =================================================================== --- trunk/xmlgraphics-commons/debian/control 2013-11-21 06:33:57 UTC (rev 17467) +++ trunk/xmlgraphics-commons/debian/control 2013-11-21 06:40:33 UTC (rev 17468) @@ -3,19 +3,19 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Vincent Fourmond <[email protected]>, Mathieu Malaterre <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), javahelper +Build-Depends: debhelper (>= 9), 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.4 +Standards-Version: 3.9.5 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/xmlgraphics-commons +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/xmlgraphics-commons Homepage: http://xmlgraphics.apache.org/commons/ -Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/xmlgraphics-commons -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/xmlgraphics-commons Package: libxmlgraphics-commons-java Architecture: all -Depends: ${misc:Depends}, ${java:Depends} +Depends: ${misc:Depends}, libcommons-io-java, libcommons-logging-java Suggests: libxmlgraphics-commons-java-doc -Description: reusable components used by Batik and FOP +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 @@ -29,7 +29,7 @@ Depends: ${misc:Depends}, ${java:Depends} Recommends: ${java:Recommends} Suggests: libxmlgraphics-commons-java -Description: reusable components used by Batik and FOP +Description: Reusable components used by Batik and FOP (documentation) 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 Modified: trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java-doc.doc-base =================================================================== --- trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java-doc.doc-base 2013-11-21 06:33:57 UTC (rev 17467) +++ trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java-doc.doc-base 2013-11-21 06:40:33 UTC (rev 17468) @@ -1,9 +1,9 @@ Document: libxmlgraphics-commons-java-doc -Title: API JavaDoc for libxmlgraphics-commons-java-doc +Title: API documentation for libxmlgraphics-commons-java Author: -Abstract: This the API JavaDoc for libxmlgraphics-commons-java-doc +Abstract: This is the API documentation for libxmlgraphics-commons-java Section: Programming/Java Format: HTML -Index: /usr/share/doc/libxmlgraphics-commons-java-doc/api/README.txt -Files: /usr/share/doc/libxmlgraphics-commons-java-doc/api/* +Index: /usr/share/doc/libxmlgraphics-commons-java/api +Files: /usr/share/doc/libxmlgraphics-commons-java/api/*.html Added: trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java-doc.install =================================================================== --- trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java-doc.install (rev 0) +++ trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java-doc.install 2013-11-21 06:40:33 UTC (rev 17468) @@ -0,0 +1 @@ +build/javadocs/* usr/share/doc/libxmlgraphics-commons-java/api Modified: trunk/xmlgraphics-commons/debian/rules =================================================================== --- trunk/xmlgraphics-commons/debian/rules 2013-11-21 06:33:57 UTC (rev 17467) +++ trunk/xmlgraphics-commons/debian/rules 2013-11-21 06:40:33 UTC (rev 17468) @@ -6,6 +6,9 @@ PACKAGE = xmlgraphics-commons VERSION = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-) +# unexport DISPLAY for so cowbuilder builds don't fail +unexport DISPLAY + %: dh $@ --with javahelper @@ -18,11 +21,12 @@ override_dh_auto_clean: # Drop any linked in deps for testing + mh_clean rm -f lib/*.jar dh_auto_clean + rm -f xmlgraphics-commons-*-bundle.jar -override_dh_install: - #mh_installpoms -plib$(PACKAGE)-java +override_dh_auto_install: mh_installpom -plib$(PACKAGE)-java build/maven/pom.xml mh_installjar -plib$(PACKAGE)-java -l build/maven/pom.xml build/$(PACKAGE)-$(VERSION).jar _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
