r2226 - in trunk/commons-daemon/debian: . patches

[Michael Koch]

Author: mkoch
Date: 2006-07-01 16:11:45 +0000 (Sat, 01 Jul 2006)
New Revision: 2226

Modified:
   trunk/commons-daemon/debian/
   trunk/commons-daemon/debian/changelog
   trunk/commons-daemon/debian/control
   trunk/commons-daemon/debian/patches/
   trunk/commons-daemon/debian/rules
Log:
commons-daemon (1.0.1-2) unstable; urgency=low

  * (Builds-)Depends on java-gcj-compat(-dev) instead of kaffe(-dev)
    (Closes: #358343).
  * Update Standards-Version to 3.7.2.

 -- Michael Koch <konqueror at gmx.de>  Sat,  1 Jul 2006 15:56:17 +0000




Property changes on: trunk/commons-daemon/debian
___________________________________________________________________
Name: svn:ignore
   + files
jsvc
jsvc-dev
libcommons-daemon-java
stamp-*
*.substvars


Modified: trunk/commons-daemon/debian/changelog
===================================================================
--- trunk/commons-daemon/debian/changelog	2006-07-01 14:35:27 UTC (rev 2225)
+++ trunk/commons-daemon/debian/changelog	2006-07-01 16:11:45 UTC (rev 2226)
@@ -1,3 +1,11 @@
+commons-daemon (1.0.1-2) unstable; urgency=low
+
+  * (Builds-)Depends on java-gcj-compat(-dev) instead of kaffe(-dev)
+    (Closes: #358343).
+  * Update Standards-Version to 3.7.2.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat,  1 Jul 2006 15:56:17 +0000
+
 commons-daemon (1.0.1-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/commons-daemon/debian/control
===================================================================
--- trunk/commons-daemon/debian/control	2006-07-01 14:35:27 UTC (rev 2225)
+++ trunk/commons-daemon/debian/control	2006-07-01 16:11:45 UTC (rev 2226)
@@ -2,13 +2,13 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-3), kaffe-dev (>= 2:1.1.5-3), junit, ant, libxerces2-java, libjaxp1.2-java, autotools-dev
-Standards-Version: 3.6.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 4.2.30), cdbs, java-gcj-compat-dev, junit, ant, libxerces2-java, libjaxp1.2-java, autotools-dev
+Standards-Version: 3.7.2
 
 Package: libcommons-daemon-java
 Architecture: all
-Depends: kaffe (>= 2:1.1.5-3) | java1-runtime | java2-runtime
+Depends: java-gcj-compat | java1-runtime | java2-runtime
 Suggests: java-virtual-machine
 Recommends: jsvc
 Description: Java API to launch java applications as daemons


Property changes on: trunk/commons-daemon/debian/patches
___________________________________________________________________
Name: svn:ignore
   + *.log


Modified: trunk/commons-daemon/debian/rules
===================================================================
--- trunk/commons-daemon/debian/rules	2006-07-01 14:35:27 UTC (rev 2225)
+++ trunk/commons-daemon/debian/rules	2006-07-01 16:11:45 UTC (rev 2226)
@@ -11,10 +11,9 @@
 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 jaxp-1.2 xercesImpl
-DEB_ANT_COMPILER     := jikes
+DEB_JARS             := jaxp-1.2 xercesImpl
 DEB_ANT_BUILD_TARGET := dist
 
 LIBRARY=commons-daemon
@@ -34,9 +33,4 @@
 	cd src/native/unix ; make
 
 install/lib${LIBRARY}-java::
-	install -m 644 dist/${LIBRARY}.jar debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${VERSION}.jar
-	# install lintian overrides
-	#install -d $(CURDIR)/debian/kaffe-pthreads-profile/usr/share/lintian/overrides/
-	#install -m 644 $(CURDIR)/debian/kaffe-pthreads-profile.lintian $(CURDIR)/debian/kaffe-pthreads-profile/usr/share/lintian/overrides/kaffe-pthreads-profile
-
-	
+	install -m 644 dist/${LIBRARY}.jar debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${VERSION}.jar