[pkg-java] r6531 - trunk/libitext-java/debian

[apeeters-guest at alioth.debian.org]

Author: apeeters-guest
Date: 2008-06-05 18:56:53 +0000 (Thu, 05 Jun 2008)
New Revision: 6531

Modified:
   trunk/libitext-java/debian/changelog
   trunk/libitext-java/debian/rules
Log:
Reworked debian/rules: Added DEB_ANT_BUILDFILE, Removed ANT_ARGS and API_VERSION, use DEB_UPSTREAM_VERSION instead

Modified: trunk/libitext-java/debian/changelog
===================================================================
--- trunk/libitext-java/debian/changelog	2008-06-05 18:52:38 UTC (rev 6530)
+++ trunk/libitext-java/debian/changelog	2008-06-05 18:56:53 UTC (rev 6531)
@@ -4,6 +4,10 @@
   * Removed patches:
     - debian/patches/01_jpeg_encoder_classpath.patch
     - debian/patches/02_ant_properties.patch
+  * debian/rules:
+    - Added DEB_ANT_BUILDFILE
+    - Removed ANT_ARGS
+    - Removed API_VERSION, use DEB_UPSTREAM_VERSION instead
 
  -- Adriaan Peeters <apeeters at lashout.net>  Thu, 05 Jun 2008 19:50:55 +0200
 

Modified: trunk/libitext-java/debian/rules
===================================================================
--- trunk/libitext-java/debian/rules	2008-06-05 18:52:38 UTC (rev 6530)
+++ trunk/libitext-java/debian/rules	2008-06-05 18:56:53 UTC (rev 6531)
@@ -9,19 +9,15 @@
 DEB_JARS             := servlet-2.3.jar ant-optional ecj $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_BUILD_TARGET := jar
 DEB_ANT_CLEAN_TARGET :=
+DEB_ANT_BUILDFILE    := src/build.xml
 
-# Additional command-line arguments for Ant
-ANT_ARGS             := -Dcompile.optimize=false -D debian/ant.properties 
-
-#ANT_ARGS             := -Dbuild.sysclasspath=first -Dj2ee.jar=/usr/share/java/servlet-api.jar
-
 LIBRARY_PACKAGE      := itext
 API_VERSION          := 1.4.5
 
 install/lib$(LIBRARY_PACKAGE)-java::
 	dh_installdirs -plib$(LIBRARY_PACKAGE)-java usr/share/java
-	install -m 644 build/bin/iText.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
-	ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE).jar
+	install -m 644 build/bin/iText.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
+	ln -s $(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE).jar
 
 
 clean::