[pkg-java] r11223 - in trunk/tomcat6/debian: . source

[Niels Thykier]

Author: nthykier-guest
Date: 2009-12-10 18:37:11 +0000 (Thu, 10 Dec 2009)
New Revision: 11223

Added:
   trunk/tomcat6/debian/source/
   trunk/tomcat6/debian/source/format
Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/rules
Log:
Changed to 3.0 (quilt).

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2009-12-10 16:11:15 UTC (rev 11222)
+++ trunk/tomcat6/debian/changelog	2009-12-10 18:37:11 UTC (rev 11223)
@@ -21,6 +21,7 @@
     (Closes: #559475)
   * Used "set -e" in postinst and postrm instead of passing "-e" to sh
     in the #!-line.
+  * Changed to 3.0 (quilt) source format.
 
  -- Niels Thykier <niels at thykier.net>  Mon, 07 Dec 2009 21:17:55 +0100
 

Modified: trunk/tomcat6/debian/rules
===================================================================
--- trunk/tomcat6/debian/rules	2009-12-10 16:11:15 UTC (rev 11222)
+++ trunk/tomcat6/debian/rules	2009-12-10 18:37:11 UTC (rev 11223)
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME := /usr/lib/jvm/default-java
 JAVA_CMD := $(JAVA_HOME)/bin/java
 BLDLIB := output/build/lib
 BLDBIN := output/build/bin
@@ -41,7 +39,7 @@
 ANT_INVOKE := $(JAVA_CMD) -classpath "$(DEB_CLASSPATH)" \
 	org.apache.tools.ant.Main $(ANT_ARGS)
 
-build: patch build-stamp
+build: build-stamp
 build-stamp:
 	dh_testdir
 	$(ANT_INVOKE) build-only
@@ -53,7 +51,7 @@
 		-bottom "Copyright &#169; 2000-2008 Apache Software Foundation. All Rights Reserved."
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	-$(ANT_INVOKE) clean

Added: trunk/tomcat6/debian/source/format
===================================================================
--- trunk/tomcat6/debian/source/format	                        (rev 0)
+++ trunk/tomcat6/debian/source/format	2009-12-10 18:37:11 UTC (rev 11223)
@@ -0,0 +1 @@
+3.0 (quilt)