CVS libgnumail-java/debian

[Arnaud Vandyck]

Update of /cvsroot/pkg-java/libgnumail-java/debian
In directory haydn:/tmp/cvs-serv24718/debian

Modified Files:
	changelog control rules 
Log Message:
changed the build system

--- /cvsroot/pkg-java/libgnumail-java/debian/changelog	2005/03/25 10:40:49	1.5
+++ /cvsroot/pkg-java/libgnumail-java/debian/changelog	2005/04/15 10:02:11	1.6
@@ -1,3 +1,14 @@
+libgnumail-java (1.0-5) unstable; urgency=low
+
+  * Somehow the cdbs build system tries to also use the alternative
+    make build system and interferes with the ant build system.
+  * Changed build system back to debhelper use only (closes: #303218)
+    - Patches are therefore included in the diff.gz, but also
+      in the debian/patches dir for reference and later usage
+    - Removed dependency on cdbs
+
+ -- Wolfgang Baer <WBaer@gmx.de>  Tue, 05 Apr 2005 19:26:12 +0200
+
 libgnumail-java (1.0-4) unstable; urgency=low
 
   * Incorporated NMU changes
@@ -8,7 +19,7 @@
   * Make sure the javadocs are build and included (closes: #280468)
   * Put libjessie-java to recommends  
   * avdyk: added Wolfgang to the uploaders
-  
+
  -- Wolfgang Baer <WBaer@gmx.de>  Wed, 23 Mar 2005 19:51:10 +0100
 
 libgnumail-java (1.0-3.1) unstable; urgency=low
--- /cvsroot/pkg-java/libgnumail-java/debian/control	2005/03/25 10:40:49	1.3
+++ /cvsroot/pkg-java/libgnumail-java/debian/control	2005/04/15 10:02:11	1.4
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>=2:1.1.4.PRECVS11-1), libant1.6-java, libgnujaf-java, libgnuinet-java, libjessie-java
+Build-Depends-Indep: debhelper (>= 4.2.30), kaffe (>=2:1.1.4.PRECVS12-1), libant1.6-java, libgnujaf-java, libgnuinet-java, libjessie-java
 Standards-Version: 3.6.1
 
 Package: libgnumail-java
 Architecture: all
-Depends: kaffe (>= 1.1.1) | java1-runtime | java2-runtime, libgnujaf-java, libgnuinet-java
+Depends: kaffe | java1-runtime | java2-runtime, libgnujaf-java, libgnuinet-java
 Suggests: java-virtual-machine
 Recommends: libjessie-java
 Description: free implementation of the javamail API
--- /cvsroot/pkg-java/libgnumail-java/debian/rules	2005/03/25 10:40:49	1.4
+++ /cvsroot/pkg-java/libgnumail-java/debian/rules	2005/04/15 10:02:11	1.5
@@ -1,24 +1,54 @@
 #!/usr/bin/make -f
-# debian/rules for libgnumail-java
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-#export DH_COMPAT=4
-
-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
-
 JAVA_HOME            := /usr/lib/kaffe
 ANT_HOME             := /usr/share/ant1.6
-DEB_JARS             := activation inetlib ${ANT_HOME}/lib/ant-launcher.jar jsse
-DEB_ANT_COMPILER     := jikes
-DEB_ANT_BUILD_TARGET := dist javadoc
+CLASSPATH            := /usr/share/java/activation.jar:/usr/share/java/inetlib.jar:/usr/share/java/jsse.jar:${ANT_HOME}/lib/ant-launcher.jar:${ANT_HOME}/lib/ant.jar 
+
+build: build-stamp
+
+build-stamp:  
+	dh_testdir
+	$(JAVA_HOME)/bin/java -cp $(CLASSPATH) -Dtarget=1.3 -Dant.home=$(ANT_HOME) \
+org.apache.tools.ant.Main dist javadoc -propertyfile debian/ant.properties
 
-LIBRARY=gnumail
-VERSION=1.0
+	touch build-stamp
 
-clean::
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	$(JAVA_HOME)/bin/java -cp $(CLASSPATH) -Dant.home=$(ANT_HOME) org.apache.tools.ant.Main clean -propertyfile debian/ant.properties
 	-rm *.jar gjdoc_rawcomment.cache
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_install
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install