Merge lp:~james-page/ubuntu/natty/jug/fix-687979 into lp:ubuntu/natty/jug

[James Page]

Fixed issue related to Ubuntu using ant 1.8 (unlike Debian who still use 1.7) causing FTBFS - package is still backwards compatible with ant 1.7 as well.

Tidied up package and moved to source/format: 3.0 (quilt).

I will submit the full patch back to Debian on the existing bug reference.

[Dave Walker (davewalker)]

Looks good to me.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-25 10:42:07 +0000
+++ debian/changelog	2011-02-28 21:46:06 +0000
@@ -1,3 +1,12 @@
+jug (2.0.0-1ubuntu1) natty; urgency=low
+
+  * Updated debian/rules: use ant-nodeps to fix FTBFS (LP: #687979).
+  * Moved to source/format: 3.0 (quilt) instead of using
+    simple-patchsys.mk.
+  * Updated Standards-Version: 3.9.1
+
+ -- James Page <[e-mail]>  Mon, 28 Feb 2011 21:19:01 +0000
+
 jug (2.0.0-1) unstable; urgency=low
 
   * Intial release. Merge from Ubuntu. (Closes: #557835)

=== modified file 'debian/control'
--- debian/control	2009-11-25 10:42:07 +0000
+++ debian/control	2011-02-28 21:46:06 +0000
@@ -1,11 +1,12 @@
 Source: jug
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: Onkar Shinde <[e-mail]>
 Build-Depends-Indep: default-jdk, liblog4j1.2-java, junit
-Build-Depends: ant, ant-optional, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.8.3
+Build-Depends: ant, ant-optional, debhelper (>= 7), cdbs (>= 0.4.5.3)
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/jug/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jug/
 Homepage: http://jug.safehaus.org/

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-02-28 21:46:06 +0000
@@ -0,0 +1,1 @@
+build-xml.diff

=== modified file 'debian/rules'
--- debian/rules	2009-11-25 10:42:07 +0000
+++ debian/rules	2011-02-28 21:46:06 +0000
@@ -2,13 +2,12 @@
 
 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
 
 JARNAME              := jug-asl
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := jar.asl
 DEB_ANT_CHECK_TARGET := test
-DEB_JARS             := log4j-1.2 ant-trax ant-junit junit
+DEB_JARS             := log4j-1.2 ant-trax ant-nodeps ant-junit junit
 
 binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java::
 	dh_install build/$(JARNAME)-$(DEB_UPSTREAM_VERSION).jar usr/share/java

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2011-02-28 21:46:06 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)