[pkg-java] r4071 - in trunk/libjcommon-java/debian: . patches
rene at alioth.debian.org
rene at alioth.debian.org
Thu Aug 30 07:40:23 UTC 2007
Author: rene
Date: 2007-08-30 07:40:23 +0000 (Thu, 30 Aug 2007)
New Revision: 4071
Added:
trunk/libjcommon-java/debian/patches/
trunk/libjcommon-java/debian/patches/target-source-1.3.diff
Removed:
trunk/libjcommon-java/debian/README.Debian-source
trunk/libjcommon-java/debian/ant.properties
Modified:
trunk/libjcommon-java/debian/changelog
trunk/libjcommon-java/debian/control
trunk/libjcommon-java/debian/rules
Log:
update to 1.0.10
Deleted: trunk/libjcommon-java/debian/README.Debian-source
===================================================================
--- trunk/libjcommon-java/debian/README.Debian-source 2007-08-29 07:20:52 UTC (rev 4070)
+++ trunk/libjcommon-java/debian/README.Debian-source 2007-08-30 07:40:23 UTC (rev 4071)
@@ -1,10 +0,0 @@
-libjcommon-java
--------------
-
-Upstream does not provide source only tarballs. Therefore the following
-actions were taken to produce the orig.tar.gz:
-
-- rm lib/*
-- rm *.jar
-
- -- Wolfgang Baer <WBaer at gmx.de> Thu, 02 Feb 2006 15:48:42 +0100
Deleted: trunk/libjcommon-java/debian/ant.properties
===================================================================
--- trunk/libjcommon-java/debian/ant.properties 2007-08-29 07:20:52 UTC (rev 4070)
+++ trunk/libjcommon-java/debian/ant.properties 2007-08-30 07:40:23 UTC (rev 4071)
@@ -1,30 +0,0 @@
-###########################################################
-#
-# Global settings ...
-jcommon.name=jcommon
-
-# needed for the Docs
-jcommon.version=1.0.5
-
-# 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
Modified: trunk/libjcommon-java/debian/changelog
===================================================================
--- trunk/libjcommon-java/debian/changelog 2007-08-29 07:20:52 UTC (rev 4070)
+++ trunk/libjcommon-java/debian/changelog 2007-08-30 07:40:23 UTC (rev 4071)
@@ -1,13 +1,20 @@
-libjcommon-java (1.0.6-2) unstable; urgency=low
+libjcommon-java (1.0.10-1) unstable; urgency=low
+ [ Michael Koch ]
* Fixed typo in java1-runtime dependency.
* Fixed clean target to delete the created jars on second build.
* Removed Build-Depends on ecj-bootstrap and special handling for it in
debian/rules.
* Added myself and Removed Wolfgang from Uploaders.
- -- Michael Koch <konqueror at gmx.de> Thu, 02 Aug 2007 07:51:01 +0200
+ [ Rene Engelhard ]
+ * New upstream release
+ * add myself to Uploaders
+ * remove junit.jar from lib/ in clean and add compile-junit-tests to
+ DEB_ANT_TEST_TARGET; build-depend on junit
+ -- Rene Engelhard <rene at debian.org> Wed, 29 Aug 2007 23:03:41 +0200
+
libjcommon-java (1.0.6-1) unstable; urgency=low
* New upstream release.
Modified: trunk/libjcommon-java/debian/control
===================================================================
--- trunk/libjcommon-java/debian/control 2007-08-29 07:20:52 UTC (rev 4070)
+++ trunk/libjcommon-java/debian/control 2007-08-30 07:40:23 UTC (rev 4071)
@@ -2,9 +2,9 @@
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Christian Bayle <bayle at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
+Uploaders: Christian Bayle <bayle at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Rene Engelhard <rene at debian.org>
Build-Depends: debhelper (>= 4.2.30), cdbs
-Build-Depends-Indep: java-gcj-compat-dev, ant, libservlet2.4-java
+Build-Depends-Indep: java-gcj-compat-dev, ant, libservlet2.4-java, junit
Standards-Version: 3.7.2
Package: libjcommon-java
Added: trunk/libjcommon-java/debian/patches/target-source-1.3.diff
===================================================================
--- trunk/libjcommon-java/debian/patches/target-source-1.3.diff (rev 0)
+++ trunk/libjcommon-java/debian/patches/target-source-1.3.diff 2007-08-30 07:40:23 UTC (rev 4071)
@@ -0,0 +1,13 @@
+--- ant/build.properties-old 2007-08-28 22:05:58.000000000 +0200
++++ ant/build.properties 2007-08-28 22:06:10.000000000 +0200
+@@ -14,8 +14,8 @@
+
+ #
+ # Make sure that JDK 1.2 compatible class files are generated
+-build.target=1.2
+-build.source=1.2
++build.target=1.3
++build.source=1.3
+
+ #
+ # All path settings are relative to the project root directory
Modified: trunk/libjcommon-java/debian/rules
===================================================================
--- trunk/libjcommon-java/debian/rules 2007-08-29 07:20:52 UTC (rev 4070)
+++ trunk/libjcommon-java/debian/rules 2007-08-30 07:40:23 UTC (rev 4071)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# debian/rules file for libjcommon-java (uses cdbs)
LIBRARY_PACKAGE := jcommon
-API_VERSION := 1.0.6
+API_VERSION := 1.0.10
# Add here any variable or target overrides you need
include /usr/share/cdbs/1/rules/debhelper.mk
@@ -17,17 +17,20 @@
DEB_ANT_BUILDFILE := ant/build.xml
DEB_ANT_BUILD_TARGET := compile compile-xml javadoc
+# FIXME: how to run this?
+DEB_ANT_CHECK_TARGET := compile-junit-tests
clean::
- -rm -rf build
- -rm -rf javadoc
- -rm -f jcommon.jar
- -rm -f jcommon-xml.jar
- -rm -f jcommon-junit.jar
+ rm -rf build
+ rm -rf javadoc
+ rm -f $(LIBRARY_PACKAGE)-$(API_VERSION).jar
+ rm -f $(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar
+ rm -f lib/junit.jar lib/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
+ install -m 644 $(LIBRARY_PACKAGE)-$(API_VERSION).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 $(LIBRARY_PACKAGE)-xml.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar
+ install -m 644 $(LIBRARY_PACKAGE)-xml-$(API_VERSION).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
+
More information about the pkg-java-commits
mailing list