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

mkoch at alioth.debian.org mkoch at alioth.debian.org
Thu Dec 27 20:28:01 UTC 2007


Author: mkoch
Date: 2007-12-27 20:28:01 +0000 (Thu, 27 Dec 2007)
New Revision: 5175

Added:
   trunk/xmlgraphics-commons/debian/README.Debian-source
Removed:
   trunk/xmlgraphics-commons/debian/README.Debian
   trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java.dirs
   trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java.install
   trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java.links
Modified:
   trunk/xmlgraphics-commons/debian/changelog
   trunk/xmlgraphics-commons/debian/compat
   trunk/xmlgraphics-commons/debian/control
   trunk/xmlgraphics-commons/debian/rules
Log:
xmlgraphics-commons (1.2.dfsg-1) unstable; urgency=low

  * New upstream release.
  * Renamed README.Debian to README.Debian-source and adjusted content.
  * Removed libxmlgraphics-commons-java.dirs,
    libxmlgraphics-commons-java.install and
    libxmlgraphics-commons-java.links files and implemented them in     debian/rules accounting for upstream version automatically.
  * Build-Depend on sun-java6-jdk instead of 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 Standards-Version to 3.7.3.
  * Updated debhelper level to 5.
  * Added myself to Uploaders.

 -- Michael Koch <konqueror at gmx.de>  Thu, 27 Dec 2007 21:13:11 +0100



Deleted: trunk/xmlgraphics-commons/debian/README.Debian
===================================================================
--- trunk/xmlgraphics-commons/debian/README.Debian	2007-12-27 19:17:42 UTC (rev 5174)
+++ trunk/xmlgraphics-commons/debian/README.Debian	2007-12-27 20:28:01 UTC (rev 5175)
@@ -1,19 +0,0 @@
-xmlgraphics-commons
--------------------
-
-Why in contrib?
----------------
-
-xmlgraphics-commons needs Sun's proprietary jpeg codecs to build. If you
-want to use those codec's in your application, you'll need a proprietary
-virtual machine (the one from Sun, IBM or Blackdown).
-
-Whe the JDK will be completly free, we can hope Classpath will integrate
-those codec's.
-
-Source tarball:
----------------
-
-I removed commons-io.jar from lib directory.
-
- -- Arnaud Vandyck <avdyk at debian.org>, Mon,  7 May 2007 10:49:11 +0200

Added: trunk/xmlgraphics-commons/debian/README.Debian-source
===================================================================
--- trunk/xmlgraphics-commons/debian/README.Debian-source	                        (rev 0)
+++ trunk/xmlgraphics-commons/debian/README.Debian-source	2007-12-27 20:28:01 UTC (rev 5175)
@@ -0,0 +1,9 @@
+xmlgraphics-commons
+-------------------
+
+Source tarball:
+---------------
+
+I removed commons-io.jar from lib directory.
+
+ -- Arnaud Vandyck <avdyk at debian.org>, Mon,  7 May 2007 10:49:11 +0200

Modified: trunk/xmlgraphics-commons/debian/changelog
===================================================================
--- trunk/xmlgraphics-commons/debian/changelog	2007-12-27 19:17:42 UTC (rev 5174)
+++ trunk/xmlgraphics-commons/debian/changelog	2007-12-27 20:28:01 UTC (rev 5175)
@@ -1,14 +1,20 @@
-xmlgraphics-commons (1.1.dfsg.3-1) unstable; urgency=low
+xmlgraphics-commons (1.2.dfsg-1) unstable; urgency=low
 
-  * Moved from contrib to main. Closes: #452875.
-  * Don't Build-Depend on ibm-j2sdk1.5.
+  * New upstream release.
+  * Renamed README.Debian to README.Debian-source and adjusted content.
+  * Removed libxmlgraphics-commons-java.dirs,
+    libxmlgraphics-commons-java.install and
+    libxmlgraphics-commons-java.links files and implemented them in
+    debian/rules accounting for upstream version automatically.
+  * Build-Depend on sun-java6-jdk instead of 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 Standards-Version to 3.7.3.
   * Updated debhelper level to 5.
   * Added myself to Uploaders.
 
- -- Michael Koch <konqueror at gmx.de>  Sat, 01 Dec 2007 12:17:10 +0100
+ -- Michael Koch <konqueror at gmx.de>  Thu, 27 Dec 2007 21:13:11 +0100
 
 xmlgraphics-commons (1.1.dfsg.2-1) unstable; urgency=low
 

Modified: trunk/xmlgraphics-commons/debian/compat
===================================================================
--- trunk/xmlgraphics-commons/debian/compat	2007-12-27 19:17:42 UTC (rev 5174)
+++ trunk/xmlgraphics-commons/debian/compat	2007-12-27 20:28:01 UTC (rev 5175)
@@ -1 +1 @@
-4
+5

Modified: trunk/xmlgraphics-commons/debian/control
===================================================================
--- trunk/xmlgraphics-commons/debian/control	2007-12-27 19:17:42 UTC (rev 5174)
+++ trunk/xmlgraphics-commons/debian/control	2007-12-27 20:28:01 UTC (rev 5175)
@@ -1,14 +1,14 @@
 Source: xmlgraphics-commons
-Section: libs
+Section: contrib/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>
 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
+Build-Depends-Indep: sun-java6-jdk, ant-optional, libcommons-io-java (>= 1.3.1), junit
+Standards-Version: 3.7.3
 
 Package: libxmlgraphics-commons-java
-Section: libs
+Section: contrib/libs
 Architecture: all
 Depends: java-gcj-compat | java2-runtime
 Description: reusable components used by Batik and FOP
@@ -20,7 +20,7 @@
  files, and much more.
 
 #Package: libxmlgraphics-commons-java-doc
-#Section: doc
+#Section: contrib/doc
 #Architecture: all
 #Suggests: libxmlgraphics-commons-java
 #Description: reusable components used by Batik and FOP

Deleted: trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java.dirs
===================================================================
--- trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java.dirs	2007-12-27 19:17:42 UTC (rev 5174)
+++ trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java.dirs	2007-12-27 20:28:01 UTC (rev 5175)
@@ -1 +0,0 @@
-usr/share/java

Deleted: trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java.install
===================================================================
--- trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java.install	2007-12-27 19:17:42 UTC (rev 5174)
+++ trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java.install	2007-12-27 20:28:01 UTC (rev 5175)
@@ -1 +0,0 @@
-build/xmlgraphics-commons-1.1.jar			/usr/share/java/

Deleted: trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java.links
===================================================================
--- trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java.links	2007-12-27 19:17:42 UTC (rev 5174)
+++ trunk/xmlgraphics-commons/debian/libxmlgraphics-commons-java.links	2007-12-27 20:28:01 UTC (rev 5175)
@@ -1 +0,0 @@
-/usr/share/java/xmlgraphics-commons-1.1.jar	/usr/share/java/xmlgraphics-commons.jar

Modified: trunk/xmlgraphics-commons/debian/rules
===================================================================
--- trunk/xmlgraphics-commons/debian/rules	2007-12-27 19:17:42 UTC (rev 5174)
+++ trunk/xmlgraphics-commons/debian/rules	2007-12-27 20:28:01 UTC (rev 5175)
@@ -4,8 +4,15 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+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
+
 # no junit test at the moment
 DEB_JARS := commons-io #junit ant-junit
 DEB_ANT_BUILD_TARGET := all
+
+install/libxmlgraphics-commons-java::
+	install -m644 -D build/xmlgraphics-commons-$(VERSION).jar debian/libxmlgraphics-commons-java/usr/share/java/xmlgraphics-commons-$(VERSION).jar
+	dh_link -plibxmlgraphics-commons-java usr/share/java/xmlgraphics-commons-$(VERSION).jar usr/share/java/xmlgraphics-commons.jar




More information about the pkg-java-commits mailing list