[pkg-java] r6555 - trunk/jtidy/debian

mkoch at alioth.debian.org mkoch at alioth.debian.org
Fri Jun 13 05:46:57 UTC 2008 

Author: mkoch
Date: 2008-06-13 05:46:56 +0000 (Fri, 13 Jun 2008)
New Revision: 6555

Added:
   trunk/jtidy/debian/manifest.mf
Modified:
   trunk/jtidy/debian/
   trunk/jtidy/debian/build.xml
   trunk/jtidy/debian/changelog
   trunk/jtidy/debian/control
   trunk/jtidy/debian/rules
Log:
jtidy (7+svn20070309-2) unstable; urgency=low

  * Added manifest to jtidy.jar. Closes: #481571
  * Updated Standards-Version to 3.8.0. No changes needed.
  * Added Homepage, Vcs-Svn and Vcs-Browser fields.
  * Improved long description of -doc package.
  * Simplified debian/rules.
  * Added myself to Uploaders.

 -- Michael Koch <konqueror at gmx.de>  Fri, 13 Jun 2008 07:33:47 +020




Property changes on: trunk/jtidy/debian
___________________________________________________________________
Name: svn:ignore
   + files
libjtidy-java
libjtidy-java-doc
stamp-*
*.debhelper
*.debhelper.log


Modified: trunk/jtidy/debian/build.xml
===================================================================
--- trunk/jtidy/debian/build.xml	2008-06-11 21:56:48 UTC (rev 6554)
+++ trunk/jtidy/debian/build.xml	2008-06-13 05:46:56 UTC (rev 6555)
@@ -57,6 +57,7 @@
 	<jar jarfile="${jar}"
 		basedir="${build.dir}"
 		includes="**/*.class,**/*.properties,**/*.gif"
+		manifest="debian/manifest.mf"
 	/>
 </target>
 

Modified: trunk/jtidy/debian/changelog
===================================================================
--- trunk/jtidy/debian/changelog	2008-06-11 21:56:48 UTC (rev 6554)
+++ trunk/jtidy/debian/changelog	2008-06-13 05:46:56 UTC (rev 6555)
@@ -1,3 +1,14 @@
+jtidy (7+svn20070309-2) unstable; urgency=low
+
+  * Added manifest to jtidy.jar. Closes: #481571
+  * Updated Standards-Version to 3.8.0. No changes needed.
+  * Added Homepage, Vcs-Svn and Vcs-Browser fields.
+  * Improved long description of -doc package.
+  * Simplified debian/rules.
+  * Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 13 Jun 2008 07:33:47 +0200
+
 jtidy (7+svn20070309-1) unstable; urgency=low
 
   * Initial release. (Closes: #413526)

Modified: trunk/jtidy/debian/control
===================================================================
--- trunk/jtidy/debian/control	2008-06-11 21:56:48 UTC (rev 6554)
+++ trunk/jtidy/debian/control	2008-06-13 05:46:56 UTC (rev 6555)
@@ -2,10 +2,13 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Paul Cager <paul-debian at home.paulcager.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.7.2
+Standards-Version: 3.8.0
+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
@@ -17,8 +20,6 @@
  and faulty HTML. In addition, JTidy provides a DOM interface to the document
  that is being processed, which effectively makes you able to use JTidy as a
  DOM parser for real-world HTML.
- .
-  Homepage: http://jtidy.sourceforge.net/
 
 Package: libjtidy-java-doc
 Architecture: all
@@ -26,6 +27,10 @@
 Depends: classpath-doc
 Suggests: libjtidy-java
 Description: API Documentation for JTidy
- Documentation for JTidy, a syntax checker and pretty-printer for HTML.
+ 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
+ and faulty HTML. In addition, JTidy provides a DOM interface to the document
+ that is being processed, which effectively makes you able to use JTidy as a
+ DOM parser for real-world HTML.
  .
-  Homepage: http://jtidy.sourceforge.net/
+ This package contains the documentation for JTidy.

Added: trunk/jtidy/debian/manifest.mf
===================================================================
--- trunk/jtidy/debian/manifest.mf	                        (rev 0)
+++ trunk/jtidy/debian/manifest.mf	2008-06-13 05:46:56 UTC (rev 6555)
@@ -0,0 +1,4 @@
+Main-Class: org.w3c.tidy.Tidy
+
+Name: org/w3c/tidy/Tidy.class
+Java-Bean: True

Modified: trunk/jtidy/debian/rules
===================================================================
--- trunk/jtidy/debian/rules	2008-06-11 21:56:48 UTC (rev 6554)
+++ trunk/jtidy/debian/rules	2008-06-13 05:46:56 UTC (rev 6555)
@@ -2,34 +2,24 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
 JAVA_HOME            := /usr/lib/jvm/java-gcj
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2
+DEB_JARS             := $(ANT_HOME)/lib/ant-trax.jar xalan2
 DEB_ANT_BUILD_TARGET := package
-BUILD_FILE           := ./debian/build.xml
-DEB_ANT_INVOKE       := ant -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
+BUILD_FILE           := debian/build.xml
+DEB_ANT_INVOKE       := ant -Dpackage=jtidy -Dversion=$(DEB_UPSTREAM_VERSION) -f $(BUILD_FILE)
 API_DOCS             := build/doc/api
 
-
 get-orig-source:
 	mkdir orig_tmp
 	cd orig_tmp && \
-		svn export -q https://svn.sourceforge.net/svnroot/jtidy/trunk/jtidy/ $(PACKAGE) && \
-		tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
+		svn export -q https://svn.sourceforge.net/svnroot/jtidy/trunk/jtidy/ jtidy && \
+		tar czf ../../jtidy_$(DEB_UPSTREAM_VERSION).orig.tar.gz jtidy
 	rm -rf orig_tmp
-	
 
-makebuilddir/libjtidy-java::
-	echo "build/$(PACKAGE)-$(VERSION).jar usr/share/java" >debian/lib$(PACKAGE)-java.install
-	echo "/usr/share/java/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar" >debian/lib$(PACKAGE)-java.links
+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
 
-makebuilddir/lib$(PACKAGE)-java-doc::
-	echo "$(API_DOCS) usr/share/doc/lib$(PACKAGE)-java" >debian/lib$(PACKAGE)-java-doc.install
-	#echo "CHANGES usr/share/doc/lib$(PACKAGE)-java" >>debian/lib$(PACKAGE)-java-doc.install
-
-cleanbuilddir/lib$(PACKAGE)-java::
-	cd debian && rm -f lib$(PACKAGE)-java-doc.install lib$(PACKAGE)-java.links lib$(PACKAGE)-java.install
+install/libjtidy-java-doc::
+	dh_install -plibjtidy-java-doc $(API_DOCS) usr/share/doc/libjtidy-java

More information about the pkg-java-commits mailing list