[pkg-java] r11077 - in trunk/libgnumail-java/debian: . patches

[Onkar Shinde]

Author: onkarshinde-guest
Date: 2009-11-19 14:58:14 +0000 (Thu, 19 Nov 2009)
New Revision: 11077

Added:
   trunk/libgnumail-java/debian/patches/01_fix_classpath.patch
Modified:
   trunk/libgnumail-java/debian/changelog
   trunk/libgnumail-java/debian/control
   trunk/libgnumail-java/debian/rules
Log:
libgnumail-java 1.1.2-4

Modified: trunk/libgnumail-java/debian/changelog
===================================================================
--- trunk/libgnumail-java/debian/changelog	2009-11-19 12:53:03 UTC (rev 11076)
+++ trunk/libgnumail-java/debian/changelog	2009-11-19 14:58:14 UTC (rev 11077)
@@ -1,3 +1,19 @@
+libgnumail-java (1.1.2-4) unstable; urgency=low
+
+  [ Onkar Shinde ]
+  * debian/rules
+    - Remove ANT_HOME, unecessary files in DEB_JARS.
+    - Use DEB_UPSTREAM_VERSION for retrieving version.
+    - Move source version option to DEB_ANT_ARGS.
+    - Only delete jar files in clean target. Rest is handles by clean target
+      in build.xml.
+  * debian/patches/01_fix_classpath.patch
+    - Add appropriate jar files in classpath using manifest attribute.
+  * debian/control
+    - Change standards version to 3.8.3.
+
+ -- Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>  Thu, 19 Nov 2009 19:41:30 +0530
+
 libgnumail-java (1.1.2-3) unstable; urgency=low
 
   [ Matthias Klose ]

Modified: trunk/libgnumail-java/debian/control
===================================================================
--- trunk/libgnumail-java/debian/control	2009-11-19 12:53:03 UTC (rev 11076)
+++ trunk/libgnumail-java/debian/control	2009-11-19 14:58:14 UTC (rev 11077)
@@ -7,7 +7,7 @@
            Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), ant
 Build-Depends-Indep: default-jdk, libgnujaf-java, libgnuinet-java
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://savannah.gnu.org/projects/classpathx
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgnumail-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgnumail-java/

Added: trunk/libgnumail-java/debian/patches/01_fix_classpath.patch
===================================================================
--- trunk/libgnumail-java/debian/patches/01_fix_classpath.patch	                        (rev 0)
+++ trunk/libgnumail-java/debian/patches/01_fix_classpath.patch	2009-11-19 14:58:14 UTC (rev 11077)
@@ -0,0 +1,9 @@
+diff -Nur -x '*.orig' -x '*~' libgnumail-java-1.1.2/MANIFEST.MF libgnumail-java-1.1.2.new/MANIFEST.MF
+--- libgnumail-java-1.1.2/MANIFEST.MF	2007-04-29 00:22:58.000000000 +0530
++++ libgnumail-java-1.1.2.new/MANIFEST.MF	2009-11-19 20:01:05.000000000 +0530
+@@ -2,4 +2,4 @@
+ Implementation-Version: 1.3
+ Implementation-Vendor: The Free Software Foundation, Inc.
+ Implementation-URL: http://www.gnu.org/software/classpathx/javamail/
+-
++Class-Path: activation.jar inetlib.jar

Modified: trunk/libgnumail-java/debian/rules
===================================================================
--- trunk/libgnumail-java/debian/rules	2009-11-19 12:53:03 UTC (rev 11076)
+++ trunk/libgnumail-java/debian/rules	2009-11-19 14:58:14 UTC (rev 11077)
@@ -5,28 +5,25 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | sed 's/-[0-9]*$$//')
+VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2 \
-			inetlib
+DEB_JARS             := ant-trax xalan2 inetlib
 DEB_ANT_BUILD_TARGET := dist javadoc
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) \
                         -Dgnumail.jar=gnumail-$(VERSION).jar -Dproviders.jar=gnumail-providers-$(VERSION).jar \
-			-Ddoc=api
+			-Ddoc=api -Dant.build.javac.source=1.4
 API_DOCS             := api
-ANT_OPTS = -Dant.build.javac.source=1.4
 
-binary-post-install/$(PACKAGE)::
+install/$(PACKAGE)::
 	dh_install -p$(PACKAGE) ./gnumail-$(VERSION).jar usr/share/java
 	dh_install -p$(PACKAGE) ./gnumail-providers-$(VERSION).jar usr/share/java
 	dh_link -p$(PACKAGE) usr/share/java/gnumail-$(VERSION).jar usr/share/java/gnumail.jar
 	dh_link -p$(PACKAGE) usr/share/java/gnumail-providers-$(VERSION).jar usr/share/java/gnumail-providers.jar
 	dh_installchangelogs ChangeLog
 
-binary-post-install/$(PACKAGE)-doc::
+install/$(PACKAGE)-doc::
 	dh_install -p$(PACKAGE)-doc $(API_DOCS) usr/share/doc/$(PACKAGE)
 
-cleanbuilddir/$(PACKAGE)::
-	rm -rf *.jar $(API_DOCS) classes
+clean/$(PACKAGE)::
+	rm -rf *.jar