Author: ebourg-guest Date: 2013-05-14 23:32:53 +0000 (Tue, 14 May 2013) New Revision: 16642
Added: trunk/libgnumail-java/debian/patches/04_remove_jaf_dependency.patch Modified: trunk/libgnumail-java/debian/changelog trunk/libgnumail-java/debian/control trunk/libgnumail-java/debian/patches/01_fix_classpath.patch trunk/libgnumail-java/debian/patches/javadoc-link.patch trunk/libgnumail-java/debian/patches/series trunk/libgnumail-java/debian/rules Log: Removed the obsolete dependency on libgnujaf-java debian/rules: Improved the clean target to allow rebuilds Modified: trunk/libgnumail-java/debian/changelog =================================================================== --- trunk/libgnumail-java/debian/changelog 2013-05-14 23:08:28 UTC (rev 16641) +++ trunk/libgnumail-java/debian/changelog 2013-05-14 23:32:53 UTC (rev 16642) @@ -1,3 +1,11 @@ +libgnumail-java (1.1.2-9) unstable; urgency=low + + * Team upload. + * Removed the obsolete dependency on libgnujaf-java + * debian/rules: Improved the clean target to allow rebuilds + + -- Emmanuel Bourg <[email protected]> Wed, 15 May 2013 01:21:02 +0200 + libgnumail-java (1.1.2-8) unstable; urgency=low [ Jakub Adam ] Modified: trunk/libgnumail-java/debian/control =================================================================== --- trunk/libgnumail-java/debian/control 2013-05-14 23:08:28 UTC (rev 16641) +++ trunk/libgnumail-java/debian/control 2013-05-14 23:32:53 UTC (rev 16642) @@ -2,11 +2,9 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Torsten Werner <[email protected]>, - Jakub Adam <[email protected]> +Uploaders: Torsten Werner <[email protected]>, Jakub Adam <[email protected]> Build-Depends: debhelper (>= 8), cdbs (>= 0.4.5.3), ant, maven-repo-helper -Build-Depends-Indep: default-jdk, libgnujaf-java, libgnuinet-java, bnd, - default-jdk-doc, libgnujaf-java-doc +Build-Depends-Indep: default-jdk, libgnuinet-java, bnd, default-jdk-doc Standards-Version: 3.9.4 Homepage: http://savannah.gnu.org/projects/classpathx Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libgnumail-java/ @@ -14,7 +12,7 @@ Package: libgnumail-java Architecture: all -Depends: libgnujaf-java, libgnuinet-java, ${misc:Depends} +Depends: libgnuinet-java, ${misc:Depends} Suggests: libgnumail-java-doc Description: free implementation of the javamail API The javamail API provides abstract classes that model a mail @@ -26,7 +24,7 @@ Architecture: all Section: doc Depends: ${misc:Depends} -Recommends: default-jdk-doc, libgnujaf-java-doc, libgnuinet-java +Recommends: default-jdk-doc, libgnuinet-java Suggests: libgnumail-java Description: free implementation of the javamail API (Javadocs) The javamail API provides abstract classes that model a mail Modified: trunk/libgnumail-java/debian/patches/01_fix_classpath.patch =================================================================== --- trunk/libgnumail-java/debian/patches/01_fix_classpath.patch 2013-05-14 23:08:28 UTC (rev 16641) +++ trunk/libgnumail-java/debian/patches/01_fix_classpath.patch 2013-05-14 23:32:53 UTC (rev 16642) @@ -1,10 +1,10 @@ Description: Adds missing dependencies in the Manifest. ---- a/MANIFEST.MF 2007-04-29 00:22:58.000000000 +0530 -+++ b/MANIFEST.MF 2009-11-19 20:01:05.000000000 +0530 +--- a/MANIFEST.MF ++++ b/MANIFEST.MF @@ -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 ++Class-Path: inetlib.jar Added: trunk/libgnumail-java/debian/patches/04_remove_jaf_dependency.patch =================================================================== --- trunk/libgnumail-java/debian/patches/04_remove_jaf_dependency.patch (rev 0) +++ trunk/libgnumail-java/debian/patches/04_remove_jaf_dependency.patch 2013-05-14 23:32:53 UTC (rev 16642) @@ -0,0 +1,51 @@ +Description: Remove the explicit dependency on the Java Activation Framework + since it's now part of the JRE. +Author: Emmanuel Bourg +Forwarded: no +--- a/build.xml ++++ b/build.xml +@@ -36,7 +36,6 @@ + <property name='providers.jar' location='gnumail-providers.jar'/> + + <!-- Override these for your own locations --> +- <property name='activation.jar' location='/usr/share/java/activation.jar'/> + <property name='inetlib.jar' location='/usr/share/java/inetlib.jar'/> + + <property name='META-INF' location='${dst}/META-INF'/> +@@ -52,7 +51,6 @@ + + <path id='mail.classpath'> + <pathelement path='${src}'/> +- <pathelement path='${activation.jar}'/> + <pathelement path='${inetlib.jar}'/> + </path> + +@@ -63,19 +61,14 @@ + + <!-- Targets --> + <target name='preinit'> +- <available file='${activation.jar}' property='activation.available'/> + <available file='${inetlib.jar}' property='inetlib.available'/> + </target> + +- <target name='activation.jar.unavailable' depends='preinit' unless='activation.available'> +- <fail message='Can't find ${activation.jar} - see INSTALL'/> +- </target> +- + <target name='inetlib.jar.unavailable' depends='preinit' unless='inetlib.available'> + <fail message='Can't find ${inetlib.jar} - see INSTALL'/> + </target> + +- <target name='init' depends='preinit,activation.jar.unavailable,inetlib.jar.unavailable'> ++ <target name='init' depends='preinit,inetlib.jar.unavailable'> + <echo>WARNING: compilation using Ant is not supported, see the file INSTALL for details</echo> + <tstamp/> + <mkdir dir='${dst}'/> +@@ -196,7 +189,6 @@ + + <!-- Installation --> + <target name='install' depends='dist' description='Install the JAR files in ${install-dir}'> +- <copy file='${activation.jar}' todir='${install-dir}'/> + <copy file='${gnumail.jar}' todir='${install-dir}'/> + <copy file='${providers.jar}' todir='${install-dir}'/> + </target> Modified: trunk/libgnumail-java/debian/patches/javadoc-link.patch =================================================================== --- trunk/libgnumail-java/debian/patches/javadoc-link.patch 2013-05-14 23:08:28 UTC (rev 16641) +++ trunk/libgnumail-java/debian/patches/javadoc-link.patch 2013-05-14 23:32:53 UTC (rev 16642) @@ -1,14 +1,13 @@ Description: Links against system installed javadocs. ---- a/build.xml 2010-06-20 20:54:48.576950829 +0200 -+++ b/build.xml 2010-06-20 20:57:01.173018761 +0200 -@@ -229,6 +229,9 @@ +--- a/build.xml ++++ b/build.xml +@@ -229,6 +229,8 @@ <include name='gnu/mail/providers/mbox'/> <include name='gnu/mail/providers/maildir'/> </packageset> + <link href="/usr/share/doc/default-jdk-doc/api" /> + <link href="/usr/share/doc/libgnuinet-java" /> -+ <link href="/usr/share/doc/libgnujaf-java-doc/api" /> </javadoc> </target> Modified: trunk/libgnumail-java/debian/patches/series =================================================================== --- trunk/libgnumail-java/debian/patches/series 2013-05-14 23:08:28 UTC (rev 16641) +++ trunk/libgnumail-java/debian/patches/series 2013-05-14 23:32:53 UTC (rev 16642) @@ -1,3 +1,4 @@ 01_fix_classpath.patch gnumail-imaps.patch javadoc-link.patch +04_remove_jaf_dependency.patch Modified: trunk/libgnumail-java/debian/rules =================================================================== --- trunk/libgnumail-java/debian/rules 2013-05-14 23:08:28 UTC (rev 16641) +++ trunk/libgnumail-java/debian/rules 2013-05-14 23:32:53 UTC (rev 16642) @@ -26,6 +26,6 @@ install/$(PACKAGE)-doc:: dh_install -p$(PACKAGE)-doc $(API_DOCS) usr/share/doc/$(PACKAGE) -clean/$(PACKAGE):: +clean:: rm -rf *.jar - + mh_clean _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
