[pkg-java] r13672 - in trunk/jug/debian: . patches source

[Onkar Shinde]

Author: onkarshinde-guest
Date: 2011-05-08 11:39:15 +0000 (Sun, 08 May 2011)
New Revision: 13672

Added:
   trunk/jug/debian/patches/series
   trunk/jug/debian/source/
   trunk/jug/debian/source/format
Modified:
   trunk/jug/debian/changelog
   trunk/jug/debian/control
   trunk/jug/debian/patches/build-xml.diff
   trunk/jug/debian/rules
Log:
Prepared jug 2.0.0-2

Modified: trunk/jug/debian/changelog
===================================================================
--- trunk/jug/debian/changelog	2011-05-07 23:46:16 UTC (rev 13671)
+++ trunk/jug/debian/changelog	2011-05-08 11:39:15 UTC (rev 13672)
@@ -1,3 +1,17 @@
+jug (2.0.0-2) unstable; urgency=low
+
+  * debian/control
+    - Bump ant version in build dependency.
+    - Remove dependency on JRE.
+    - Update standards version to 3.9.2. No changes needed.
+  * debian/patches/build-xml.diff
+    - Added patch description as per DEP-3.
+  * debian/rules
+    - Removed ant-trax from build classpath. Not relevant with latest ant.
+  * Converted package to source format 3.0.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Thu, 05 May 2011 09:41:30 +0530
+
 jug (2.0.0-1) unstable; urgency=low
 
   * Intial release. Merge from Ubuntu. (Closes: #557835)

Modified: trunk/jug/debian/control
===================================================================
--- trunk/jug/debian/control	2011-05-07 23:46:16 UTC (rev 13671)
+++ trunk/jug/debian/control	2011-05-08 11:39:15 UTC (rev 13672)
@@ -4,8 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>
 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 (>= 1.8.2), ant-optional (>= 1.8.2), debhelper (>= 5), cdbs (>= 0.4.5.3)
+Standards-Version: 3.9.2
 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/
@@ -13,7 +13,7 @@
 
 Package: libjug-java
 Architecture: all
-Depends: default-jre-headless | java2-runtime-headless, ${misc:Depends}
+Depends: ${misc:Depends}
 Description: Pure java UUID generator
  JUG is a pure java UUID generator that generates UUIDs according to the IETF
  UUID draft specification.

Modified: trunk/jug/debian/patches/build-xml.diff
===================================================================
--- trunk/jug/debian/patches/build-xml.diff	2011-05-07 23:46:16 UTC (rev 13671)
+++ trunk/jug/debian/patches/build-xml.diff	2011-05-08 11:39:15 UTC (rev 13672)
@@ -1,3 +1,6 @@
+Description: Various fixes to build.xml.
+Forwarded: not-needed
+Author: Thierry Carrez <thierry.carrez at ubuntu.com>
 diff -Nur -x '*.orig' -x '*~' jug-2.0.0/build.xml jug-2.0.0.new/build.xml
 --- jug-2.0.0/build.xml	2009-07-22 11:45:31.000000000 +0200
 +++ jug-2.0.0.new/build.xml	2009-07-22 11:50:15.000000000 +0200

Added: trunk/jug/debian/patches/series
===================================================================
--- trunk/jug/debian/patches/series	                        (rev 0)
+++ trunk/jug/debian/patches/series	2011-05-08 11:39:15 UTC (rev 13672)
@@ -0,0 +1 @@
+build-xml.diff

Modified: trunk/jug/debian/rules
===================================================================
--- trunk/jug/debian/rules	2011-05-07 23:46:16 UTC (rev 13671)
+++ trunk/jug/debian/rules	2011-05-08 11:39:15 UTC (rev 13672)
@@ -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-junit junit
 
 binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java::
 	dh_install build/$(JARNAME)-$(DEB_UPSTREAM_VERSION).jar usr/share/java

Added: trunk/jug/debian/source/format
===================================================================
--- trunk/jug/debian/source/format	                        (rev 0)
+++ trunk/jug/debian/source/format	2011-05-08 11:39:15 UTC (rev 13672)
@@ -0,0 +1 @@
+3.0 (quilt)