[libitext-java] 17/76: Reworked debian/rules: Added DEB_ANT_BUILDFILE, Removed ANT_ARGS and API_VERSION, use DEB_UPSTREAM_VERSION instead

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libitext-java.

commit 0f9094eda6e4ab3d753c3db828c907208ce4d819
Author: Adriaan Peeters <apeeters at lashout.net>
Date:   Thu Jun 5 18:56:53 2008 +0000

    Reworked debian/rules: Added DEB_ANT_BUILDFILE, Removed ANT_ARGS and API_VERSION, use DEB_UPSTREAM_VERSION instead
---
 debian/changelog |  4 ++++
 debian/rules     | 10 +++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c67cfc..263647b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ libitext-java (2.1.2u-1) UNRELEASED; urgency=low
   * 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
 
diff --git a/debian/rules b/debian/rules
index fbdcd12..0e8277d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,19 +9,15 @@ ANT_HOME             := /usr/share/ant
 DEB_JARS             := servlet-2.3.jar ant-optional ecj $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_BUILD_TARGET := jar
 DEB_ANT_CLEAN_TARGET :=
-
-# 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
+DEB_ANT_BUILDFILE    := src/build.xml
 
 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::

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libitext-java.git