[pkg-java] r15452 - trunk/xmlgraphics-commons/debian

Thu Nov 24 22:55:23 UTC 2011

Author: drazzib
Date: 2011-11-24 22:55:23 +0000 (Thu, 24 Nov 2011)
New Revision: 15452

Modified:
   trunk/xmlgraphics-commons/debian/changelog
   trunk/xmlgraphics-commons/debian/control
   trunk/xmlgraphics-commons/debian/copyright
   trunk/xmlgraphics-commons/debian/rules
   trunk/xmlgraphics-commons/debian/watch
Log:
* Team upload.
* d/control: Drop Depends on java2-runtime-headless since only programs
  need to depends on Java runtime (Debian Java Policy).
* Bump Standards-Version to 3.9.2: no changes needed.
* d/rules: Fix JAVA_HOME for multiarch OpenJDK.
* d/copyright: Update to latest DEP-5 format.

Modified: trunk/xmlgraphics-commons/debian/changelog
===================================================================

--- trunk/xmlgraphics-commons/debian/changelog	2011-11-24 22:15:18 UTC (rev 15451)
+++ trunk/xmlgraphics-commons/debian/changelog	2011-11-24 22:55:23 UTC (rev 15452)
@@ -1,3 +1,14 @@
+xmlgraphics-commons (1.4.dfsg-3) experimental; urgency=low
+
+  * Team upload.
+  * d/control: Drop Depends on java2-runtime-headless since only programs
+    need to depends on Java runtime (Debian Java Policy).
+  * Bump Standards-Version to 3.9.2: no changes needed.
+  * d/rules: Fix JAVA_HOME for multiarch OpenJDK.
+  * d/copyright: Update to latest DEP-5 format.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 24 Nov 2011 23:49:25 +0100
+
 xmlgraphics-commons (1.4.dfsg-2) experimental; urgency=low
 
   * Applied patches by Brian M. Carlson <sandals at crustytoothpaste.net>

Modified: trunk/xmlgraphics-commons/debian/control
===================================================================
--- trunk/xmlgraphics-commons/debian/control	2011-11-24 22:15:18 UTC (rev 15451)
+++ trunk/xmlgraphics-commons/debian/control	2011-11-24 22:55:23 UTC (rev 15452)
@@ -8,14 +8,14 @@
 Build-Depends: debhelper (>= 7), cdbs
 Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk, ant-optional,
  libcommons-io-java (>= 1.3.1), junit, libcommons-logging-java, maven-repo-helper
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://xmlgraphics.apache.org/commons/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xmlgraphics-commons
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xmlgraphics-commons
 
 Package: libxmlgraphics-commons-java
 Architecture: all
-Depends: java-gcj-compat-headless | java2-runtime-headless, ${misc:Depends}
+Depends: ${misc:Depends}
 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

Modified: trunk/xmlgraphics-commons/debian/copyright
===================================================================
--- trunk/xmlgraphics-commons/debian/copyright	2011-11-24 22:15:18 UTC (rev 15451)
+++ trunk/xmlgraphics-commons/debian/copyright	2011-11-24 22:55:23 UTC (rev 15452)
@@ -1,25 +1,26 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: xmlgraphics-commons
-Maintainer: Chris Bowditch, Thomas DeWeese, Christian Geisert,
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Upstream-Name: xmlgraphics-commons
+Upstream-Contact: Chris Bowditch, Thomas DeWeese, Christian Geisert,
  Clay Leeds, Jeremias Märki, Cameron McCormack, Simon Pepping, Jörg
  Pietschmann
 Source: http://xmlgraphics.apache.org/commons/
 
+Files: *
 Copyright: 2006, The Apache Software Foundation
-License: Apache Software License version 2.0
- On Debian systems the full text of the Apache Software License version
- 2.0 can be found in the `/usr/share/common-licenses/Apache-2.0' file.
+License: Apache-2.0
 
-Files: debian/*
-Copyright: 2007, Arnaud Vandyck <avdyk at debian.org>
-License: Apache Software License version 2.0
- On Debian systems the full text of the Apache Software License version
- 2.0 can be found in the `/usr/share/common-licenses/Apache-2.0' file.
-
 Files: debian/pom.xml
 Copyright: 2005, The Apache Software Foundation
-License: Apache Software License version 2.0
+Comment: 
  pom.xml file has been downloaded from
  <http://github.com/apache/xml-graphics-commons>
- On Debian systems the full text of the Apache Software License version
- 2.0 can be found in the `/usr/share/common-licenses/Apache-2.0' file.
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2007, Arnaud Vandyck <avdyk at debian.org>
+Copyright: 2011, Damien Raude-Morvan <drazzib at debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+  On Debian GNU/Linux system you can find the complete text of the
+  Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'

Modified: trunk/xmlgraphics-commons/debian/rules
===================================================================
--- trunk/xmlgraphics-commons/debian/rules	2011-11-24 22:15:18 UTC (rev 15451)
+++ trunk/xmlgraphics-commons/debian/rules	2011-11-24 22:55:23 UTC (rev 15452)
@@ -5,8 +5,7 @@
 
 export VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/.dfsg.*//')
 
-#JAVA_HOME := /usr/lib/jvm/java-gcj
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk  /usr/lib/jvm/java-6-sun
+JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun))
 
 # no junit test at the moment
 DEB_JARS := commons-io commons-logging #junit ant-junit

Modified: trunk/xmlgraphics-commons/debian/watch
===================================================================
--- trunk/xmlgraphics-commons/debian/watch	2011-11-24 22:15:18 UTC (rev 15451)
+++ trunk/xmlgraphics-commons/debian/watch	2011-11-24 22:55:23 UTC (rev 15452)
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/$/.dfsg/ \
+opts=dversionmangle=s/.dfsg// \
   http://www.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-(.*)-src\.tar\.gz debian debian/new-upstream


