CVS pja/debian

Thu Apr 14 11:01:04 2005

Update of /cvsroot/pkg-java/pja/debian
In directory haydn:/tmp/cvs-serv25576

Modified Files:
	changelog control rules 
Added Files:
	build.properties build.xml compat pja.src pjatools.src 
Log Message:
new upstream, build with cdbs

--- /cvsroot/pkg-java/pja/debian/changelog	2005/04/14 08:47:13	1.1.1.1
+++ /cvsroot/pkg-java/pja/debian/changelog	2005/04/14 11:00:57	1.2
@@ -1,3 +1,11 @@
+pja (2.5-1) unstable; urgency=low
+
+  * New upstream release
+  * Created a build file for ant
+  * Changed the build system to cdbs
+
+ -- Arnaud Vandyck <avdyk@debian.org>  Thu, 14 Apr 2005 12:04:52 +0200
+
 pja (2.4-3) unstable; urgency=low
 
   * now builds with libservlet2.3-java
--- /cvsroot/pkg-java/pja/debian/control	2005/04/14 08:47:13	1.1.1.1
+++ /cvsroot/pkg-java/pja/debian/control	2005/04/14 11:00:57	1.2
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Takashi Okamoto <tora@debian.org>, Arnaud Vandyck <avdyk@debian.org>
-Build-Depends-Indep: debhelper (>= 2.1.0), j2sdk1.3 | j2sdk1.2, libservlet2.3-java
-Standards-Version: 3.2.1
+Build-Depends-Indep: debhelper (>= 4.0.0), cdbs, libant1.6-java, j2sdk1.4 | j2sdk1.3 | j2sdk1.2, libservlet2.3-java
+Standards-Version: 3.6.0
 
 Package: libpja-java
 Architecture: all
--- /cvsroot/pkg-java/pja/debian/rules	2005/04/14 08:47:13	1.1.1.1
+++ /cvsroot/pkg-java/pja/debian/rules	2005/04/14 11:00:57	1.2
@@ -1,61 +1,46 @@
 #!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2005 Arnaud Vandyck <avdyk@debian.org>
 
-package=pja
-version=2.3.1
-
-jdk_dirs:=/usr/lib/j2se/1.3 /usr/lib/j2sdk1.3
-export JAVA_HOME=$(shell for jdir in $(jdk_dirs); do if [ -d "$$jdir" ]; then echo $$jdir; exit 0; fi; done)
-
-build: build-stamp
-build-stamp:
-	dh_testdir -i
-
-	bash pjabuild.sh
-	rm doc/package-list
-	touch build-stamp
-
-clean:
-	dh_testdir -i
-	dh_testroot -i
-
-	dh_clean
-	-rm -rf lib/pja.jar lib/pjatools.jar lib/tmp build-stamp doc/*
-
-install:
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdirs -i
-	install -m644 lib/pja.jar debian/tmp/usr/share/java/pja-${version}.jar
-	install -m644 lib/pjatools.jar debian/tmp/usr/share/java/pjatools-${version}.jar
-
-	install -m755 bin/PJAFontCapture.sh debian/tmp/usr/bin/PJAFontCapture
-
-	dh_movefiles
-
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installchangelogs -i
-	dh_undocumented -i PJAFontCapture.1
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i	
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+export JITC_PROCESSOR_TYPE=6
+
+JAVA_HOME_DIRS := /usr/lib/j2se/1.4 /usr/lib/kaffe
+ANT_HOME := /usr/share/ant1.6
+DEB_JARS := /usr/share/ant1.6/lib/ant-launcher.jar servlet-2.3.jar
+DEB_ANT_COMPILER := jikes
+DEB_ANT_PROPERTYFILE := debian/build.properties
+DEB_ANT_BUILDFILE := debian/build.xml
+
+# Additional options to pass to the Java virtual machine
+#ANT_OPTS := -verify *
+
+# Additional command-line arguments for Ant
+#ANT_ARGS := -verbose
+
+# Targets to invoke for building, installing, testing and cleaning up.
+# Building uses the default target from build.xml, installing and testing is
+# only called if the corresponding variable is set. You can also specify
+# multiple targets for each step.
+DEB_ANT_BUILD_TARGET   := compile
+DEB_ANT_INSTALL_TARGET := dist
+#DEB_ANT_TEST_TARGET    :=
+
+# This example assumes that Ant creates a JAR in dist which should be installed
+# into /usr/share/java with the appropriate API version in the name. These
+# steps can also be handled by debhelper (debian/*.install and debian/*.links),
+# of course.
+
+LIBRARY_PACKAGE := pja
+API_VERSION     := 2.5
+
+install/lib$(LIBRARY_PACKAGE)-java::
+	install -m 644 dist/$(LIBRARY_PACKAGE).jar debian/$(cdbs_curpkg)/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
+	ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/$(cdbs_curpkg)/usr/share/java/$(LIBRARY_PACKAGE).jar
+	install -m 644 dist/$(LIBRARY_PACKAGE)tools.jar debian/$(cdbs_curpkg)/usr/share/java/$(LIBRARY_PACKAGE)tools-$(API_VERSION).jar
+	ln -s $(LIBRARY_PACKAGE)tools-$(API_VERSION).jar debian/$(cdbs_curpkg)/usr/share/java/$(LIBRARY_PACKAGE)tools.jar
+	install -m755 bin/PJAFontCapture.sh debian/$(cdbs_curpkg)/usr/bin/PJAFontCapture
+#	dh_movefiles


