[pkg-java] r13292 - in trunk/jargs/debian: . patches source

Niels Thykier nthykier at alioth.debian.org
Sat Feb 12 17:09:46 UTC 2011 

Author: nthykier
Date: 2011-02-12 17:09:45 +0000 (Sat, 12 Feb 2011)
New Revision: 13292

Added:
   trunk/jargs/debian/patches/
   trunk/jargs/debian/patches/link-javadoc.patch
   trunk/jargs/debian/patches/series
   trunk/jargs/debian/source/
   trunk/jargs/debian/source/format
Removed:
   trunk/jargs/debian/patches/
Modified:
   trunk/jargs/debian/changelog
   trunk/jargs/debian/compat
   trunk/jargs/debian/control
   trunk/jargs/debian/rules
Log:
jargs (1.0.0-3) unstable; urgency=low

  * Team upload.
  * Replaced default-jdk-builddep with default-jdk in
    Build-Depends-Indep.
  * Moved ant and default-jdk to Build-Depends, since they
    are required for the clean target.
  * Converted package to 3.0 (quilt) source format and
    removed simple-patchsys from the rules file.
  * Bumped debhelper compat to 7.
  * Added Build-Depends on javahelper for automating the
    java dependencies and recommends.
  * Bumped Standards-Version to 3.9.1 - no changes required.
  * Rewrote the package description based on the description
    from the homepage.
  * Removed Yann Dirson from uploaders; thanks for your work
    on this package in the past.
  * Added patch to link javadoc against system javadoc.

 -- Niels Thykier <niels at thykier.net>  Sat, 12 Feb 2011 18:07:16 +0100


Modified: trunk/jargs/debian/changelog
===================================================================
--- trunk/jargs/debian/changelog	2011-02-12 02:38:06 UTC (rev 13291)
+++ trunk/jargs/debian/changelog	2011-02-12 17:09:45 UTC (rev 13292)
@@ -1,3 +1,24 @@
+jargs (1.0.0-3) unstable; urgency=low
+
+  * Team upload.
+  * Replaced default-jdk-builddep with default-jdk in
+    Build-Depends-Indep.
+  * Moved ant and default-jdk to Build-Depends, since they
+    are required for the clean target.
+  * Converted package to 3.0 (quilt) source format and
+    removed simple-patchsys from the rules file.
+  * Bumped debhelper compat to 7.
+  * Added Build-Depends on javahelper for automating the
+    java dependencies and recommends.
+  * Bumped Standards-Version to 3.9.1 - no changes required.
+  * Rewrote the package description based on the description
+    from the homepage.
+  * Removed Yann Dirson from uploaders; thanks for your work
+    on this package in the past.
+  * Added patch to link javadoc against system javadoc.
+
+ -- Niels Thykier <niels at thykier.net>  Sat, 12 Feb 2011 18:07:16 +0100
+
 jargs (1.0.0-2) unstable; urgency=low
 
   [ Dominik Smatana ]

Modified: trunk/jargs/debian/compat
===================================================================
--- trunk/jargs/debian/compat	2011-02-12 02:38:06 UTC (rev 13291)
+++ trunk/jargs/debian/compat	2011-02-12 17:09:45 UTC (rev 13292)
@@ -1 +1 @@
-5
+7

Modified: trunk/jargs/debian/control
===================================================================
--- trunk/jargs/debian/control	2011-02-12 02:38:06 UTC (rev 13291)
+++ trunk/jargs/debian/control	2011-02-12 17:09:45 UTC (rev 13292)
@@ -2,25 +2,31 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Dominik Smatana <dominik.smatana at gmail.com>, Yann Dirson <dirson at debian.org>
-Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: default-jdk-builddep, junit, ant
-Standards-Version: 3.8.0
+Uploaders: Dominik Smatana <dominik.smatana at gmail.com>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, javahelper (>= 0.32~)
+Build-Depends-Indep: junit, default-jdk-doc
+Standards-Version: 3.9.1
+Homepage: http://jargs.sourceforge.net/
 
 Package: libjargs-java
-Section: java
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${java:Depends}
+Recommends: ${java:Recommends}
 Suggests: libjargs-java-doc
 Description: Command-line argument parsing for Java
- A suite of command line option parsers for Java.
+ jargs provides a convenient, compact, pre-packaged and
+ comprehensively documented suite of command line option
+ parsers for the use of Java programmers.
 
 Package: libjargs-java-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${java:Depends}
+Recommends: ${java:Recommends}
 Suggests: libjargs-java
 Description: Command-line argument parsing for Java - documentation
- A suite of command line option parsers for Java.
+ jargs provides a convenient, compact, pre-packaged and
+ comprehensively documented suite of command line option
+ parsers for the use of Java programmers.
  .
  This package includes the documentation.

Added: trunk/jargs/debian/patches/link-javadoc.patch
===================================================================
--- trunk/jargs/debian/patches/link-javadoc.patch	                        (rev 0)
+++ trunk/jargs/debian/patches/link-javadoc.patch	2011-02-12 17:09:45 UTC (rev 13292)
@@ -0,0 +1,15 @@
+Description: Links javadoc to the system javadoc.
+Author: Niels Thykier <niels at thykier.net>
+
+diff --git a/build.xml.org b/build.xml
+index c6bc60e..9ebe523 100644
+--- a/build.xml.org
++++ b/build.xml
+@@ -87,6 +87,7 @@ Purcell. Copyright &amp;copy; 2002 Vidar Holen.  Copyright &amp;copy; 2002 Micha
+              footer="${javadoc.header}"
+              bottom="${javadoc.bottom}">
+              <package name="**.*" />
++             <link href="/usr/share/doc/default-jdk-doc/api/" />
+          </javadoc>
+   </target>
+ 

Added: trunk/jargs/debian/patches/series
===================================================================
--- trunk/jargs/debian/patches/series	                        (rev 0)
+++ trunk/jargs/debian/patches/series	2011-02-12 17:09:45 UTC (rev 13292)
@@ -0,0 +1 @@
+link-javadoc.patch

Modified: trunk/jargs/debian/rules
===================================================================
--- trunk/jargs/debian/rules	2011-02-12 02:38:06 UTC (rev 13291)
+++ trunk/jargs/debian/rules	2011-02-12 17:09:45 UTC (rev 13292)
@@ -1,17 +1,17 @@
 #!/usr/bin/make -f
 # debian/rules file for jargs (uses cdbs)
 
-export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
+include /usr/share/cdbs/1/class/ant.mk
 
+export VERSION = $(DEB_UPSTREAM_VERSION)
+
 # special hack for fake 1.0.0
 ifeq ($(VERSION),1.0.0)
 VERSION=1.0
 endif
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
 JAVA_HOME := /usr/lib/jvm/default-java/
 ANT_HOME := /usr/share/ant
 
@@ -19,5 +19,4 @@
 DEB_ANT_BUILD_TARGET := build
 
 install/libjargs-java::
-	install -m 644 lib/jargs.jar debian/libjargs-java/usr/share/java/jargs-$(VERSION).jar
-	ln -s jargs-$(VERSION).jar debian/libjargs-java/usr/share/java/jargs.jar
+	jh_installlibs -p$(cdbs_curpkg) --upstream-version=$(DEB_UPSTREAM_VERSION) lib/jargs.jar

Added: trunk/jargs/debian/source/format
===================================================================
--- trunk/jargs/debian/source/format	                        (rev 0)
+++ trunk/jargs/debian/source/format	2011-02-12 17:09:45 UTC (rev 13292)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the pkg-java-commits mailing list