[pkg-java] r10631 - trunk/ant-contrib/debian

[Michael Koch]

Author: mkoch
Date: 2009-09-26 06:51:19 +0000 (Sat, 26 Sep 2009)
New Revision: 10631

Added:
   trunk/ant-contrib/debian/README.source
Modified:
   trunk/ant-contrib/debian/changelog
   trunk/ant-contrib/debian/compat
   trunk/ant-contrib/debian/control
   trunk/ant-contrib/debian/rules
Log:
make package uploadable

Added: trunk/ant-contrib/debian/README.source
===================================================================
--- trunk/ant-contrib/debian/README.source	                        (rev 0)
+++ trunk/ant-contrib/debian/README.source	2009-09-26 06:51:19 UTC (rev 10631)
@@ -0,0 +1,6 @@
+This package uses dpatch 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/dpatch/README.source.gz for a detailed explanation.
+

Modified: trunk/ant-contrib/debian/changelog
===================================================================
--- trunk/ant-contrib/debian/changelog	2009-09-26 06:25:47 UTC (rev 10630)
+++ trunk/ant-contrib/debian/changelog	2009-09-26 06:51:19 UTC (rev 10631)
@@ -1,5 +1,5 @@
-ant-contrib (1.0~b3+svn177-1) UNRELEASED; urgency=low
+ant-contrib (1.0~b3+svn177-1) unstable; urgency=low
 
   * Initial release (closes: #485708).
 
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Mon, 08 Jun 2009 23:17:23 +0200
+ -- Michael Koch <konqueror at gmx.de>  Sat, 26 Sep 2009 08:45:47 +0200

Modified: trunk/ant-contrib/debian/compat
===================================================================
--- trunk/ant-contrib/debian/compat	2009-09-26 06:25:47 UTC (rev 10630)
+++ trunk/ant-contrib/debian/compat	2009-09-26 06:51:19 UTC (rev 10631)
@@ -1 +1 @@
-5
+7

Modified: trunk/ant-contrib/debian/control
===================================================================
--- trunk/ant-contrib/debian/control	2009-09-26 06:25:47 UTC (rev 10630)
+++ trunk/ant-contrib/debian/control	2009-09-26 06:51:19 UTC (rev 10631)
@@ -2,12 +2,12 @@
 Section: java
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Build-Depends: cdbs, debhelper (>= 5), dpatch
-Build-Depends-Indep: openjdk-6-jdk, ant, ivy, junit, libbcel-java,
+Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>, Michael Koch <konqueror at gmx.de>
+Build-Depends: cdbs, debhelper (>= 7), dpatch, ant, default-jdk
+Build-Depends-Indep: ivy (>= 2), junit, libbcel-java,
  libcommons-cli-java, libcommons-codec-java, libcommons-httpclient-java,
  libcommons-logging-java, liboro-java, libxerces2-java, maven2
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ant-contrib
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ant-contrib
 Homepage: http://ant-contrib.sourceforge.net
@@ -15,7 +15,7 @@
 
 Package: ant-contrib
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, ${misc:Depends}
+Depends: default-jre-headless | java2-runtime-headless, ${misc:Depends}
 Enhances: ant
 Description: collection of tasks, types and other tools for Apache Ant
  Extends ant and provides the following tasks:

Modified: trunk/ant-contrib/debian/rules
===================================================================
--- trunk/ant-contrib/debian/rules	2009-09-26 06:25:47 UTC (rev 10630)
+++ trunk/ant-contrib/debian/rules	2009-09-26 06:51:19 UTC (rev 10631)
@@ -5,10 +5,11 @@
 include /usr/share/cdbs/1/rules/dpatch.mk
 
 PACKAGE := ant-contrib
+VERSION := 1.0b3
 
 JAVA_HOME := /usr/lib/jvm/java-6-openjdk/
 ANT_HOME := /usr/share/ant
-ANT_ARGS += -Djar.name=$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
+ANT_ARGS += -Djar.name=$(PACKAGE)-$(VERSION).jar
 DEB_ANT_BUILD_TARGET := jar
 DEB_JARS := \
 	ivy \
@@ -19,5 +20,5 @@
 	oro
 
 install/ant-contrib::
-	dh_install target/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_link usr/share/java/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(PACKAGE).jar
+	dh_install target/$(PACKAGE)-$(VERSION).jar usr/share/java
+	dh_link usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar