[xmlgraphics-commons] 04/47: * Moved from contrib to main. Closes: #452875. * Don't Build-Depend on ibm-j2sdk1.5. * Moved debhelper and cdbs from from Build-Depends-Indep to Build-Depends. * Removed unused Depends on libasm-java. * Cleaned up debian/rules. * Updated debhelper level to 5. * Added myself to Uploaders.

[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 4ee658a8f3bb5b858cd21751a2d41d5b8289a97f
Author: Michael Koch <konqueror at gmx.de>
Date:   Sat Dec 1 11:14:05 2007 +0000

    * Moved from contrib to main. Closes: #452875.
    * Don't Build-Depend on ibm-j2sdk1.5.
    * Moved debhelper and cdbs from from Build-Depends-Indep to Build-Depends.
    * Removed unused Depends on libasm-java.
    * Cleaned up debian/rules.
    * Updated debhelper level to 5.
    * Added myself to Uploaders.
---
 debian/changelog | 12 ++++++++++++
 debian/control   | 11 ++++++-----
 debian/rules     |  6 +-----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c650fa3..68c4503 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xmlgraphics-commons (1.1.dfsg.3-1) unstable; urgency=low
+
+  * Moved from contrib to main. Closes: #452875.
+  * Don't Build-Depend on ibm-j2sdk1.5.
+  * Moved debhelper and cdbs from from Build-Depends-Indep to Build-Depends.
+  * Removed unused Depends on libasm-java.
+  * Cleaned up debian/rules.
+  * Updated debhelper level to 5.
+  * Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 01 Dec 2007 12:17:10 +0100
+
 xmlgraphics-commons (1.1.dfsg.2-1) unstable; urgency=low
 
   * Move to contrib because it needs Sun's proprietary jpeg codecs.
diff --git a/debian/control b/debian/control
index b6b6d14..74b6bee 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,16 @@
 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>
-Build-Depends-Indep: debhelper (>= 4.2.30), java-gcj-compat-dev (>= 1.0.69-2), ant, ant-optional, cdbs, libcommons-io-java (>= 1.3.1), junit, ibm-j2sdk1.6
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>5), cdbs
+Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.69-2), ant-optional, libcommons-io-java (>= 1.3.1), junit
 Standards-Version: 3.7.2
 
 Package: libxmlgraphics-commons-java
-Section: contrib/libs
+Section: libs
 Architecture: all
-Depends: java-gcj-compat | java2-runtime, libasm-java
+Depends: java-gcj-compat | java2-runtime
 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/rules b/debian/rules
index 0384b3b..54b1213 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,10 @@
 #!/usr/bin/make -f
-# debian/rules file for xmlgraphics-commons (uses cdbs)
-
-export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
 
 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
 
-#JAVA_HOME := /usr/lib/jvm/java-gcj/
-JAVA_HOME := /usr/lib/j2sdk1.6-ibm/
+JAVA_HOME := /usr/lib/jvm/java-gcj
 
 # no junit test at the moment
 DEB_JARS := commons-io #junit ant-junit

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