[pkg-java] r14771 - trunk/libjasper-java/debian

[Torsten Werner]

Author: twerner
Date: 2011-09-08 19:48:26 +0000 (Thu, 08 Sep 2011)
New Revision: 14771

Modified:
   trunk/libjasper-java/debian/
   trunk/libjasper-java/debian/changelog
   trunk/libjasper-java/debian/control
   trunk/libjasper-java/debian/rules
Log:
Use jar instead of zip.


Property changes on: trunk/libjasper-java/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/libjasper-java/debian/changelog
===================================================================
--- trunk/libjasper-java/debian/changelog	2011-09-08 19:42:24 UTC (rev 14770)
+++ trunk/libjasper-java/debian/changelog	2011-09-08 19:48:26 UTC (rev 14771)
@@ -8,8 +8,9 @@
   * Remove Java runtime from Depends.
   * Update Standards-Version: 3.9.2.
   * Remove debian/README.source.
+  * Use jar instead of zip.
 
- -- Torsten Werner <twerner at debian.org>  Thu, 08 Sep 2011 21:42:03 +0200
+ -- Torsten Werner <twerner at debian.org>  Thu, 08 Sep 2011 21:45:25 +0200
 
 libjasper-java (5.5.26-5) unstable; urgency=low
 

Modified: trunk/libjasper-java/debian/control
===================================================================
--- trunk/libjasper-java/debian/control	2011-09-08 19:42:24 UTC (rev 14770)
+++ trunk/libjasper-java/debian/control	2011-09-08 19:48:26 UTC (rev 14771)
@@ -5,7 +5,7 @@
 Uploaders: Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>,
  Niels Thykier <niels at thykier.net>
 Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, libcommons-el-java,
- libcommons-logging-java, libecj-java, libservlet2.4-java, zip
+ libcommons-logging-java, libecj-java, libservlet2.4-java
 Standards-Version: 3.9.2
 Homepage: http://tomcat.apache.org
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/tomcat5.5

Modified: trunk/libjasper-java/debian/rules
===================================================================
--- trunk/libjasper-java/debian/rules	2011-09-08 19:42:24 UTC (rev 14770)
+++ trunk/libjasper-java/debian/rules	2011-09-08 19:48:26 UTC (rev 14771)
@@ -7,12 +7,13 @@
 DEB_ANT_BUILD_TARGET := build-prepare build-only -propertyfile debian/ant.properties
 
 JAVA_HOME	:= /usr/lib/jvm/default-java
+JAR             := $(JAVA_HOME)/bin/jar
 
 DEB_JARS 	:= ant ant-launcher ant-trax
 
 install/libjasper-java::
-	cd build/shared/classes/ && zip -r ../../jasper.jar *
-	jar umf debian/osgi.MF build/jasper.jar
+	cd build/shared/classes/ && $(JAR) cf ../../jasper.jar *
+	$(JAR) umf debian/osgi.MF build/jasper.jar
 	mv build/jasper.jar build/jasper-$(DEB_UPSTREAM_VERSION).jar
 	dh_install -plibjasper-java build/jasper-$(DEB_UPSTREAM_VERSION).jar /usr/share/java
 	dh_link -plibjasper-java /usr/share/java/jasper-$(DEB_UPSTREAM_VERSION).jar \