[pkg-java] r18587 - trunk/fop/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-11-02 14:20:15 +0000 (Sun, 02 Nov 2014)
New Revision: 18587

Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/control
   trunk/fop/debian/fop.sh
   trunk/fop/debian/watch
Log:
Added the uncommitted changes from fop/1:1.1.dfsg-2



Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2014-10-28 16:22:43 UTC (rev 18586)
+++ trunk/fop/debian/changelog	2014-11-02 14:20:15 UTC (rev 18587)
@@ -1,9 +1,13 @@
-fop (1:1.1.dfsg-2) UNRELEASED; urgency=low
+fop (1:1.1.dfsg-2) unstable; urgency=low
 
+  * Upload to sid
   * Make sure fop install correct libfop-java version
   * fop now required qdox >= 1.12 to build
+  * Bump Std-Vers to 3.9.4, no changes needed
+  * Remove servlet-api from fop.sh. Closes: #671273
+  * Use newer d/watch (HowToHelpWithFixingWatchFiles)
 
- -- Mathieu Malaterre <malat at debian.org>  Wed, 21 Nov 2012 11:33:05 +0100
+ -- Mathieu Malaterre <malat at debian.org>  Thu, 16 May 2013 10:39:12 +0200
 
 fop (1:1.1.dfsg-1) experimental; urgency=low
 

Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control	2014-10-28 16:22:43 UTC (rev 18586)
+++ trunk/fop/debian/control	2014-11-02 14:20:15 UTC (rev 18587)
@@ -13,7 +13,7 @@
  libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.5),
  libservlet2.5-java, libxml-commons-external-java, maven-repo-helper, libqdox-java (>= 1.12),
  unzip
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://xmlgraphics.apache.org/fop/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/fop
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/fop/

Modified: trunk/fop/debian/fop.sh
===================================================================
--- trunk/fop/debian/fop.sh	2014-10-28 16:22:43 UTC (rev 18586)
+++ trunk/fop/debian/fop.sh	2014-11-02 14:20:15 UTC (rev 18587)
@@ -35,7 +35,7 @@
 find_java_runtime openjdk sun  || find_java_runtime 
 
 find_jars commons-io avalon-framework serializer xalan2 xml-apis 
-find_jars batik-all commons-logging servlet-api xercesImpl xmlgraphics-commons
+find_jars batik-all commons-logging xercesImpl xmlgraphics-commons
 find_jars xml-apis-ext 
 
 # We load the hyphenation jar at the request of the user.

Modified: trunk/fop/debian/watch
===================================================================
--- trunk/fop/debian/watch	2014-10-28 16:22:43 UTC (rev 18586)
+++ trunk/fop/debian/watch	2014-11-02 14:20:15 UTC (rev 18587)
@@ -1,4 +1,4 @@
 version=3
-opts=dversionmangle=s/\.dfsg// \
-http://www.apache.org/dist/xmlgraphics/fop/source/fop-([\d\.]+)-src.tar.gz \
-debian debian/orig-tar.sh
\ No newline at end of file
+opts=dversionmangle=s/(\d)[\+\.\-~](?:dfsg|debian|ds|repack)\.?\d*$/$1/,uversionmangle=s/(\db?)[_\-\.](src)$/$1/ \
+http://www.apache.org/dist/xmlgraphics/fop/source/fop[\-\._]?(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) \
+debian debian/orig-tar.sh