[xmlgraphics-commons] 07/47: [xmlgraphics-commons] Ready to move to main/experimental

[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 3852a3623a81bb2ef37d6e27ff20b6e8fc5a9ba2
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Wed Sep 17 22:34:10 2008 +0000

    [xmlgraphics-commons] Ready to move to main/experimental
---
 debian/changelog | 14 ++++++++++++--
 debian/control   | 11 ++++++-----
 debian/rules     |  2 +-
 debian/watch     |  2 +-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2231947..18bdbc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
-xmlgraphics-commons (1.2.dfsg-2) UNRELEASED; urgency=low
+xmlgraphics-commons (1.2.dfsg+dak-1) experimental; urgency=low
 
+  [ Michael Koch ]
   * Fixed watch file to match current debian version format.
 
- -- Michael Koch <konqueror at gmx.de>  Sat, 29 Dec 2007 20:53:28 +0100
+  [ Vincent Fourmond ]
+  * Added myself to Uploaders
+  * Fixed debian/rules and debian/control to build with openjdk 
+    (closes: #452875)
+  * Already conforms to Standards 3.8.0
+  * Moving to main, hence the pseudo-new-upstream tarball to work
+    around dak's contrib-to-main bug.
+  * Uploading to experimental to avoid potential disruption
+
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 18 Sep 2008 00:28:42 +0200
 
 xmlgraphics-commons (1.2.dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index be10633..1c981bf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
 Source: xmlgraphics-commons
-Section: contrib/libs
+Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>,
+ Vincent Fourmond <fourmond at debian.org>
 Build-Depends: debhelper (>5), cdbs
-Build-Depends-Indep: sun-java6-jdk, ant-optional, libcommons-io-java (>= 1.3.1), junit
-Standards-Version: 3.7.3
+Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk, ant-optional, 
+ libcommons-io-java (>= 1.3.1), junit
+Standards-Version: 3.8.0
 
 Package: libxmlgraphics-commons-java
-Section: contrib/libs
 Architecture: all
 Depends: java-gcj-compat | java2-runtime
 Description: reusable components used by Batik and FOP
diff --git a/debian/rules b/debian/rules
index 68d238a..f8df6dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\- | sed -e 's/.dfsg.*//')
 
 #JAVA_HOME := /usr/lib/jvm/java-gcj
-JAVA_HOME := /usr/lib/jvm/java-6-sun
+JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk  /usr/lib/jvm/java-6-sun
 
 # no junit test at the moment
 DEB_JARS := commons-io #junit ant-junit
diff --git a/debian/watch b/debian/watch
index 428248d..fba9803 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\.dfsg$// \
+opts=dversionmangle=s/\.dfsg(\+dak)?$// \
   http://www.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-(.*)-src\.tar\.gz

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