[pkg-java] r11298 - trunk/xml-commons-external/debian

Onkar Shinde onkarshinde-guest at alioth.debian.org
Thu Dec 17 14:37:19 UTC 2009


Author: onkarshinde-guest
Date: 2009-12-17 14:37:19 +0000 (Thu, 17 Dec 2009)
New Revision: 11298

Modified:
   trunk/xml-commons-external/debian/changelog
   trunk/xml-commons-external/debian/control
   trunk/xml-commons-external/debian/rules
   trunk/xml-commons-external/debian/watch
Log:
xml-commons-external 1.3.05

Modified: trunk/xml-commons-external/debian/changelog
===================================================================
--- trunk/xml-commons-external/debian/changelog	2009-12-16 21:31:21 UTC (rev 11297)
+++ trunk/xml-commons-external/debian/changelog	2009-12-17 14:37:19 UTC (rev 11298)
@@ -1,3 +1,24 @@
+xml-commons-external (1.3.05-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control
+    - Add myself to uploaders.
+    - Update standards version.
+    - Build-dep default-jdk-builddep -> default-jdk.
+    - Fix Vcs-* headers.
+    - Change dependencies from -jre to to -jre-headless. (Closes: #551547)
+    - Misc lintian fixes.
+  * debian/rules
+    - Use DEB_UPSTREAM_VERSION instead of hard coded version.
+    - Change JAVA_HOME to correspond to default-jdk.
+    - Add javac argument to compile for target JVM 1.4.
+    - Change folder for api docs.
+    - Add get-orig-source target.
+  * debian/watch
+    - Keep watch on master distribution site.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Thu, 17 Dec 2009 19:28:17 +0530
+
 xml-commons-external (1.3.04-2) unstable; urgency=low
 
   * Upload to unstable now that lenny is out.

Modified: trunk/xml-commons-external/debian/control
===================================================================
--- trunk/xml-commons-external/debian/control	2009-12-16 21:31:21 UTC (rev 11297)
+++ trunk/xml-commons-external/debian/control	2009-12-17 14:37:19 UTC (rev 11298)
@@ -2,20 +2,19 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Vincent Fourmond <fourmond at debian.org>
-XSBC-Original-Maintainer: Onkar Shinde <onkarshinde at gmail.com>
-Standards-Version: 3.8.0
+Uploaders: Vincent Fourmond <fourmond at debian.org>, Onkar Shinde <onkarshinde at ubuntu.com>
+Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: default-jdk-builddep
+Build-Depends-Indep: default-jdk
 Homepage: http://xml.apache.org/commons/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/packages/trunk/xml-commons-external
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/packages/trunk/xml-commons-external
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xml-commons-external
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xml-commons-external
 
 
 Package: libxml-commons-external-java
-Section: libs
+Section: java
 Architecture: all
-Depends: java-gcj-compat | java2-runtime
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
 Description: XML Commons external code - DOM, SAX, and JAXP, etc
  xml-commons is focused on common code and guidelines for xml
  projects.  The first focus will be to organize and have common
@@ -25,6 +24,7 @@
 Package: libxml-commons-external-java-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Description: Documentation of XML Commons external API
  xml-commons is focussed on common code and guidelines for xml
  projects.  The first focus will be to organize and have common

Modified: trunk/xml-commons-external/debian/rules
===================================================================
--- trunk/xml-commons-external/debian/rules	2009-12-16 21:31:21 UTC (rev 11297)
+++ trunk/xml-commons-external/debian/rules	2009-12-17 14:37:19 UTC (rev 11298)
@@ -3,9 +3,9 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-VERSION := 1.3.04
+VERSION := ${DEB_UPSTREAM_VERSION}
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
 
 clean::
 	rm -rf classes external.jar docs
@@ -13,13 +13,13 @@
 build-indep:
 	# Build library jar
 	mkdir classes
-	javac -d classes org/apache/xmlcommons/*.java org/w3c/css/sac/*.java org/w3c/css/sac/helpers/*.java
-	javac -d classes org/w3c/dom/*.java org/w3c/dom/bootstrap/*.java org/w3c/dom/css/*.java org/w3c/dom/events/*.java org/w3c/dom/html/*.java org/w3c/dom/ls/*.java org/w3c/dom/ranges/*.java org/w3c/dom/smil/*.java org/w3c/dom/stylesheets/*.java org/w3c/dom/svg/*.java org/w3c/dom/traversal/*.java org/w3c/dom/views/*.java org/w3c/dom/xpath/*.java
+	javac -source 1.4 -d classes org/apache/xmlcommons/*.java org/w3c/css/sac/*.java org/w3c/css/sac/helpers/*.java
+	javac -source 1.4 -d classes org/w3c/dom/*.java org/w3c/dom/bootstrap/*.java org/w3c/dom/css/*.java org/w3c/dom/events/*.java org/w3c/dom/html/*.java org/w3c/dom/ls/*.java org/w3c/dom/ranges/*.java org/w3c/dom/smil/*.java org/w3c/dom/stylesheets/*.java org/w3c/dom/svg/*.java org/w3c/dom/traversal/*.java org/w3c/dom/views/*.java org/w3c/dom/xpath/*.java
 	jar -cvfm external.jar manifest.commons -C classes/  org/
 
 	#Build api documentation
-	mkdir docs
-	javadoc -d docs javax.xml org.apache.xmlcommons org.w3c.css.sac org.w3c.dom
+	mkdir api
+	javadoc -d api javax.xml org.apache.xmlcommons org.w3c.css.sac org.w3c.dom
 
 install/libxml-commons-external-java::
 	# Install the libraries into the libxml-commons-external-java package
@@ -29,6 +29,8 @@
 
 install/libxml-commons-external-java-doc::
 	# Install the documentation into the libxml-commons-java-doc package
-	mkdir -p debian/libxml-commons-external-java-doc/usr/share/doc/libxml-commons-external-java-doc/
-	cp -r docs debian/libxml-commons-external-java-doc/usr/share/doc/libxml-commons-external-java-doc/
+	mkdir -p debian/libxml-commons-external-java-doc/usr/share/doc/libxml-commons-external-java/
+	cp -r api debian/libxml-commons-external-java-doc/usr/share/doc/libxml-commons-external-java/
 
+get-orig-source::
+	uscan --force-download --rename

Modified: trunk/xml-commons-external/debian/watch
===================================================================
--- trunk/xml-commons-external/debian/watch	2009-12-16 21:31:21 UTC (rev 11297)
+++ trunk/xml-commons-external/debian/watch	2009-12-17 14:37:19 UTC (rev 11298)
@@ -1,2 +1,2 @@
 version=3
-http://xml.apache.org/mirrors.cgi http://.*xml-commons-external-(.*)-src.tar.gz
+http://www.apache.org/dist/xml/commons/xml-commons-external-(1.3[\d\.]+)-src.tar.gz debian uupdate




More information about the pkg-java-commits mailing list