Author: varun Date: 2009-06-23 01:50:42 +0000 (Tue, 23 Jun 2009) New Revision: 8564
Added: trunk/javahelp2/debian/patches/series Modified: trunk/javahelp2/debian/changelog trunk/javahelp2/debian/control trunk/javahelp2/debian/patches/jhindexer.patch trunk/javahelp2/debian/patches/jhsearch.patch trunk/javahelp2/debian/rules trunk/javahelp2/debian/watch Log: * Remove zip archive from orig.tar.gz and repackage * Switch to tomcat6 (Closes: #533148) * Switch to quilt for managing patches * Bump Standards-Version to 3.8.2 Modified: trunk/javahelp2/debian/changelog =================================================================== --- trunk/javahelp2/debian/changelog 2009-06-22 20:49:38 UTC (rev 8563) +++ trunk/javahelp2/debian/changelog 2009-06-23 01:50:42 UTC (rev 8564) @@ -1,9 +1,16 @@ -javahelp2 (2.0.05-4) UNRELEASED; urgency=low +javahelp2 (2.0.05.ds1-1) unstable; urgency=low + [ Michael Koch ] * Added watch file. - -- Michael Koch <[email protected]> Wed, 09 Jan 2008 23:11:20 +0100 + [ Varun Hiremath ] + * Remove zip archive from orig.tar.gz and repackage + * Switch to tomcat6 (Closes: #533148) + * Switch to quilt for managing patches + * Bump Standards-Version to 3.8.2 + -- Varun Hiremath <[email protected]> Mon, 22 Jun 2009 21:47:04 -0400 + javahelp2 (2.0.05-3) unstable; urgency=low * Remove libjdic-java from Build-Depends and revert old Modified: trunk/javahelp2/debian/control =================================================================== --- trunk/javahelp2/debian/control 2009-06-22 20:49:38 UTC (rev 8563) +++ trunk/javahelp2/debian/control 2009-06-23 01:50:42 UTC (rev 8564) @@ -3,19 +3,17 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Marek Slama <[email protected]>, Varun Hiremath <[email protected]> -Build-Depends: cdbs, debhelper (>= 5) -Build-Depends-Indep: ant-optional, java-gcj-compat-dev, - libtomcat5.5-java, libservlet2.4-java, unzip -Standards-Version: 3.7.3 +Build-Depends: cdbs, debhelper (>= 5), quilt +Build-Depends-Indep: ant-optional, default-jdk, + libtomcat6-java, libservlet2.4-java, unzip +Standards-Version: 3.8.2 Homepage: http://javahelp.dev.java.net Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/javahelp2 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/javahelp2 Package: javahelp2 Architecture: all -Section: devel -Priority: optional -Depends: java-gcj-compat | java1-runtime | java2-runtime +Depends: ${misc:Depends}, default-jre | java2-runtime Suggests: javahelp2-doc Description: Java based help system The JavaHelp system is an online help system that developers can use to add @@ -32,7 +30,7 @@ Package: javahelp2-doc Architecture: all Section: doc -Priority: optional +Depends: ${misc:Depends} Description: Java based help system - contains Javadoc API documentation The JavaHelp system is an online help system that developers can use to add online help to their Java platform applications. The JavaHelp system provides Modified: trunk/javahelp2/debian/patches/jhindexer.patch =================================================================== --- trunk/javahelp2/debian/patches/jhindexer.patch 2009-06-22 20:49:38 UTC (rev 8563) +++ trunk/javahelp2/debian/patches/jhindexer.patch 2009-06-23 01:50:42 UTC (rev 8564) @@ -1,3 +1,4 @@ +Description: Fix the classpath diff -Nur javahelp/build-tree/javahelp2-2.0.05/jhMaster/JavaHelp/javahelp/bin/jhindexer javahelp.new/build-tree/javahelp2-2.0.05/jhMaster/JavaHelp/javahelp/bin/jhindexer --- javahelp2-2.0.05/jhMaster/JavaHelp/javahelp/bin/jhindexer 2006-12-01 17:29:20.000000000 +0100 +++ javahelp2-2.0.05/jhMaster/JavaHelp/javahelp/bin/jhindexer 2007-06-13 17:17:37.000000000 +0200 Modified: trunk/javahelp2/debian/patches/jhsearch.patch =================================================================== --- trunk/javahelp2/debian/patches/jhsearch.patch 2009-06-22 20:49:38 UTC (rev 8563) +++ trunk/javahelp2/debian/patches/jhsearch.patch 2009-06-23 01:50:42 UTC (rev 8564) @@ -1,3 +1,4 @@ +Description: Fix the classpath diff -Nur javahelp/build-tree/javahelp2-2.0.05/jhMaster/JavaHelp/javahelp/bin/jhsearch javahelp.new/build-tree/javahelp2-2.0.05/jhMaster/JavaHelp/javahelp/bin/jhsearch --- javahelp2-2.0.05/jhMaster/JavaHelp/javahelp/bin/jhsearch 2006-12-01 17:29:20.000000000 +0100 +++ javahelp2-2.0.05/jhMaster/JavaHelp/javahelp/bin/jhsearch 2007-06-13 17:19:56.000000000 +0200 Added: trunk/javahelp2/debian/patches/series =================================================================== --- trunk/javahelp2/debian/patches/series (rev 0) +++ trunk/javahelp2/debian/patches/series 2009-06-23 01:50:42 UTC (rev 8564) @@ -0,0 +1,2 @@ +jhindexer.patch +jhsearch.patch Modified: trunk/javahelp2/debian/rules =================================================================== --- trunk/javahelp2/debian/rules 2009-06-22 20:49:38 UTC (rev 8563) +++ trunk/javahelp2/debian/rules 2009-06-23 01:50:42 UTC (rev 8564) @@ -2,12 +2,12 @@ #export DH_VERBOSE=1 -DEB_TAR_SRCDIR := javahelp2-2.0.05 +#DEB_TAR_SRCDIR := javahelp2-2.0.05 -JAVA_HOME=/usr/lib/jvm/java-gcj +export JAVA_HOME=/usr/lib/jvm/default-java -include /usr/share/cdbs/1/rules/tarball.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +#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 @@ -61,3 +61,7 @@ # these files are left by cdbs (a bug?) -rm -f *.cdbs-config_list -rm -f stamp-build-$(p_jh) + +get-orig-source: + uscan --repack + Modified: trunk/javahelp2/debian/watch =================================================================== --- trunk/javahelp2/debian/watch 2009-06-22 20:49:38 UTC (rev 8563) +++ trunk/javahelp2/debian/watch 2009-06-23 01:50:42 UTC (rev 8564) @@ -1,3 +1,3 @@ version=3 -opts=uversionmangle=s/_/./g \ +opts="dversionmangle=s/.ds[0-9]//g,uversionmangle=s/_/./g" \ http://download.java.net/javadesktop/javahelp/javahelp(.*)\.zip _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
