[pkg-java] r8816 - in trunk/jtidy/debian: . patches

Ludovic Claude ludovicc-guest at alioth.debian.org
Thu Jul 2 23:12:29 UTC 2009 

Author: ludovicc-guest
Date: 2009-07-02 23:12:28 +0000 (Thu, 02 Jul 2009)
New Revision: 8816

Added:
   trunk/jtidy/debian/libjtidy-java-doc.docs
   trunk/jtidy/debian/libjtidy-java.poms
   trunk/jtidy/debian/maven.rules
   trunk/jtidy/debian/patches/
   trunk/jtidy/debian/patches/pom.patch
   trunk/jtidy/debian/patches/series
Modified:
   trunk/jtidy/debian/
   trunk/jtidy/debian/changelog
   trunk/jtidy/debian/compat
   trunk/jtidy/debian/control
   trunk/jtidy/debian/libjtidy-java-doc.doc-base
   trunk/jtidy/debian/rules
Log:
* New version


Property changes on: trunk/jtidy/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/jtidy/debian/changelog
===================================================================
--- trunk/jtidy/debian/changelog	2009-07-02 23:10:13 UTC (rev 8815)
+++ trunk/jtidy/debian/changelog	2009-07-02 23:12:28 UTC (rev 8816)
@@ -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 <ludovic.claude at laposte.net>  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 <steve.langasek at ubuntu.com>  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 <ccheney at ubuntu.com>  Wed, 17 Dec 2008 00:15:00 -0600
+
 jtidy (7+svn20070309-2) unstable; urgency=low
 
   * Added manifest to jtidy.jar. Closes: #481571

Modified: trunk/jtidy/debian/compat
===================================================================
--- trunk/jtidy/debian/compat	2009-07-02 23:10:13 UTC (rev 8815)
+++ trunk/jtidy/debian/compat	2009-07-02 23:12:28 UTC (rev 8816)
@@ -1 +1 @@
-4
+6

Modified: trunk/jtidy/debian/control
===================================================================
--- trunk/jtidy/debian/control	2009-07-02 23:10:13 UTC (rev 8815)
+++ trunk/jtidy/debian/control	2009-07-02 23:12:28 UTC (rev 8816)
@@ -1,19 +1,19 @@
 Source: jtidy
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>
-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 @@
 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/).

Modified: trunk/jtidy/debian/libjtidy-java-doc.doc-base
===================================================================
--- trunk/jtidy/debian/libjtidy-java-doc.doc-base	2009-07-02 23:10:13 UTC (rev 8815)
+++ trunk/jtidy/debian/libjtidy-java-doc.doc-base	2009-07-02 23:12:28 UTC (rev 8816)
@@ -5,5 +5,5 @@
 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/*

Added: trunk/jtidy/debian/libjtidy-java-doc.docs
===================================================================
--- trunk/jtidy/debian/libjtidy-java-doc.docs	                        (rev 0)
+++ trunk/jtidy/debian/libjtidy-java-doc.docs	2009-07-02 23:12:28 UTC (rev 8816)
@@ -0,0 +1 @@
+build/doc/api

Added: trunk/jtidy/debian/libjtidy-java.poms
===================================================================
--- trunk/jtidy/debian/libjtidy-java.poms	                        (rev 0)
+++ trunk/jtidy/debian/libjtidy-java.poms	2009-07-02 23:12:28 UTC (rev 8816)
@@ -0,0 +1 @@
+pom.xml --no-parent

Added: trunk/jtidy/debian/maven.rules
===================================================================
--- trunk/jtidy/debian/maven.rules	                        (rev 0)
+++ trunk/jtidy/debian/maven.rules	2009-07-02 23:12:28 UTC (rev 8816)
@@ -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/

Added: trunk/jtidy/debian/patches/pom.patch
===================================================================
--- trunk/jtidy/debian/patches/pom.patch	                        (rev 0)
+++ trunk/jtidy/debian/patches/pom.patch	2009-07-02 23:12:28 UTC (rev 8816)
@@ -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>

Added: trunk/jtidy/debian/patches/series
===================================================================
--- trunk/jtidy/debian/patches/series	                        (rev 0)
+++ trunk/jtidy/debian/patches/series	2009-07-02 23:12:28 UTC (rev 8816)
@@ -0,0 +1 @@
+pom.patch

Modified: trunk/jtidy/debian/rules
===================================================================
--- trunk/jtidy/debian/rules	2009-07-02 23:10:13 UTC (rev 8815)
+++ trunk/jtidy/debian/rules	2009-07-02 23:12:28 UTC (rev 8816)
@@ -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 @@
 		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
 
-install/libjtidy-java-doc::
-	dh_install -plibjtidy-java-doc $(API_DOCS) usr/share/doc/libjtidy-java
+clean::
+	-rm -rf debian/tmp
+

More information about the pkg-java-commits mailing list