[pkg-java] r10430 - in trunk/groovy/debian: . patches

[Torsten Werner]

Author: twerner
Date: 2009-09-17 15:11:17 +0000 (Thu, 17 Sep 2009)
New Revision: 10430

Added:
   trunk/groovy/debian/patches/disable-bnd.diff
Modified:
   trunk/groovy/debian/changelog
   trunk/groovy/debian/control
   trunk/groovy/debian/patches/series
   trunk/groovy/debian/rules
Log:
Remove Build-Depends: bnd and add a patch disable-bn.diff because bnd is
not ready for main yet. (Closes: #543130)

Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog	2009-09-17 11:36:11 UTC (rev 10429)
+++ trunk/groovy/debian/changelog	2009-09-17 15:11:17 UTC (rev 10430)
@@ -1,3 +1,10 @@
+groovy (1.6.4-5) unstable; urgency=low
+
+  * Remove Build-Depends: bnd and add a patch disable-bn.diff because bnd is
+    not ready for main yet. (Closes: #543130)
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 16 Sep 2009 13:25:12 +0200
+
 groovy (1.6.4-4) unstable; urgency=low
 
   * Fix debian/copyright file (Closes: #543565)

Modified: trunk/groovy/debian/control
===================================================================
--- trunk/groovy/debian/control	2009-09-17 11:36:11 UTC (rev 10429)
+++ trunk/groovy/debian/control	2009-09-17 15:11:17 UTC (rev 10430)
@@ -8,7 +8,7 @@
  libbsf-java, libcommons-cli-java (>= 1.2), libcommons-logging-java
  (>= 1.0.3), junit4, libmockobjects-java (>= 0.09), libregexp-java (>=
  1.2), libservlet2.4-java, libxstream-java, libjline-java, antlr,
- tofrodos, ivy, bnd, libqdox-java, libjarjar-java
+ tofrodos, ivy, libqdox-java, libjarjar-java
 Standards-Version: 3.8.3
 Homepage: http://groovy.codehaus.org/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/groovy/

Added: trunk/groovy/debian/patches/disable-bnd.diff
===================================================================
--- trunk/groovy/debian/patches/disable-bnd.diff	                        (rev 0)
+++ trunk/groovy/debian/patches/disable-bnd.diff	2009-09-17 15:11:17 UTC (rev 10430)
@@ -0,0 +1,13 @@
+Index: groovy-1.6.4/build.xml
+===================================================================
+--- groovy-1.6.4.orig/build.xml	2009-09-17 16:41:18.000000000 +0200
++++ groovy-1.6.4/build.xml	2009-09-17 16:41:33.000000000 +0200
+@@ -686,7 +686,7 @@
+         <delete dir="${targetDistDirectory}" includes="groovy*.bnd"/>
+     </target>
+ 
+-    <target name="install" depends="createJars,translate,updateRetroJars,updateJarsForOsgi" unless="testFailed"
++    <target name="install" depends="createJars,translate,updateRetroJars" unless="testFailed"
+             description="Create an installation hierarchy in target/install.">
+ 
+         <!--

Modified: trunk/groovy/debian/patches/series
===================================================================
--- trunk/groovy/debian/patches/series	2009-09-17 11:36:11 UTC (rev 10429)
+++ trunk/groovy/debian/patches/series	2009-09-17 15:11:17 UTC (rev 10430)
@@ -1,2 +1,3 @@
 start-scripts.patch
 ant-build.diff
+disable-bnd.diff

Modified: trunk/groovy/debian/rules
===================================================================
--- trunk/groovy/debian/rules	2009-09-17 11:36:11 UTC (rev 10429)
+++ trunk/groovy/debian/rules	2009-09-17 15:11:17 UTC (rev 10430)
@@ -21,8 +21,12 @@
 	  -e"1s,.*,#!/bin/sh,"                     \
 	  debian/groovy/usr/share/groovy/bin/startGroovy
 	mh_installpoms -p$(PACKAGE)
-	mh_installjar -p$(PACKAGE) -dusr/share/groovy/lib/groovy-$(DEB_UPSTREAM_VERSION).jar -l pom.xml target/install/lib/groovy-$(DEB_UPSTREAM_VERSION).jar
-	mh_installjar -p$(PACKAGE) -dusr/share/groovy/embeddable/groovy-all-$(DEB_UPSTREAM_VERSION).jar -l target/groovy-all.pom target/install/embeddable/groovy-all-$(DEB_UPSTREAM_VERSION).jar
+	# without bnd:
+	mh_installjar -p$(PACKAGE) -dusr/share/groovy/lib/groovy-$(DEB_UPSTREAM_VERSION).jar -l pom.xml target/dist/groovy.jar
+	mh_installjar -p$(PACKAGE) -dusr/share/groovy/embeddable/groovy-all-$(DEB_UPSTREAM_VERSION).jar -l target/groovy-all.pom target/dist/groovy-all.jar
+	# with bnd:
+	#mh_installjar -p$(PACKAGE) -dusr/share/groovy/lib/groovy-$(DEB_UPSTREAM_VERSION).jar -l pom.xml target/install/lib/groovy-$(DEB_UPSTREAM_VERSION).jar
+	#mh_installjar -p$(PACKAGE) -dusr/share/groovy/embeddable/groovy-all-$(DEB_UPSTREAM_VERSION).jar -l target/groovy-all.pom target/install/embeddable/groovy-all-$(DEB_UPSTREAM_VERSION).jar
 
 binary-post-install/$(PACKAGE)-doc::
 	dh_install -p$(PACKAGE)-doc $(API_DOCS) usr/share/doc/$(PACKAGE)