[libcommons-cli-java] 06/31: Imported Debian patch 1.0-9

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository libcommons-cli-java.

commit 55e10bc586fe262b3c352a3c2d01527fff2b69a7
Author: Michael Koch <konqueror at gmx.de>
Date:   Sat Oct 6 17:15:10 2007 +0200

    Imported Debian patch 1.0-9
---
 debian/README.Debian | 16 ----------------
 debian/changelog     | 16 ++++++++++++++++
 debian/compat        |  2 +-
 debian/control       | 13 ++++++-------
 debian/dirs          |  1 -
 debian/install       |  1 -
 debian/links         |  1 -
 debian/rules         | 16 ++++++----------
 debian/watch         |  4 ++--
 9 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 130e633..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,16 +0,0 @@
-libcommons-cli-java for Debian
-------------------------------
-
-No javadoc at the moment to put the library in main. As soon as a free
-replacement for the java documentation tool exists, I'll add the
-documentation. If your really want the documentation, at-get source this
-package and run 'ant javadoc' but you'll have to install a non-free
-j2sdk!
-
-Package in contrib because of libcommons-logging-java (will investigate
-why this package is in contrib), and because of
-libcommons-lang-java. This package is in contrib because it fails
-building with kaffe 1.1.1 because of the java.util.TimeZone.SHORT
-property that does not exist in this version!
-
- -- Arnaud Vandyck <avdyk at debian.org>, Fri Nov  7 11:23:10 2003
diff --git a/debian/changelog b/debian/changelog
index 01b3663..f090039 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+libcommons-cli-java (1.0-9) unstable; urgency=low
+
+  * Let libcommons-cli-java depend on libcommons-lang-java. Closes: #445508.
+  * Removed dependency on libcommons-loggig-java. Not used.
+  * Use java-gcj-compat instead of kaffe.
+  * Removed debian/dirs, debian/install and debian/links and do this in
+    debian/rules.
+  * Removed debian/README.Debian as it didn't apply anymore.
+  * Moved debhelper and cdbs to Build-Depends.
+  * Updated debhelper level to 5.
+  * Updated watch file to match new upstream naming scheme.
+  * Removed Wolfgang and added myself to Uploaders.
+  * Updated Standards-Version to 3.7.2.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 06 Oct 2007 17:15:10 +0200
+
 libcommons-cli-java (1.0-8) unstable; urgency=low
 
   * Removed explicit usage of jikes build compiler property
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index fd75430..a768296 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,15 @@ Source: libcommons-cli-java
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.8), kaffe (>= 2:1.1.5-3), ant, libcommons-logging-java, libcommons-lang-java, junit
-Standards-Version: 3.6.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8)
+Build-Depends-Indep: java-gcj-compat-dev, ant, libcommons-lang-java, junit
+Standards-Version: 3.7.2
+Homepage: <http://jakarta.apache.org/commons/cli>
 
 Package: libcommons-cli-java
 Architecture: all
-Depends: kaffe (>= 2:1.1.5-3) | java1-runtime | java2-runtime
-Suggests: java-virtual-machine
+Depends: java-gcj-compat | java1-runtime | java2-runtime, libcommons-lang-java
 Description: API for working with the command line arguments and options
  You define arguments you want to parse, parse arguments the user
  entered and then you can retrieve them like properties
- .
- Homepage: <http://jakarta.apache.org/commons/cli>
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/install b/debian/install
deleted file mode 100644
index acecda4..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-target/commons-cli-1.0.jar usr/share/java/
diff --git a/debian/links b/debian/links
deleted file mode 100644
index b1823e6..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/commons-cli-1.0.jar usr/share/java/commons-cli.jar
diff --git a/debian/rules b/debian/rules
index 8cbf594..fe15c8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,16 @@
 #!/usr/bin/make -f
-# debian/rules for libcommons-cli-java (uses CDBS)
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-#export DH_COMPAT=4
-
 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_DIRS       := /usr/lib/kaffe
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := junit commons-lang commons-loging $(ANT_HOME)/lib/ant-launcher.jar
+JAVA_HOME := /usr/lib/jvm/java-gcj
+ANT_HOME := /usr/share/ant
+DEB_JARS := junit commons-lang
 DEB_ANT_BUILD_TARGET := jar
 
-LIBRARY=commons-cli
-VERSION=1.0
+install/libcommons-cli-java::
+	install -m 644 -D target/commons-cli-$(DEB_UPSTREAM_VERSION).jar debian/libcommons-cli-java/usr/share/java/libcommons-cli-$(DEB_UPSTREAM_VERSION).jar
+	dh_link -plibcommons-cli-java usr/share/java/libcommons-cli-$(DEB_UPSTREAM_VERSION).jar usr/share/java/libcommons-cli.jar
diff --git a/debian/watch b/debian/watch
index 39a54d0..6838821 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=2
-http://www.apache.org/dist/jakarta/commons/cli/source/cli-(.*)-src\.tar\.gz debian uupdate
+version=3
+http://www.apache.org/dist/jakarta/commons/cli/source/commons-cli-(.*)-src\.tar\.gz debian uupdate

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