[pkg-java] r15855 - in trunk/batik/debian: . patches

Vincent Fourmond fourmond at alioth.debian.org
Mon Mar 12 19:57:14 UTC 2012 

Author: fourmond
Date: 2012-03-12 19:57:14 +0000 (Mon, 12 Mar 2012)
New Revision: 15855

Added:
   trunk/batik/debian/patches/remove-js.patch
Modified:
   trunk/batik/debian/changelog
   trunk/batik/debian/control
   trunk/batik/debian/copyright
   trunk/batik/debian/new-upstream
   trunk/batik/debian/patches/series
   trunk/batik/debian/rules
   trunk/batik/debian/watch
Log:
[batik] remove binary jars in the source package + various cleanups

Modified: trunk/batik/debian/changelog
===================================================================
--- trunk/batik/debian/changelog	2012-03-12 19:40:56 UTC (rev 15854)
+++ trunk/batik/debian/changelog	2012-03-12 19:57:14 UTC (rev 15855)
@@ -1,3 +1,14 @@
+batik (1.7+dfsg-1) unstable; urgency=low
+
+  * Provide a repackaged tarball stripping all binary jars (closes: #657244)
+    - updated debian/new-upstream as a consequence 
+  * Disable the installation of batik-js.jar, that wasn't built from sources 
+    (it was a subset of rhino's js.jar)
+  * Conforms to standards 3.9.3
+  * Modernize a bit debian/copyright
+
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 12 Mar 2012 20:53:43 +0100
+
 batik (1.7-8) unstable; urgency=low
 
   * Fix FTBS with recent openjdk (closes: #643508)

Modified: trunk/batik/debian/control
===================================================================
--- trunk/batik/debian/control	2012-03-12 19:40:56 UTC (rev 15854)
+++ trunk/batik/debian/control	2012-03-12 19:57:14 UTC (rev 15855)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Wolfgang Baer <WBaer at gmx.de>, Michael Koch <konqueror at gmx.de>, 
  Vincent Fourmond <fourmond at debian.org>, Onkar Shinde <onkarshinde at ubuntu.com>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 5.0), cdbs
 Build-Depends-Indep: openjdk-6-jdk | sun-java5-jdk | sun-java6-jdk, ant, 
  libbsf-java, libxalan2-java, rhino, libavalon-framework-java (>= 4.2.0), 

Modified: trunk/batik/debian/copyright
===================================================================
--- trunk/batik/debian/copyright	2012-03-12 19:40:56 UTC (rev 15854)
+++ trunk/batik/debian/copyright	2012-03-12 19:57:14 UTC (rev 15855)
@@ -1,9 +1,10 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Source: http://xml.apache.org/batik
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: batik
-Upstream-Maintainer: Apache Software Foundation
-
+Upstream-Contact: Apache Software Foundation
+Source: http://xml.apache.org/batik
+ The source zip file was repackaged to remove pre-compiled binary JAR files,
+ using the script found in debian/new-upstream in debian sources.
+ .
  This package was debianized by Jeff Bailey <jbailey at debian.org> on
  Tue, 11 Jun 2002 10:52:34 -0400.
 
@@ -12,21 +13,22 @@
 Copyright: Apache Foundation
 License: Apache-2.0
 
+Files: debian/*
+Copyright: 2002-2009 Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
-
+ .
    http://www.apache.org/licenses/LICENSE-2.0
-
+ .
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
-
+ .
  The full text of the Apache License version 2.0 can be found at
  /usr/share/common-licenses/Apache-2.0 on debian systems.
-
-Files: debian/*
-Copyright: 2002-2009 Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-License: Apache-2.0

Modified: trunk/batik/debian/new-upstream
===================================================================
--- trunk/batik/debian/new-upstream	2012-03-12 19:40:56 UTC (rev 15854)
+++ trunk/batik/debian/new-upstream	2012-03-12 19:57:14 UTC (rev 15855)
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-# new-upstream: copyright 2008 by Vincent Fourmond.
-# Repackage a zip into a .tar.gz archive
+# new-upstream: copyright 2012 by Vincent Fourmond.
+# See debian/copyright file for details.
 #
 # Called by uscan; from uscan(1):
 #
@@ -15,18 +15,25 @@
 #
 
 version=$2
-filename=$3
+filename=`readlink -f $3`
 
 dir=`mktemp -d`
 
-# We repackage the upstream source zip file:
-unzip $filename -d $dir
-origname=batik_$version.orig.tar.gz
+curdir=`pwd`
 
-# We repackage excluding the lib/ subdir
+origname=batik_$version"+dfsg".orig.tar.xz
+
+echo "Repackaging batik version $version from $filename"
+
+# Abort on errors:
+set -e
+
+# We repackage the upstream source file, skipping binary JAR files.
 cd $dir
-tar cvz \
-    -f $origname bat*
+unzip $filename
+cd $dir/batik*
+find -name '*.jar' | xargs rm
+cd ..
+tar cvJf $curdir/../$origname batik*/
 cd -
-mv $dir/$origname ..
-rm -rf $dir
\ No newline at end of file
+rm -rf $dir

Added: trunk/batik/debian/patches/remove-js.patch
===================================================================
--- trunk/batik/debian/patches/remove-js.patch	                        (rev 0)
+++ trunk/batik/debian/patches/remove-js.patch	2012-03-12 19:57:14 UTC (rev 15855)
@@ -0,0 +1,17 @@
+Index: batik-1.7+dfsg/build.xml
+===================================================================
+--- batik-1.7+dfsg.orig/build.xml	2012-03-12 20:23:44.334097595 +0100
++++ batik-1.7+dfsg/build.xml	2012-03-12 20:24:06.986097050 +0100
+@@ -808,9 +808,9 @@
+     <copy file="${src}/batik-xml.pom.template" tofile="${maven}/batik-xml/${completeVersion}/batik-xml-${completeVersion}.pom" filtering="true"/>
+     <copy file="${build}/lib/batik-xml.jar" tofile="${maven}/batik-xml/${completeVersion}/batik-xml-${completeVersion}.jar"/>
+ 
+-    <mkdir dir="${maven}/batik-js/${completeVersion}"/>
+-    <copy file="${src}/batik-js.pom.template" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.pom" filtering="true"/>
+-    <copy file="${build}/lib/js.jar" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.jar"/>
++    <!-- <mkdir dir="${maven}/batik-js/${completeVersion}"/> -->
++    <!-- <copy file="${src}/batik-js.pom.template" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.pom" filtering="true"/> -->
++    <!-- <copy file="${build}/lib/js.jar" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.jar"/> -->
+ 
+     <!-- Generate checksums of all artifacts and POMs -->
+     <checksum algorithm="MD5" fileext=".md5">

Modified: trunk/batik/debian/patches/series
===================================================================
--- trunk/batik/debian/patches/series	2012-03-12 19:40:56 UTC (rev 15854)
+++ trunk/batik/debian/patches/series	2012-03-12 19:57:14 UTC (rev 15855)
@@ -1,2 +1,3 @@
 06_fix_paths_in_policy_files.patch
 source-1.5.patch
+remove-js.patch

Modified: trunk/batik/debian/rules
===================================================================
--- trunk/batik/debian/rules	2012-03-12 19:40:56 UTC (rev 15854)
+++ trunk/batik/debian/rules	2012-03-12 19:57:14 UTC (rev 15855)
@@ -24,15 +24,17 @@
 DEB_ANT_CLEAN_TARGET := clean
 
 # Increasing memory of the compiler
-ANT_OPTS             := -Xms256m -Xmx256m
+ANT_OPTS             := -Xms256m -Xmx256m -Dbuild.sysclasspath=only
 
 LIBRARY=batik
 
+UPSTREAM_VERSION = $(subst +dfsg,,$(DEB_UPSTREAM_VERSION))
+
 LIB_NAMES = all libs
 install/libbatik-java::
 	# Install poms
 	ant maven-artifacts
-	for jar in batik-$(DEB_UPSTREAM_VERSION)/maven/*/$(DEB_UPSTREAM_VERSION)/*.jar; do \
+	for jar in batik-$(UPSTREAM_VERSION)/maven/*/$(UPSTREAM_VERSION)/*.jar; do \
 	  pom=$$(dirname $$jar)/$$(basename $$jar .jar).pom; \
 	  mh_installpom -v -plibbatik-java $$pom; \
 	  mh_installjar -plibbatik-java -l $$pom $$jar; \
@@ -40,11 +42,11 @@
 
 	# Install batik-all.jar and batik-libs.jar
 	for name in $(LIB_NAMES); do \
-	  install -m 644 batik-$(DEB_UPSTREAM_VERSION)/lib/batik-$$name.jar debian/libbatik-java/usr/share/java/batik-$$name-$(DEB_UPSTREAM_VERSION).jar; \
-	  ln -s batik-$$name-$(DEB_UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-$$name.jar; \
+	  install -m 644 batik-$(UPSTREAM_VERSION)/lib/batik-$$name.jar debian/libbatik-java/usr/share/java/batik-$$name-$(UPSTREAM_VERSION).jar; \
+	  ln -s batik-$$name-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-$$name.jar; \
 	done
-	ln -s batik-all-$(DEB_UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-$(DEB_UPSTREAM_VERSION).jar; \
-	ln -s batik-all-$(DEB_UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik.jar; \
+	ln -s batik-all-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-$(UPSTREAM_VERSION).jar; \
+	ln -s batik-all-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik.jar; \
 
 	# Install wrapper scripts
 	install -d debian/libbatik-java/usr/bin

Modified: trunk/batik/debian/watch
===================================================================
--- trunk/batik/debian/watch	2012-03-12 19:40:56 UTC (rev 15854)
+++ trunk/batik/debian/watch	2012-03-12 19:57:14 UTC (rev 15855)
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://archive.apache.org/dist/xmlgraphics/batik/ batik-src-([0123456789.]*).zip debian debian/new-upstream

More information about the pkg-java-commits mailing list