[pkg-java] r13738 - in tags/libgroboutils-java: . 5-2/debian 5-2/debian/patches

Damien Raude-Morvan drazzib at alioth.debian.org
Wed Jun 1 22:48:36 UTC 2011


Author: drazzib
Date: 2011-06-01 22:48:36 +0000 (Wed, 01 Jun 2011)
New Revision: 13738

Added:
   tags/libgroboutils-java/5-2/
   tags/libgroboutils-java/5-2/debian/changelog
   tags/libgroboutils-java/5-2/debian/control
   tags/libgroboutils-java/5-2/debian/patches/06_support_others_jdk.diff
   tags/libgroboutils-java/5-2/debian/patches/series
   tags/libgroboutils-java/5-2/debian/rules
   tags/libgroboutils-java/5-2/debian/source/
Removed:
   tags/libgroboutils-java/5-2/debian/changelog
   tags/libgroboutils-java/5-2/debian/control
   tags/libgroboutils-java/5-2/debian/patches/series
   tags/libgroboutils-java/5-2/debian/rules
Log:
[svn-buildpackage] Tagging libgroboutils-java 5-2

Deleted: tags/libgroboutils-java/5-2/debian/changelog
===================================================================
--- trunk/libgroboutils-java/debian/changelog	2011-05-26 20:52:04 UTC (rev 13709)
+++ tags/libgroboutils-java/5-2/debian/changelog	2011-06-01 22:48:36 UTC (rev 13738)
@@ -1,5 +0,0 @@
-libgroboutils-java (5-1) unstable; urgency=low
-
-  * Initial release (Closes: #551812)
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 27 Oct 2009 00:21:17 +0100

Copied: tags/libgroboutils-java/5-2/debian/changelog (from rev 13737, trunk/libgroboutils-java/debian/changelog)
===================================================================
--- tags/libgroboutils-java/5-2/debian/changelog	                        (rev 0)
+++ tags/libgroboutils-java/5-2/debian/changelog	2011-06-01 22:48:36 UTC (rev 13738)
@@ -0,0 +1,14 @@
+libgroboutils-java (5-2) unstable; urgency=low
+
+  * Bump Standards-Version to 3.9.2: no changes needed.
+  * Switch to 3.0 (quilt) source format.
+  * debian/patches/06_support_others_jdk.diff: Support for OpenJDK6
+    (Closes: #628301).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 02 Jun 2011 00:26:25 +0200
+
+libgroboutils-java (5-1) unstable; urgency=low
+
+  * Initial release (Closes: #551812)
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 27 Oct 2009 00:21:17 +0100

Deleted: tags/libgroboutils-java/5-2/debian/control
===================================================================
--- trunk/libgroboutils-java/debian/control	2011-05-26 20:52:04 UTC (rev 13709)
+++ tags/libgroboutils-java/5-2/debian/control	2011-06-01 22:48:36 UTC (rev 13738)
@@ -1,22 +0,0 @@
-Source: libgroboutils-java
-Section: java
-Priority: optional
-Maintainer: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: libgroboutils-java, ant, cdbs, debhelper (>= 7), default-jdk, quilt
-Build-Depends-Indep: ant-optional, junit, liblog4j1.2-java,
- libeasymock-java, libbcel-java
-Standards-Version: 3.8.3
-Homepage: http://groboutils.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgroboutils-java/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgroboutils-java/
-
-Package: libgroboutils-java
-Architecture: all
-Depends: ${misc:Depends}
-Description: Java-based testing tools and JUnit extensions
- GroboUtils is a group of Java-based testing tools and JUnit extensions aimed at
- increasing quality awareness and ease of introduction of testing tools into the
- development cycle.
- .
- GroboUtils include, for example, multi-threaded tests, hierarchial unit tests,
- and a code coverage tool.

Copied: tags/libgroboutils-java/5-2/debian/control (from rev 13737, trunk/libgroboutils-java/debian/control)
===================================================================
--- tags/libgroboutils-java/5-2/debian/control	                        (rev 0)
+++ tags/libgroboutils-java/5-2/debian/control	2011-06-01 22:48:36 UTC (rev 13738)
@@ -0,0 +1,22 @@
+Source: libgroboutils-java
+Section: java
+Priority: optional
+Maintainer: Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: libgroboutils-java, ant, cdbs, debhelper (>= 7), default-jdk
+Build-Depends-Indep: ant-optional, junit, liblog4j1.2-java,
+ libeasymock-java, libbcel-java
+Standards-Version: 3.9.2
+Homepage: http://groboutils.sourceforge.net/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgroboutils-java/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgroboutils-java/
+
+Package: libgroboutils-java
+Architecture: all
+Depends: ${misc:Depends}
+Description: Java-based testing tools and JUnit extensions
+ GroboUtils is a group of Java-based testing tools and JUnit extensions aimed at
+ increasing quality awareness and ease of introduction of testing tools into the
+ development cycle.
+ .
+ GroboUtils include, for example, multi-threaded tests, hierarchial unit tests,
+ and a code coverage tool.

Copied: tags/libgroboutils-java/5-2/debian/patches/06_support_others_jdk.diff (from rev 13737, trunk/libgroboutils-java/debian/patches/06_support_others_jdk.diff)
===================================================================
--- tags/libgroboutils-java/5-2/debian/patches/06_support_others_jdk.diff	                        (rev 0)
+++ tags/libgroboutils-java/5-2/debian/patches/06_support_others_jdk.diff	2011-06-01 22:48:36 UTC (rev 13738)
@@ -0,0 +1,61 @@
+Description: Support for new JDK >= 1.4 (read from ant.java.version property)
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-06-02
+Forwarded: no
+--- a/_shared/common-ant/common-ant-tasks-init.ant-inc.xml
++++ b/_shared/common-ant/common-ant-tasks-init.ant-inc.xml
+@@ -60,6 +60,9 @@
+                 <equals arg1="${ant.java.version}" arg2="1.2" />
+                 <equals arg1="${ant.java.version}" arg2="1.3" />
+                 <equals arg1="${ant.java.version}" arg2="1.4" />
++                <equals arg1="${ant.java.version}" arg2="1.5" />
++                <equals arg1="${ant.java.version}" arg2="1.6" />
++                <equals arg1="${ant.java.version}" arg2="1.7" />
+             </or>
+         </condition>
+         <condition property="_shared.common.depend.has-jdk12" >
+@@ -67,17 +70,44 @@
+                 <equals arg1="${ant.java.version}" arg2="1.2" />
+                 <equals arg1="${ant.java.version}" arg2="1.3" />
+                 <equals arg1="${ant.java.version}" arg2="1.4" />
++                <equals arg1="${ant.java.version}" arg2="1.5" />
++                <equals arg1="${ant.java.version}" arg2="1.6" />
++                <equals arg1="${ant.java.version}" arg2="1.7" />
+             </or>
+         </condition>
+         <condition property="_shared.common.depend.has-jdk13" >
+             <or>
+                 <equals arg1="${ant.java.version}" arg2="1.3" />
+                 <equals arg1="${ant.java.version}" arg2="1.4" />
++                <equals arg1="${ant.java.version}" arg2="1.5" />
++                <equals arg1="${ant.java.version}" arg2="1.6" />
++                <equals arg1="${ant.java.version}" arg2="1.7" />
+             </or>
+         </condition>
+         <condition property="_shared.common.depend.has-jdk14" >
+             <or>
+                 <equals arg1="${ant.java.version}" arg2="1.4" />
++                <equals arg1="${ant.java.version}" arg2="1.5" />
++                <equals arg1="${ant.java.version}" arg2="1.6" />
++                <equals arg1="${ant.java.version}" arg2="1.7" />
++            </or>
++        </condition>
++        <condition property="_shared.common.depend.has-jdk15" >
++            <or>
++                <equals arg1="${ant.java.version}" arg2="1.5" />
++                <equals arg1="${ant.java.version}" arg2="1.6" />
++                <equals arg1="${ant.java.version}" arg2="1.7" />
++            </or>
++        </condition>
++        <condition property="_shared.common.depend.has-jdk16" >
++            <or>
++                <equals arg1="${ant.java.version}" arg2="1.6" />
++                <equals arg1="${ant.java.version}" arg2="1.7" />
++            </or>
++        </condition>
++        <condition property="_shared.common.depend.has-jdk17" >
++            <or>
++                <equals arg1="${ant.java.version}" arg2="1.7" />
+             </or>
+         </condition>
+     </target>

Deleted: tags/libgroboutils-java/5-2/debian/patches/series
===================================================================
--- trunk/libgroboutils-java/debian/patches/series	2011-05-26 20:52:04 UTC (rev 13709)
+++ tags/libgroboutils-java/5-2/debian/patches/series	2011-06-01 22:48:36 UTC (rev 13738)
@@ -1,5 +0,0 @@
-01_reduce_junit_logging.diff
-02_dont_stop_on_junit_failure.diff
-03_easymock_upgrade.diff
-04_coverage_zip_archives.diff
-05_rename_subprojects.diff

Copied: tags/libgroboutils-java/5-2/debian/patches/series (from rev 13737, trunk/libgroboutils-java/debian/patches/series)
===================================================================
--- tags/libgroboutils-java/5-2/debian/patches/series	                        (rev 0)
+++ tags/libgroboutils-java/5-2/debian/patches/series	2011-06-01 22:48:36 UTC (rev 13738)
@@ -0,0 +1,6 @@
+01_reduce_junit_logging.diff
+02_dont_stop_on_junit_failure.diff
+03_easymock_upgrade.diff
+04_coverage_zip_archives.diff
+05_rename_subprojects.diff
+06_support_others_jdk.diff

Deleted: tags/libgroboutils-java/5-2/debian/rules
===================================================================
--- trunk/libgroboutils-java/debian/rules	2011-05-26 20:52:04 UTC (rev 13709)
+++ tags/libgroboutils-java/5-2/debian/rules	2011-06-01 22:48:36 UTC (rev 13738)
@@ -1,29 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-
-DEB_JARS := groboutils-testingautodoc-core groboutils-codecoverage-runtime \
-            groboutils-codecoverage-core groboutils-codecoverage-ant groboutils-classes-core \
-            junit log4j-1.2 easymock bcel \
-            ant-apache-bcel ant-junit ant-nodeps ant-trax
-
-DEB_ANT_BUILD_TARGET := main
-DEB_ANT_CHECK_TARGET := test-all
-DEB_ANT_CLEAN_TARGET := clean
-
-ALL_JARS = $(wildcard */*.jar)
-
-binary-post-install/libgroboutils-java::
-	for jar in $(ALL_JARS); do \
-		BASE_NAME=`basename $$jar`; \
-		CLEAN_NAME=`basename $$jar .jar | cut -d '-' -f '1,2,4'`; \
-		dh_link usr/share/java/$$BASE_NAME usr/share/java/$$CLEAN_NAME.jar; \
-	done
-
-get-orig-source:
-	uscan --upstream-version 0 --rename

Copied: tags/libgroboutils-java/5-2/debian/rules (from rev 13737, trunk/libgroboutils-java/debian/rules)
===================================================================
--- tags/libgroboutils-java/5-2/debian/rules	                        (rev 0)
+++ tags/libgroboutils-java/5-2/debian/rules	2011-06-01 22:48:36 UTC (rev 13738)
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+ANT_HOME := /usr/share/ant
+
+DEB_JARS := groboutils-testingautodoc-core groboutils-codecoverage-runtime \
+            groboutils-codecoverage-core groboutils-codecoverage-ant groboutils-classes-core \
+            junit log4j-1.2 easymock bcel \
+            ant-apache-bcel ant-junit ant-nodeps ant-trax
+
+DEB_ANT_BUILD_TARGET := main
+DEB_ANT_CHECK_TARGET := test-all
+DEB_ANT_CLEAN_TARGET := clean
+
+ALL_JARS = $(wildcard */*.jar)
+
+binary-post-install/libgroboutils-java::
+	for jar in $(ALL_JARS); do \
+		BASE_NAME=`basename $$jar`; \
+		CLEAN_NAME=`basename $$jar .jar | cut -d '-' -f '1,2,4'`; \
+		dh_link usr/share/java/$$BASE_NAME usr/share/java/$$CLEAN_NAME.jar; \
+	done
+
+get-orig-source:
+	uscan --upstream-version 0 --rename




More information about the pkg-java-commits mailing list