[jargs] 04/07: Imported Debian patch 1.0.0-3

Sat Mar 1 06:10:25 UTC 2014

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository jargs.

commit c691288bf43aa201c445bdca1f9f40d4cb56a661
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Feb 12 18:07:16 2011 +0100

    Imported Debian patch 1.0.0-3
---
 debian/changelog                  | 21 +++++++++++++++++++++
 debian/compat                     |  2 +-
 debian/control                    | 24 +++++++++++++++---------
 debian/patches/link-javadoc.patch | 15 +++++++++++++++
 debian/patches/series             |  1 +
 debian/rules                      | 13 ++++++-------
 debian/source/format              |  1 +
 7 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d35c253..1f8e381 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 ]
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index cda7327..d0fed96 100644
--- a/debian/control
+++ b/debian/control
@@ -2,25 +2,31 @@ Source: jargs
 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.
diff --git a/debian/patches/link-javadoc.patch b/debian/patches/link-javadoc.patch
new file mode 100644
index 0000000..ea2c289
--- /dev/null
+++ b/debian/patches/link-javadoc.patch
@@ -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 &copy; 2002 Vidar Holen.  Copyright &copy; 2002 Micha
+              footer="${javadoc.header}"
+              bottom="${javadoc.bottom}">
+              <package name="**.*" />
++             <link href="/usr/share/doc/default-jdk-doc/api/" />
+          </javadoc>
+   </target>
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..78d8c9e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+link-javadoc.patch
diff --git a/debian/rules b/debian/rules
index d7ef46e..c06d007 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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_BUILDFILE := build.xml
 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
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jargs.git

