[pkg-java] r4333 - in trunk/javax-servletapi2.3/debian: . patches

Tue Oct 9 21:18:50 UTC 2007

Author: mkoch
Date: 2007-10-09 21:18:50 +0000 (Tue, 09 Oct 2007)
New Revision: 4333

Removed:
   trunk/javax-servletapi2.3/debian/libservlet2.3-java.dirs
Modified:
   trunk/javax-servletapi2.3/debian/
   trunk/javax-servletapi2.3/debian/changelog
   trunk/javax-servletapi2.3/debian/compat
   trunk/javax-servletapi2.3/debian/control
   trunk/javax-servletapi2.3/debian/patches/
   trunk/javax-servletapi2.3/debian/rules
Log:
javax-servletapi2.3 (4.0-9) unstable; urgency=low

  * Use CDBS. Invokes ant differently. Closes: #445703.
  * Use java-gcj-compat instead of kaffe.
  * Moved debhelper from Build-Depends-Indep to Build-Depends.
  * Added cdbs to Build-Depends.
  * Updated debhelper level to 5.
  * Removed Wolfgang and added myself to Uploaders.
  * Updated Standards-Version.

 -- Michael Koch <konqueror at gmx.de>  Tue, 09 Oct 2007 23:15:44 +0200




Property changes on: trunk/javax-servletapi2.3/debian
___________________________________________________________________
Name: svn:ignore
   + files
libservlet2.3-java
stamp-*


Modified: trunk/javax-servletapi2.3/debian/changelog
===================================================================

--- trunk/javax-servletapi2.3/debian/changelog	2007-10-09 20:10:57 UTC (rev 4332)
+++ trunk/javax-servletapi2.3/debian/changelog	2007-10-09 21:18:50 UTC (rev 4333)
@@ -1,3 +1,15 @@
+javax-servletapi2.3 (4.0-9) unstable; urgency=low
+
+  * Use CDBS. Invokes ant differently. Closes: #445703.
+  * Use java-gcj-compat instead of kaffe.
+  * Moved debhelper from Build-Depends-Indep to Build-Depends.
+  * Added cdbs to Build-Depends.
+  * Updated debhelper level to 5.
+  * Removed Wolfgang and added myself to Uploaders.
+  * Updated Standards-Version.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 09 Oct 2007 23:15:44 +0200
+
 javax-servletapi2.3 (4.0-8) unstable; urgency=low
 
   * kaffe compiler transition

Modified: trunk/javax-servletapi2.3/debian/compat
===================================================================
--- trunk/javax-servletapi2.3/debian/compat	2007-10-09 20:10:57 UTC (rev 4332)
+++ trunk/javax-servletapi2.3/debian/compat	2007-10-09 21:18:50 UTC (rev 4333)
@@ -1 +1 @@
-4
+5

Modified: trunk/javax-servletapi2.3/debian/control
===================================================================
--- trunk/javax-servletapi2.3/debian/control	2007-10-09 20:10:57 UTC (rev 4332)
+++ trunk/javax-servletapi2.3/debian/control	2007-10-09 21:18:50 UTC (rev 4333)
@@ -2,15 +2,16 @@
 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-Indep: debhelper (>= 4.2.30), ant, kaffe
-Standards-Version: 3.6.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 5), cdbs
+Build-Depends-Indep: ant, java-gcj-compat-dev
+Standards-Version: 3.7.2
 
 Package: libservlet2.3-java
 Architecture: all
 Section: libs
 Priority: optional
-Depends: kaffe | java1-runtime | java2-runtime
+Depends: java-gcj-runtime | java1-runtime | java2-runtime
 Description: Servlet 2.3 and JSP 1.2 Java classes and documentation
  .
  For more information about Java servlets please take a look at the Tomcat

Deleted: trunk/javax-servletapi2.3/debian/libservlet2.3-java.dirs
===================================================================
--- trunk/javax-servletapi2.3/debian/libservlet2.3-java.dirs	2007-10-09 20:10:57 UTC (rev 4332)
+++ trunk/javax-servletapi2.3/debian/libservlet2.3-java.dirs	2007-10-09 21:18:50 UTC (rev 4333)
@@ -1 +0,0 @@
-usr/share/java


Property changes on: trunk/javax-servletapi2.3/debian/patches
___________________________________________________________________
Name: svn:ignore
   + *.log


Modified: trunk/javax-servletapi2.3/debian/rules
===================================================================
--- trunk/javax-servletapi2.3/debian/rules	2007-10-09 20:10:57 UTC (rev 4332)
+++ trunk/javax-servletapi2.3/debian/rules	2007-10-09 21:18:50 UTC (rev 4333)
@@ -1,62 +1,15 @@
 #!/usr/bin/make -f
-# debian/rules file for javax-servletapi2.3 (uses debhelper)
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Java home directory and the JVM executable
-JAVA_HOME := /usr/lib/kaffe
-JAVACMD   := ${JAVA_HOME}/bin/java
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JARS      := /usr/share/java
+JAVA_HOME := /usr/lib/jvm/java-gcj
 ANT_HOME  := /usr/share/ant
-CLASSPATH := ${ANT_HOME}/lib/ant.jar:${ANT_HOME}/lib/ant-launcher.jar
 
-ANT_OPTS := -Dant.home=${ANT_HOME}
-ANT      := ${JAVACMD} -classpath ${CLASSPATH} \
-            org.apache.tools.ant.Main ${ANT_OPTS}
+DEB_ANT_BUILD_TARGET := dist
 
-build: build-stamp
-build-stamp: 
-	dh_testdir
-	test -f patch-stamp || (patch < debian/patches/01_gjdoc_compatibility.patch && touch patch-stamp)
-	${ANT} dist
-	touch build-stamp
-
-clean: 
-	dh_testdir
-	dh_testroot
-	test -f patch-stamp && patch -R < debian/patches/01_gjdoc_compatibility.patch && rm patch-stamp \
-|| echo "no need to unpatch"
-	rm -f build-stamp gjdoc_rawcomment.cache
-	rm -rf build dist lib
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	install -m 644 dist/lib/servlet.jar debian/libservlet2.3-java/usr/share/java/servlet-2.3.jar
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installchangelogs
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do here
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+install/libservlet2.3-java::
+	install -m 644 -D dist/lib/servlet.jar debian/libservlet2.3-java/usr/share/java/servlet-2.3.jar


