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

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-12-01 11:14:05 +0000 (Sat, 01 Dec 2007)
New Revision: 4932

Modified:
   trunk/xmlgraphics-commons/debian/
   trunk/xmlgraphics-commons/debian/changelog
   trunk/xmlgraphics-commons/debian/control
   trunk/xmlgraphics-commons/debian/rules
Log:
* 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.


Property changes on: trunk/xmlgraphics-commons/debian
___________________________________________________________________
Name: svn:ignore
   + files
libxmlgraphics-commons-java
stamp-*


Modified: trunk/xmlgraphics-commons/debian/changelog
===================================================================
--- trunk/xmlgraphics-commons/debian/changelog	2007-12-01 10:54:45 UTC (rev 4931)
+++ trunk/xmlgraphics-commons/debian/changelog	2007-12-01 11:14:05 UTC (rev 4932)
@@ -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.

Modified: trunk/xmlgraphics-commons/debian/control
===================================================================
--- trunk/xmlgraphics-commons/debian/control	2007-12-01 10:54:45 UTC (rev 4931)
+++ trunk/xmlgraphics-commons/debian/control	2007-12-01 11:14:05 UTC (rev 4932)
@@ -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

Modified: trunk/xmlgraphics-commons/debian/rules
===================================================================
--- trunk/xmlgraphics-commons/debian/rules	2007-12-01 10:54:45 UTC (rev 4931)
+++ trunk/xmlgraphics-commons/debian/rules	2007-12-01 11:14:05 UTC (rev 4932)
@@ -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