[libjcommon-java] 06/31: libjcommon-java (1.0.5-1) unstable; urgency=low

Sat Oct 15 17:04:09 UTC 2016

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

apo pushed a commit to branch master
in repository libjcommon-java.

commit e05cb0ab3839f2cdb40ab3823cb7894026f38c5b
Author: Arnaud Vandyck <avdyk at debian.org>
Date:   Wed Jul 19 10:44:49 2006 +0000

    libjcommon-java (1.0.5-1) unstable; urgency=low
    
      Robert Schuster <robert.schuster at tarent.de>:
      * New stable upstream release
      * Build with java-gcj-compat-dev and ecj-bootstrap
      Arnaud Vandyck <avdyk at debian.org>:
      * Updated Standards-Version to 3.7.2: added cdbs and debhelper in
        Build-Depends.
      * Added myself to uploaders.
      * debian/rules: removed ant-launcher.jar, no more needed by cdbs-ant
    
     -- Arnaud Vandyck <avdyk at debian.org>  Wed, 19 Jul 2006 12:39:50 +0200
---
 debian/ant.properties | 41 +++++++++++++++++++++++++++--------------
 debian/changelog      | 13 +++++++++++++
 debian/control        |  9 +++++----
 debian/rules          | 37 ++++++++++++++++++++++++-------------
 4 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index d63d790..f759a20 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,17 +1,30 @@
+###########################################################
+#
+#  Global settings ...
 jcommon.name=jcommon
-jcommon.version=1.0.0
-build.debug=true
-build.optimize=false
-build.deprecation=true
-build.target=1.3
 
-libdir=/usr/share/java
-junit-dir=/usr/share/java
-junit-jar-file=junit.jar
+# needed for the Docs
+jcommon.version=1.0.5
 
-# Generated files
-jcommon-jar-file=jcommon-1.0.0.jar
-jcommon-bundle-file=jcommon-1.0.0-bundle.jar
-jcommon-junit-jar-file=jcommon-1.0.0-junit.jar
-jcommon-xml-jar-file=jcommon-xml-1.0.0.jar
-jcommon-xml-bundle-file=jcommon-xml-1.0.0-bundle.jar
+# If you specify a non-empty string, then dont forget the
+# trailing / here or your results wont fit your expectations...
+#
+targetdir=
+manifest-lib-prefix=lib/
+
+###########################################################
+#
+#  Used libraries ...
+# Provided via rules file
+jaxp-jar-file=
+servlet-jar-file=
+junit-jar-file=
+
+##############################################################
+#
+# Generated files ...
+jcommon-jar-file=jcommon.jar
+jcommon-bundle-file=jcommon-bundle.jar
+jcommon-junit-jar-file=jcommon-junit.jar
+jcommon-xml-jar-file=jcommon-xml.jar
+jcommon-xml-bundle-file=jcommon-xml-bundle.jar
diff --git a/debian/changelog b/debian/changelog
index 3b19340..d5e61c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libjcommon-java (1.0.5-1) unstable; urgency=low
+  
+  Robert Schuster <robert.schuster at tarent.de>:
+  * New stable upstream release
+  * Build with java-gcj-compat-dev and ecj-bootstrap
+  Arnaud Vandyck <avdyk at debian.org>:
+  * Updated Standards-Version to 3.7.2: added cdbs and debhelper in
+    Build-Depends.
+  * Added myself to uploaders.
+  * debian/rules: removed ant-launcher.jar, no more needed by cdbs-ant
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Wed, 19 Jul 2006 12:39:50 +0200
+
 libjcommon-java (1.0.0-1) unstable; urgency=low
 
   * New stable upstream release (closes: #328574)
diff --git a/debian/control b/debian/control
index 3c586aa..4fb06cb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,15 @@ Source: libjcommon-java
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Christian Bayle <bayle at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe, ant
-Standards-Version: 3.6.2
+Uploaders: Christian Bayle <bayle at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Arnaud Vandyck <avdyk at debian.org>
+Build-Depends: debhelper (>= 4.2.30), cdbs
+Build-Depends-Indep: java-gcj-compat-dev, ecj-bootstrap, ant, libservlet2.4-java
+Standards-Version: 3.7.2
 
 Package: libjcommon-java
 Section: libs
 Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime
+Depends: java-gcj-compat | java1-runtime1 | java2-runtime
 Suggests: java-virtual-machine, libjcommon-java-doc
 Description: General Purpose library for Java
  JCommon is a free general purpose Java class library that is used in
diff --git a/debian/rules b/debian/rules
index fe0e765..f8b7002 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,38 @@
 #!/usr/bin/make -f
-# debian/rules file for jcommon (uses cdbs)
-
-export VERSION = 1.0.0
+# debian/rules file for libjcommon-java (uses cdbs)
+LIBRARY_PACKAGE := jcommon
+API_VERSION     := 1.0.5
 
+# Add here any variable or target overrides you need
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant
 
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
+DEB_JARS := \
+	junit \
+	servlet-api-2.4
+
+# Build compiler
+DEB_ANT_COMPILER := org.eclipse.jdt.core.JDTCompilerAdapter
+ifneq (,$(findstring eclipse,$(DEB_ANT_COMPILER)))
+    DEB_JARS += ecj.jar /usr/share/ant/lib/ecj-adapter.jar
+endif
 DEB_ANT_BUILDFILE := ant/build.xml
 DEB_ANT_BUILD_TARGET := compile compile-xml javadoc
 
 clean::
 	-rm -rf build
 	-rm -rf javadoc
-	-rm -f jcommon-$(VERSION).jar
-	-rm -f jcommon-xml-$(VERSION).jar
+	-rm -f jcommon-$(API_VERSION).jar
+	-rm -f jcommon-xml-$(API_VERSION).jar
+	-rm -f jcommon-$(API_VERSION)-junit.jar
+
+install/lib$(LIBRARY_PACKAGE)-java:: 
+	install -m 644 $(LIBRARY_PACKAGE).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/libjcommon-java::
-	install -m 644 jcommon-$(VERSION).jar debian/libjcommon-java/usr/share/java/jcommon-$(VERSION).jar
-	ln -s jcommon-$(VERSION).jar debian/libjcommon-java/usr/share/java/jcommon.jar
-	install -m 644 jcommon-xml-$(VERSION).jar debian/libjcommon-java/usr/share/java/jcommon-xml-$(VERSION).jar
-	ln -s jcommon-xml-$(VERSION).jar debian/libjcommon-java/usr/share/java/jcommon-xml.jar
+	install -m 644 $(LIBRARY_PACKAGE)-xml.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar
+	ln -s $(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-xml.jar

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

