[pkg-java] r11210 - in trunk/javahelp2/debian: . patches source

[Varun Hiremath]

Author: varun
Date: 2009-12-07 18:04:14 +0000 (Mon, 07 Dec 2009)
New Revision: 11210

Added:
   trunk/javahelp2/debian/source/
   trunk/javahelp2/debian/source/format
Removed:
   trunk/javahelp2/debian/README.source
Modified:
   trunk/javahelp2/debian/changelog
   trunk/javahelp2/debian/compat
   trunk/javahelp2/debian/control
   trunk/javahelp2/debian/patches/iconsPath.patch
   trunk/javahelp2/debian/rules
Log:
* Switch to source format 3.0
* Bump dh compat to 7

Deleted: trunk/javahelp2/debian/README.source
===================================================================
--- trunk/javahelp2/debian/README.source	2009-12-07 12:42:09 UTC (rev 11209)
+++ trunk/javahelp2/debian/README.source	2009-12-07 18:04:14 UTC (rev 11210)
@@ -1,10 +0,0 @@
-Patch System
-============
-
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-
--- Varun Hiremath <varun at debian.org>  Thu, 15 Oct 2009 21:29:42 -0400

Modified: trunk/javahelp2/debian/changelog
===================================================================
--- trunk/javahelp2/debian/changelog	2009-12-07 12:42:09 UTC (rev 11209)
+++ trunk/javahelp2/debian/changelog	2009-12-07 18:04:14 UTC (rev 11210)
@@ -5,8 +5,12 @@
   * debian/rules: Maven configuration
   * Added debian/pom.xml
 
- -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sat, 05 Dec 2009 16:31:06 +0100
+  [ Varun Hiremath ]
+  * Switch to source format 3.0
+  * Bump dh compat to 7
 
+ -- Varun Hiremath <varun at debian.org>  Mon, 07 Dec 2009 12:48:46 -0500
+
 javahelp2 (2.0.05.ds1-2) unstable; urgency=low
 
   [ Varun Hiremath ]

Modified: trunk/javahelp2/debian/compat
===================================================================
--- trunk/javahelp2/debian/compat	2009-12-07 12:42:09 UTC (rev 11209)
+++ trunk/javahelp2/debian/compat	2009-12-07 18:04:14 UTC (rev 11210)
@@ -1 +1 @@
-5
+7

Modified: trunk/javahelp2/debian/control
===================================================================
--- trunk/javahelp2/debian/control	2009-12-07 12:42:09 UTC (rev 11209)
+++ trunk/javahelp2/debian/control	2009-12-07 18:04:14 UTC (rev 11210)
@@ -1,9 +1,9 @@
 Source: javahelp2
-Section: devel
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Marek Slama <marek.slama at sun.com>, Varun Hiremath <varun at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, maven-repo-helper
+Build-Depends: cdbs, debhelper (>= 7), maven-repo-helper
 Build-Depends-Indep: ant-optional, default-jdk,
  libtomcat6-java, libservlet2.4-java, imagemagick
 Standards-Version: 3.8.3

Modified: trunk/javahelp2/debian/patches/iconsPath.patch
===================================================================
--- trunk/javahelp2/debian/patches/iconsPath.patch	2009-12-07 12:42:09 UTC (rev 11209)
+++ trunk/javahelp2/debian/patches/iconsPath.patch	2009-12-07 18:04:14 UTC (rev 11210)
@@ -1,3 +1,4 @@
+Description: Integrate free icons from the Tango Project to replace Sun non free icons
 --- javahelp2-2.0.05/jhMaster/JavaHelp/src/new/javax/help/SwingHelpUtilities.java	2007-08-16 22:12:18.000000000 +0200
 +++ javahelp2-2.0.05.ds1/jhMaster/JavaHelp/src/new/javax/help/SwingHelpUtilities.java	2009-10-19 18:28:00.000000000 +0200
 @@ -229,24 +229,24 @@

Modified: trunk/javahelp2/debian/rules
===================================================================
--- trunk/javahelp2/debian/rules	2009-12-07 12:42:09 UTC (rev 11209)
+++ trunk/javahelp2/debian/rules	2009-12-07 18:04:14 UTC (rev 11210)
@@ -1,13 +1,7 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
-#DEB_TAR_SRCDIR          := javahelp2-2.0.05
-
 export JAVA_HOME=/usr/lib/jvm/default-java
 
-#include /usr/share/cdbs/1/rules/tarball.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 # package name
@@ -40,7 +34,7 @@
 	-Ddist.javadoc.dir=dist/lib/api \
 	-Dservlet-jar-present=true -Dtomcat-zip-present=true release javadoc
 	touch $@
-	
+
 install/$(p_jh)::
 	# maven
 	mh_installpom -p$(p_jh) debian/pom.xml
@@ -65,10 +59,10 @@
 	# copy the shell scripts
 	install -m 755 $(DEB_SRCDIR)/javahelp_nbproject/dist/bin/jhindexer $(d_jh)/usr/bin/
 	install -m 755 $(DEB_SRCDIR)/javahelp_nbproject/dist/bin/jhsearch $(d_jh)/usr/bin/
-	
+
 install/$(p_doc)::
 	dh_installdocs -p$(p_doc) $(DEB_SRCDIR)/javahelp_nbproject/dist/lib/api
-	
+
 clean::
 	# these files are left by cdbs (a bug?)
 	-rm -f *.cdbs-config_list

Added: trunk/javahelp2/debian/source/format
===================================================================
--- trunk/javahelp2/debian/source/format	                        (rev 0)
+++ trunk/javahelp2/debian/source/format	2009-12-07 18:04:14 UTC (rev 11210)
@@ -0,0 +1 @@
+3.0 (quilt)