[xmlgraphics-commons] 23/47: * 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.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository xmlgraphics-commons.

commit 0b948dbd6df08a2e0a08f54f8c4a8f471446e8cc
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Thu Nov 24 22:55:23 2011 +0000

    * 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.
---
 debian/changelog | 11 +++++++++++
 debian/control   |  4 ++--
 debian/copyright | 31 ++++++++++++++++---------------
 debian/rules     |  3 +--
 debian/watch     |  2 +-
 5 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f576f29..9b57d67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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>
diff --git a/debian/control b/debian/control
index 33c3667..a79c3f9 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,14 @@ Uploaders: Michael Koch <konqueror at gmx.de>, Vincent Fourmond <fourmond at debian.or
 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
diff --git a/debian/copyright b/debian/copyright
index 3879d79..6746cdc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -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.
-
-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.
+License: Apache-2.0
 
 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'
diff --git a/debian/rules b/debian/rules
index 0ef4c58..1248565 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,7 @@ include /usr/share/cdbs/1/class/ant.mk
 
 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
diff --git a/debian/watch b/debian/watch
index e57cae5..d8acaf4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/xmlgraphics-commons.git