This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jtidy.
commit ccdd191840c24e3ac26c3640cd571f45ccfc9be4 Author: Ludovic Claude <[email protected]> Date: Thu Jul 2 23:12:28 2009 +0000 * New version --- debian/changelog | 30 ++++++++++++++++++++++++++++++ debian/compat | 2 +- debian/control | 14 +++++++------- debian/libjtidy-java-doc.doc-base | 4 ++-- debian/libjtidy-java-doc.docs | 1 + debian/libjtidy-java.poms | 1 + debian/maven.rules | 4 ++++ debian/patches/pom.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + debian/rules | 20 ++++++++++++-------- 10 files changed, 77 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc2d7b4..cfc1eaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +jtidy (7+svn20070309-3) unstable; urgency=low + + * Change section to java, bump up Standards-Version to 3.8.1 + * Bump up debhelper to 6 + * Use default-jdk instead of java-gcj for the build (closes: #526287) + * Add ${misc:Depends} to Depends to clear Lintian warnings + * Add the Maven POM to the package + * Add a Build-Depends-Indep dependency on maven-repo-helper + * Use mh_installpom and mh_installjar to install the POM and the jar to the + Maven repository + * Patch the POM with quilt to remove the SNAPSHOT version + * Depend on libjaxb1.3-java instead of libxalan-java as only the xml apis + are required + + -- Ludovic Claude <[email protected]> Wed, 13 May 2009 18:26:09 +0100 + +jtidy (7+svn20070309-2ubuntu2) jaunty; urgency=low + + * Don't depend on classpath-doc, which is in universe and therefore + unrelated to this package. + + -- Steve Langasek <[email protected]> Mon, 30 Mar 2009 21:48:47 +0000 + +jtidy (7+svn20070309-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - default-java transition. + + -- Chris Cheney <[email protected]> Wed, 17 Dec 2008 00:15:00 -0600 + jtidy (7+svn20070309-2) unstable; urgency=low * Added manifest to jtidy.jar. Closes: #481571 diff --git a/debian/compat b/debian/compat index b8626c4..1e8b314 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +6 diff --git a/debian/control b/debian/control index 681a794..94f4dd8 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,19 @@ Source: jtidy -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Paul Cager <[email protected]>, Michael Koch <[email protected]> -Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java -Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3) -Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 6), cdbs (>= 0.4.5.3), quilt, default-jdk +Build-Depends-Indep: maven-repo-helper, ant, ant-optional, libjaxp1.3-java +Standards-Version: 3.8.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jtidy Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jtidy Homepage: http://jtidy.sourceforge.net/ Package: libjtidy-java Architecture: all -Section: libs -Suggests: libjtidy-java-doc +Depends: ${misc:Depends}, libjaxp1.3-java +Suggests: libjtidy-java-doc, ant Description: a Java port of HTML Tidy, a HTML syntax checker and pretty printer JTidy is a Java port of HTML Tidy (http://www.w3.org/People/Raggett/tidy/). Like its non-Java cousin, JTidy can be used as a tool for cleaning up malformed @@ -24,7 +24,7 @@ Description: a Java port of HTML Tidy, a HTML syntax checker and pretty printer Package: libjtidy-java-doc Architecture: all Section: doc -Depends: classpath-doc +Depends: ${misc:Depends} Suggests: libjtidy-java Description: API Documentation for JTidy JTidy is a Java port of HTML Tidy (http://www.w3.org/People/Raggett/tidy/). diff --git a/debian/libjtidy-java-doc.doc-base b/debian/libjtidy-java-doc.doc-base index 4cd0741..79ee9f4 100644 --- a/debian/libjtidy-java-doc.doc-base +++ b/debian/libjtidy-java-doc.doc-base @@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provided by the jtidy library. Section: Programming Format: HTML -Index: /usr/share/doc/libjtidy-java/api/index.html -Files: /usr/share/doc/libjtidy-java/api/* +Index: /usr/share/doc/libjtidy-java-doc/api/index.html +Files: /usr/share/doc/libjtidy-java-doc/api/* diff --git a/debian/libjtidy-java-doc.docs b/debian/libjtidy-java-doc.docs new file mode 100644 index 0000000..59cfcdc --- /dev/null +++ b/debian/libjtidy-java-doc.docs @@ -0,0 +1 @@ +build/doc/api diff --git a/debian/libjtidy-java.poms b/debian/libjtidy-java.poms new file mode 100644 index 0000000..43e746b --- /dev/null +++ b/debian/libjtidy-java.poms @@ -0,0 +1 @@ +pom.xml --no-parent diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..9613f63 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,4 @@ +s/xerces/xml-apis/ s/dom3-xml-apis/xml-apis/ jar s/.*/debian/ +s/ant/org.apache.ant/ * * s/.*/debian/ +junit junit jar s/3\..*/3.x/ +log4j log4j jar s/1\.2\..*/1.2.x/ diff --git a/debian/patches/pom.patch b/debian/patches/pom.patch new file mode 100644 index 0000000..cd02c53 --- /dev/null +++ b/debian/patches/pom.patch @@ -0,0 +1,18 @@ +--- a/pom.xml ++++ b/pom.xml +@@ -5,7 +5,7 @@ + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + <name>JTidy</name> +- <version>8.0-SNAPSHOT</version> ++ <version>8.0-alpha-20070309</version> + <description> + JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty printer. Like its non-Java cousin, JTidy can be + used as a tool for cleaning up malformed and faulty HTML. In addition, JTidy provides a DOM interface to the +@@ -263,4 +263,4 @@ + <url>scp://shell.sourceforge.net/home/groups/j/jt/jtidy/htdocs/</url> + </site> + </distributionManagement> +-</project> +\ No newline at end of file ++</project> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..df4e068 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +pom.patch diff --git a/debian/rules b/debian/rules index c4b513e..77dc875 100755 --- a/debian/rules +++ b/debian/rules @@ -2,12 +2,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk -JAVA_HOME := /usr/lib/jvm/java-gcj +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java DEB_JARS := $(ANT_HOME)/lib/ant-trax.jar xalan2 DEB_ANT_BUILD_TARGET := package -BUILD_FILE := debian/build.xml -DEB_ANT_INVOKE := ant -Dpackage=jtidy -Dversion=$(DEB_UPSTREAM_VERSION) -f $(BUILD_FILE) +DEB_ANT_BUILDFILE := debian/build.xml +DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -DartifactId=$(PACKAGE) -Dversion=$(VERSION) API_DOCS := build/doc/api get-orig-source: @@ -17,9 +20,10 @@ get-orig-source: tar czf ../../jtidy_$(DEB_UPSTREAM_VERSION).orig.tar.gz jtidy rm -rf orig_tmp -install/libjtidy-java:: - dh_install -plibjtidy-java build/jtidy-$(DEB_UPSTREAM_VERSION).jar usr/share/java - dh_link -plibjtidy-java /usr/share/java/jtidy-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jtidy.jar +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 -rf debian/tmp -install/libjtidy-java-doc:: - dh_install -plibjtidy-java-doc $(API_DOCS) usr/share/doc/libjtidy-java -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jtidy.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
