[pkg-java] r15725 - in tags/bnd: . 1.50.0-3/debian 1.50.0-3/debian/patches

Damien Raude-Morvan drazzib at alioth.debian.org
Tue Jan 17 22:23:46 UTC 2012


Author: drazzib
Date: 2012-01-17 22:23:46 +0000 (Tue, 17 Jan 2012)
New Revision: 15725

Added:
   tags/bnd/1.50.0-3/
   tags/bnd/1.50.0-3/debian/bootstrap.xml
   tags/bnd/1.50.0-3/debian/changelog
   tags/bnd/1.50.0-3/debian/patches/display_bsn_on_missing_bundle.diff
   tags/bnd/1.50.0-3/debian/patches/series
   tags/bnd/1.50.0-3/debian/rules
Removed:
   tags/bnd/1.50.0-3/debian/bootstrap.xml
   tags/bnd/1.50.0-3/debian/changelog
   tags/bnd/1.50.0-3/debian/patches/series
   tags/bnd/1.50.0-3/debian/rules
Log:
[svn-buildpackage] Tagging bnd 1.50.0-3

Deleted: tags/bnd/1.50.0-3/debian/bootstrap.xml
===================================================================
--- trunk/bnd/debian/bootstrap.xml	2012-01-15 11:26:27 UTC (rev 15708)
+++ tags/bnd/1.50.0-3/debian/bootstrap.xml	2012-01-17 22:23:46 UTC (rev 15725)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="bootstrap" default="bootstrap" basedir="..">
-    
-    <target name="clean">
-        <delete dir="bootstrap"/>
-    </target>
-
-    <target name="bootstrap">
-        <mkdir dir="bootstrap/build"/>
-        <javac
-                destdir="bootstrap/build"
-                classpath="/usr/share/java/osgi.core.jar:/usr/share/java/osgi.compendium.jar:/usr/share/java/bindex.jar">
-            <src path="aQute.libg/src"/>
-            <src path="biz.aQute.bndlib/src"/>
-            <src path="biz.aQute.bnd/src"/>
-            <exclude name="aQute/bnd/plugin/**"/>
-            <exclude name="aQute/bnd/launch/**"/>
-            <exclude name="aQute/bnd/classpath/**"/>
-            <exclude name="aQute/bnd/jareditor/**"/>
-            <exclude name="aQute/bnd/junit/**"/>
-            <exclude name="swing2swt/**"/>
-            <exclude name="biz/aqute/bnd/eclipse/**"/>
-            <exclude name="test/**"/>
-        </javac>
-        <copy
-                todir="bootstrap/build/aQute/bnd/ant/"
-                file="biz.aQute.bnd/src/aQute/bnd/ant/taskdef.properties" />
-        <jar destfile="bootstrap/bnd.jar">
-           <fileset dir="bootstrap/build/"/>
-        </jar>
-    </target>
-
-</project>

Copied: tags/bnd/1.50.0-3/debian/bootstrap.xml (from rev 15724, trunk/bnd/debian/bootstrap.xml)
===================================================================
--- tags/bnd/1.50.0-3/debian/bootstrap.xml	                        (rev 0)
+++ tags/bnd/1.50.0-3/debian/bootstrap.xml	2012-01-17 22:23:46 UTC (rev 15725)
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<project name="bootstrap" default="bootstrap" basedir="..">
+    
+    <target name="clean">
+        <delete dir="bootstrap"/>
+    </target>
+
+    <target name="bootstrap">
+        <mkdir dir="bootstrap/build"/>
+        <javac
+                destdir="bootstrap/build"
+                classpath="/usr/share/java/osgi.core.jar:/usr/share/java/osgi.compendium.jar:/usr/share/java/bindex.jar"
+                debug="true">
+            <src path="aQute.libg/src"/>
+            <src path="biz.aQute.bndlib/src"/>
+            <src path="biz.aQute.bnd/src"/>
+            <exclude name="aQute/bnd/plugin/**"/>
+            <exclude name="aQute/bnd/launch/**"/>
+            <exclude name="aQute/bnd/classpath/**"/>
+            <exclude name="aQute/bnd/jareditor/**"/>
+            <exclude name="aQute/bnd/junit/**"/>
+            <exclude name="swing2swt/**"/>
+            <exclude name="biz/aqute/bnd/eclipse/**"/>
+            <exclude name="test/**"/>
+        </javac>
+        <copy
+                todir="bootstrap/build/aQute/bnd/ant/"
+                file="biz.aQute.bnd/src/aQute/bnd/ant/taskdef.properties" />
+        <jar destfile="bootstrap/bnd.jar">
+           <fileset dir="bootstrap/build/"/>
+        </jar>
+    </target>
+
+</project>

Deleted: tags/bnd/1.50.0-3/debian/changelog
===================================================================
--- trunk/bnd/debian/changelog	2012-01-15 11:26:27 UTC (rev 15708)
+++ tags/bnd/1.50.0-3/debian/changelog	2012-01-17 22:23:46 UTC (rev 15725)
@@ -1,102 +0,0 @@
-bnd (1.50.0-2) unstable; urgency=low
-
-  [ Miguel Landaeta ]
-  * Team upload.
-
-  [ James Page ]
-  * Fix FTBFS with OpenJDK 7 (LP: #888926) (Closes: #651389):
-    - d/ant.properties: Set default source/target to 1.5 to ensure
-      backwards compatibility and avoid Java 7 encoding errors.
-
- -- Miguel Landaeta <miguel at miguel.cc>  Thu, 08 Dec 2011 21:41:18 -0430
-
-bnd (1.50.0-1) unstable; urgency=low
-
-  * New upstream release.
-  * d/control: Add Build-Depends on libbindex-java.
-  * d/{bootstrap,rules}: Add bindex.jar to classpath.
-  * d/patches/no_git_during_build.diff: Don't try to use GIT during build.
-  * d/patches/osgi43_fixes.diff: Some fixes for libosgi-core-java >= 4.3.
-  * d/patches/no_felix.diff: Drop dependency on felix-framework (to remove
-    dependency cycle).
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 09 Nov 2011 22:39:08 +0100
-
-bnd (1.44.0-1) unstable; urgency=low
-
-  * New upstream version.
-  * Bump Standards-Version to 3.9.2: no changes needed.
-  * d/copyright: Upgrade to latest DEP-5 version.
-  * Use upstream build system:
-    - d/orig-tar.sh: Rework to use github (Closes: #640839).
-    - d/build.xml, d/build.properties: Drop.
-    - d/bootstrap.xml: Build a small bnd.jar just for its own bootstrap.
-    - Rename d/svn-transform.sh to d/git-transform.sh and remove unneeded bits.
-  * Enable full OSGi and Eclipse modules (Closes: #565749) :
-    - d/control: Add Build-Depends on libswt-gtk-3-java, eclipse-rcp,
-      eclipse-jdt and libosgi-core-java
-    - d/control: Only Suggests: eclipse-rcp, eclipse-jdt
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 26 Oct 2011 00:59:39 +0200
-
-bnd (0.0.384-2) unstable; urgency=low
-
-  * Team upload.
-  * Switch to source format 3.0.
-  * Update Standards-Version: 3.9.1.
-
- -- Torsten Werner <twerner at debian.org>  Tue, 30 Aug 2011 19:28:43 +0200
-
-bnd (0.0.384-1) unstable; urgency=low
-
-  * New upstream release
-  * Exclude the Filter class from the distribution as it has
-    some copyright issues and it is not used anymore in this
-    new version of BND
-  * Update copyright according to upstream changes, all
-    contentious issues have been cleared.
-  * Bump up Standards-Version to 3.8.3, no change
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 02 Sep 2009 12:14:20 +0100
-
-bnd (0.0.337.2-3) unstable; urgency=low
-
-  * Force name of bnd library installed in /usr/share/java
-    to be bnd.jar instead of bndlib.jar 
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 14 Aug 2009 14:38:12 +0100
-
-bnd (0.0.337.2-2) unstable; urgency=low
-
-  [Ludovic Claude]
-  * Add man page for bnd script
-
-  [Damien Raude-Morvan]
-  * Add myself as Uploaders
-  * Install a "bnd" shell script to execute BND command line interface
-    - Add debian/bnd.sh script
-    - Add Depends on java-wrapper, used as helper for launch script
-  * Add debian/watch
-  * Remove duplicate Section declaration on first binary package
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 07 Aug 2009 14:12:23 +0100
-
-bnd (0.0.337.2-1) experimental; urgency=low
-
-  * Create a pseudo new upstream version to reflect the changes in the
-    source tarball.
- 
- -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 04 Aug 2009 20:30:17 +0100
-
-bnd (0.0.337.1-2) experimental; urgency=low
-
-  * Fix copyright issues
-  * Don't include the test jars in the source tarball
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 02 Aug 2009 22:48:47 +0100
-
-bnd (0.0.337.1-1) experimental; urgency=low
-
-  * Initial release. (Closes: #539558)
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 19 Jul 2009 19:48:06 +0100

Copied: tags/bnd/1.50.0-3/debian/changelog (from rev 15724, trunk/bnd/debian/changelog)
===================================================================
--- tags/bnd/1.50.0-3/debian/changelog	                        (rev 0)
+++ tags/bnd/1.50.0-3/debian/changelog	2012-01-17 22:23:46 UTC (rev 15725)
@@ -0,0 +1,110 @@
+bnd (1.50.0-3) unstable; urgency=low
+
+  * d/rules: Fix broken link with Eclipse JDT during build. (Closes: #655548).
+  * d/patches/display_bsn_on_missing_bundle.diff: Improve error message when
+    some bundle is missing.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 17 Jan 2012 23:16:19 +0100
+
+bnd (1.50.0-2) unstable; urgency=low
+
+  [ Miguel Landaeta ]
+  * Team upload.
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK 7 (LP: #888926) (Closes: #651389):
+    - d/ant.properties: Set default source/target to 1.5 to ensure
+      backwards compatibility and avoid Java 7 encoding errors.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 08 Dec 2011 21:41:18 -0430
+
+bnd (1.50.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * d/control: Add Build-Depends on libbindex-java.
+  * d/{bootstrap,rules}: Add bindex.jar to classpath.
+  * d/patches/no_git_during_build.diff: Don't try to use GIT during build.
+  * d/patches/osgi43_fixes.diff: Some fixes for libosgi-core-java >= 4.3.
+  * d/patches/no_felix.diff: Drop dependency on felix-framework (to remove
+    dependency cycle).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 09 Nov 2011 22:39:08 +0100
+
+bnd (1.44.0-1) unstable; urgency=low
+
+  * New upstream version.
+  * Bump Standards-Version to 3.9.2: no changes needed.
+  * d/copyright: Upgrade to latest DEP-5 version.
+  * Use upstream build system:
+    - d/orig-tar.sh: Rework to use github (Closes: #640839).
+    - d/build.xml, d/build.properties: Drop.
+    - d/bootstrap.xml: Build a small bnd.jar just for its own bootstrap.
+    - Rename d/svn-transform.sh to d/git-transform.sh and remove unneeded bits.
+  * Enable full OSGi and Eclipse modules (Closes: #565749) :
+    - d/control: Add Build-Depends on libswt-gtk-3-java, eclipse-rcp,
+      eclipse-jdt and libosgi-core-java
+    - d/control: Only Suggests: eclipse-rcp, eclipse-jdt
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 26 Oct 2011 00:59:39 +0200
+
+bnd (0.0.384-2) unstable; urgency=low
+
+  * Team upload.
+  * Switch to source format 3.0.
+  * Update Standards-Version: 3.9.1.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 30 Aug 2011 19:28:43 +0200
+
+bnd (0.0.384-1) unstable; urgency=low
+
+  * New upstream release
+  * Exclude the Filter class from the distribution as it has
+    some copyright issues and it is not used anymore in this
+    new version of BND
+  * Update copyright according to upstream changes, all
+    contentious issues have been cleared.
+  * Bump up Standards-Version to 3.8.3, no change
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 02 Sep 2009 12:14:20 +0100
+
+bnd (0.0.337.2-3) unstable; urgency=low
+
+  * Force name of bnd library installed in /usr/share/java
+    to be bnd.jar instead of bndlib.jar 
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 14 Aug 2009 14:38:12 +0100
+
+bnd (0.0.337.2-2) unstable; urgency=low
+
+  [Ludovic Claude]
+  * Add man page for bnd script
+
+  [Damien Raude-Morvan]
+  * Add myself as Uploaders
+  * Install a "bnd" shell script to execute BND command line interface
+    - Add debian/bnd.sh script
+    - Add Depends on java-wrapper, used as helper for launch script
+  * Add debian/watch
+  * Remove duplicate Section declaration on first binary package
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 07 Aug 2009 14:12:23 +0100
+
+bnd (0.0.337.2-1) experimental; urgency=low
+
+  * Create a pseudo new upstream version to reflect the changes in the
+    source tarball.
+ 
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 04 Aug 2009 20:30:17 +0100
+
+bnd (0.0.337.1-2) experimental; urgency=low
+
+  * Fix copyright issues
+  * Don't include the test jars in the source tarball
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 02 Aug 2009 22:48:47 +0100
+
+bnd (0.0.337.1-1) experimental; urgency=low
+
+  * Initial release. (Closes: #539558)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 19 Jul 2009 19:48:06 +0100

Copied: tags/bnd/1.50.0-3/debian/patches/display_bsn_on_missing_bundle.diff (from rev 15724, trunk/bnd/debian/patches/display_bsn_on_missing_bundle.diff)
===================================================================
--- tags/bnd/1.50.0-3/debian/patches/display_bsn_on_missing_bundle.diff	                        (rev 0)
+++ tags/bnd/1.50.0-3/debian/patches/display_bsn_on_missing_bundle.diff	2012-01-17 22:23:46 UTC (rev 15725)
@@ -0,0 +1,29 @@
+Description: Add a print to System.err when some bundle
+ is missing (will improve diagnostic when some symlink is broken).
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2012-01-17
+--- a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
++++ b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
+@@ -977,8 +977,11 @@
+ 						File file = plugin.get(bsn, range, useStrategy, attrs);
+ 						// and the entry must exist
+ 						// if it does, return this as a result
+-						if (file != null)
++						if (file != null) {
+ 							return toContainer(bsn, range, attrs, file);
++						} else {
++                            System.err.println("Missing: " + bsn + " " + range);
++						}
+ 					}
+ 				}
+ 			}
+@@ -1002,6 +1005,9 @@
+ 					RepositoryPlugin repo = versions.get(provider);
+ 					String version = provider.toString();
+ 					File result = repo.get(bsn, version, Strategy.EXACT, attrs);
++					if (result == null) {
++                        System.err.println("Missing: " + bsn + " " + range);          
++					}
+ 					return toContainer(bsn, version, attrs, result);
+ 				} else
+ 					error("Unexpected, found versions %s but then not provider for startegy %s?",

Deleted: tags/bnd/1.50.0-3/debian/patches/series
===================================================================
--- trunk/bnd/debian/patches/series	2012-01-15 11:26:27 UTC (rev 15708)
+++ tags/bnd/1.50.0-3/debian/patches/series	2012-01-17 22:23:46 UTC (rev 15725)
@@ -1,5 +0,0 @@
-build_excludes.diff
-no_ee_minimum.diff
-no_felix.diff
-no_git_during_build.diff
-osgi43_fixes.diff

Copied: tags/bnd/1.50.0-3/debian/patches/series (from rev 15724, trunk/bnd/debian/patches/series)
===================================================================
--- tags/bnd/1.50.0-3/debian/patches/series	                        (rev 0)
+++ tags/bnd/1.50.0-3/debian/patches/series	2012-01-17 22:23:46 UTC (rev 15725)
@@ -0,0 +1,6 @@
+build_excludes.diff
+no_ee_minimum.diff
+no_felix.diff
+no_git_during_build.diff
+osgi43_fixes.diff
+display_bsn_on_missing_bundle.diff

Deleted: tags/bnd/1.50.0-3/debian/rules
===================================================================
--- trunk/bnd/debian/rules	2012-01-15 11:26:27 UTC (rev 15708)
+++ tags/bnd/1.50.0-3/debian/rules	2012-01-17 22:23:46 UTC (rev 15725)
@@ -1,128 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-MAVEN_REPO           := http://repo1.maven.org/maven2/biz/aQute/bndlib/
-MAVEN_VERSION        := 1.43.0
-
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps ant junit
-DEB_ANT_BUILD_TARGET := build
-
-### Bootstrap build
-pre-build:: debian/stamp-bootstrap
-bootstrap: debian/stamp-bootstrap
-debian/stamp-bootstrap: DEB_BUILDDIR=$(CURDIR)
-debian/stamp-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
-debian/stamp-bootstrap:
-	$(DEB_ANT_INVOKE)
-	mkdir -p cnf/repo/biz.aQute.bnd/ \
-		cnf/repo/com.springsource.junit/ \
-		cnf/repo/org.eclipse.osgi \
-		cnf/repo/osgi.core \
-		cnf/repo/osgi.cmpn \
-		cnf/repo/ee.minimum \
-		cnf/repo/junit.osgi \
-		cnf/repo/org.apache.tools.ant \
-		cnf/repo/org.eclipse.core.runtime \
-		cnf/repo/org.eclipse.core.resources \
-		cnf/repo/org.eclipse.core.commands \
-		cnf/repo/org.eclipse.jdt.core \
-		cnf/repo/org.eclipse.jdt.ui \
-		cnf/repo/org.eclipse.jdt.debug.ui \
-		cnf/repo/org.eclipse.jdt.junit \
-		cnf/repo/org.eclipse.jdt.launching \
-		cnf/repo/org.eclipse.jface \
-		cnf/repo/org.eclipse.jface.text \
-		cnf/repo/org.eclipse.swt \
-		cnf/repo/org.eclipse.debug.ui \
-		cnf/repo/org.eclipse.debug.core \
-		cnf/repo/org.eclipse.equinox.common \
-		cnf/repo/org.eclipse.equinox.registry \
-		cnf/repo/org.eclipse.ui \
-		cnf/repo/org.eclipse.ui.editors \
-		cnf/repo/org.eclipse.ui.workbench \
-		cnf/repo/org.eclipse.ui.workbench.texteditor \
-		cnf/repo/org.eclipse.ui.ide \
-		cnf/repo/org.eclipse.core.jobs \
-		cnf/repo/org.eclipse.text \
-		cnf/repo/org.eclipse.swt.carbon.macosx \
-		cnf/repo/org.osgi.impl.bundle.bindex
-	ln -s $(CURDIR)/bootstrap/bnd.jar cnf/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar
-	ln -s /usr/share/java/junit.jar cnf/repo/com.springsource.junit/com.springsource.junit-3.8.2.jar
-	ln -s /usr/share/java/junit.jar cnf/repo/junit.osgi/junit.osgi-3.8.2.jar
-	ln -s /usr/share/java/osgi.core.jar cnf/repo/org.eclipse.osgi/org.eclipse.osgi-3.5.0.jar
-	ln -s /usr/share/java/osgi.core.jar cnf/repo/osgi.core/osgi.core-4.2.1.jar
-	ln -s /usr/share/java/osgi.compendium.jar cnf/repo/osgi.cmpn/osgi.cmpn-4.3.0.jar
-#	ln -s /usr/share/java/ee.foundation.jar cnf/repo/ee.minimum/ee.minimum-1.2.1.jar
-	ln -s /usr/share/java/ant.jar cnf/repo/org.apache.tools.ant/org.apache.tools.ant-1.7.1.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar cnf/repo/org.eclipse.core.runtime/org.eclipse.core.runtime-3.3.100.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.resources_*.jar cnf/repo/org.eclipse.core.resources/org.eclipse.core.resources-3.3.1.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar cnf/repo/org.eclipse.core.commands/org.eclipse.core.commands-3.3.3.jar
-	ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar cnf/repo/org.eclipse.jdt.core/org.eclipse.jdt.core-3.3.3.jar
-	ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.ui_*.jar cnf/repo/org.eclipse.jdt.ui/org.eclipse.jdt.ui-3.3.3.jar
-	ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*.jar cnf/repo/org.eclipse.jdt.debug.ui/org.eclipse.jdt.debug.ui-3.2.102.jar
-	ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit_*.jar cnf/repo/org.eclipse.jdt.junit/org.eclipse.jdt.junit-3.3.3.jar
-	ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.launching_*.jar cnf/repo/org.eclipse.jdt.launching/org.eclipse.jdt.launching-3.3.3.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.jface_*.jar cnf/repo/org.eclipse.jface/org.eclipse.jface-3.3.2.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.jface.text_*.jar cnf/repo/org.eclipse.jface.text/org.eclipse.jface.text-3.3.2.jar
-	ln -s /usr/lib/java/swt-gtk-*.jar cnf/repo/org.eclipse.swt/org.eclipse.swt-3.3.2.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.debug.ui_*.jar cnf/repo/org.eclipse.debug.ui/org.eclipse.debug.ui-3.3.2.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.debug.core_*.jar cnf/repo/org.eclipse.debug.core/org.eclipse.debug.core-3.3.2.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.equinox.common_*.jar cnf/repo/org.eclipse.equinox.common/org.eclipse.equinox.common-3.3.0.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.equinox.registry_*.jar cnf/repo/org.eclipse.equinox.registry/org.eclipse.equinox.registry-3.3.0.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui_*.jar cnf/repo/org.eclipse.ui/org.eclipse.ui-3.3.2.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.editors_*.jar cnf/repo/org.eclipse.ui.editors/org.eclipse.ui.editors-3.3.2.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.workbench_*.jar cnf/repo/org.eclipse.ui.workbench/org.eclipse.ui.workbench-3.3.2.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.workbench.texteditor_*.jar cnf/repo/org.eclipse.ui.workbench.texteditor/org.eclipse.ui.workbench.texteditor-3.3.2.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.ide_*.jar cnf/repo/org.eclipse.ui.ide/org.eclipse.ui.ide-3.3.2.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.jobs_*.jar cnf/repo/org.eclipse.core.jobs/org.eclipse.core.jobs-3.3.1.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.text_*.jar cnf/repo/org.eclipse.text/org.eclipse.text-3.5.100.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.swt.*_*.jar cnf/repo/org.eclipse.swt.carbon.macosx/org.eclipse.swt.carbon.macosx-3.3.3.jar
-	ln -s /usr/share/java/bindex.jar cnf/repo/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-2.2.0.jar
-	touch $@
-clean-bootstrap: DEB_BUILDDIR=$(CURDIR)
-clean-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
-clean-bootstrap:
-	$(DEB_ANT_INVOKE) clean
-	rm -rf cnf/repo/biz.aQute.bnd/
-	rm -f debian/stamp-bootstrap
-
-### Standard build
-install/$(PACKAGE)::
-	pod2man -c 'BND for Debian GNU/Linux' \
-	  -r $(PACKAGE)-$(VERSION) \
-	  debian/bnd.pod > debian/bnd.1
-
-binary-post-install/$(PACKAGE)::
-	mkdir install/
-	cp biz.aQute.bnd/tmp/biz.aQute.bnd.jar install/bnd.jar
-	cp biz.aQute.bndlib/tmp/biz.aQute.bndlib.jar install/bndlib.jar
-	cp biz.aQute.bnd/tmp/biz.aQute.bnd.annotation.jar install/bnd.annotation.jar
-	cp biz.aQute.launcher/tmp/biz.aQute.launcher.jar install/bnd.launcher.jar
-	cp biz.aQute.junit/tmp/biz.aQute.junit.jar install/bnd.junit.jar
-	mh_installpoms -p$(PACKAGE) -e$(VERSION)
-	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom.xml install/bndlib.jar
-	jh_installlibs -p$(PACKAGE) install/bnd.jar
-	jh_installlibs -p$(PACKAGE) install/bnd.annotation.jar
-	jh_installlibs -p$(PACKAGE) install/bnd.launcher.jar
-	jh_installlibs -p$(PACKAGE) install/bnd.junit.jar
-	dh_install -p$(PACKAGE) debian/bnd.sh /usr/bin/
-	mv $(DEB_DESTDIR)/usr/bin/bnd.sh $(DEB_DESTDIR)/usr/bin/bnd
-
-clean::
-	jh_clean
-	mh_clean
-	-rm -rf install/
-	-rm -f debian/bnd.1
-
-get-orig-source:
-	debian/orig-tar.sh "" $(VERSION)
-
-get-orig-pom:
-	wget --user-agent="" -O debian/pom.xml $(MAVEN_REPO)/$(MAVEN_VERSION)/bndlib-$(MAVEN_VERSION).pom 
-
-.PHONY: bootstrap clean-bootstrap

Copied: tags/bnd/1.50.0-3/debian/rules (from rev 15724, trunk/bnd/debian/rules)
===================================================================
--- tags/bnd/1.50.0-3/debian/rules	                        (rev 0)
+++ tags/bnd/1.50.0-3/debian/rules	2012-01-17 22:23:46 UTC (rev 15725)
@@ -0,0 +1,128 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+MAVEN_REPO           := http://repo1.maven.org/maven2/biz/aQute/bndlib/
+MAVEN_VERSION        := 1.43.0
+
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := ant-nodeps ant junit
+DEB_ANT_BUILD_TARGET := build
+
+### Bootstrap build
+pre-build:: debian/stamp-bootstrap
+bootstrap: debian/stamp-bootstrap
+debian/stamp-bootstrap: DEB_BUILDDIR=$(CURDIR)
+debian/stamp-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
+debian/stamp-bootstrap:
+	$(DEB_ANT_INVOKE)
+	mkdir -p cnf/repo/biz.aQute.bnd/ \
+		cnf/repo/com.springsource.junit/ \
+		cnf/repo/org.eclipse.osgi \
+		cnf/repo/osgi.core \
+		cnf/repo/osgi.cmpn \
+		cnf/repo/ee.minimum \
+		cnf/repo/junit.osgi \
+		cnf/repo/org.apache.tools.ant \
+		cnf/repo/org.eclipse.core.runtime \
+		cnf/repo/org.eclipse.core.resources \
+		cnf/repo/org.eclipse.core.commands \
+		cnf/repo/org.eclipse.jdt.core \
+		cnf/repo/org.eclipse.jdt.ui \
+		cnf/repo/org.eclipse.jdt.debug.ui \
+		cnf/repo/org.eclipse.jdt.junit \
+		cnf/repo/org.eclipse.jdt.launching \
+		cnf/repo/org.eclipse.jface \
+		cnf/repo/org.eclipse.jface.text \
+		cnf/repo/org.eclipse.swt \
+		cnf/repo/org.eclipse.debug.ui \
+		cnf/repo/org.eclipse.debug.core \
+		cnf/repo/org.eclipse.equinox.common \
+		cnf/repo/org.eclipse.equinox.registry \
+		cnf/repo/org.eclipse.ui \
+		cnf/repo/org.eclipse.ui.editors \
+		cnf/repo/org.eclipse.ui.workbench \
+		cnf/repo/org.eclipse.ui.workbench.texteditor \
+		cnf/repo/org.eclipse.ui.ide \
+		cnf/repo/org.eclipse.core.jobs \
+		cnf/repo/org.eclipse.text \
+		cnf/repo/org.eclipse.swt.carbon.macosx \
+		cnf/repo/org.osgi.impl.bundle.bindex
+	ln -s $(CURDIR)/bootstrap/bnd.jar cnf/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar
+	ln -s /usr/share/java/junit.jar cnf/repo/com.springsource.junit/com.springsource.junit-3.8.2.jar
+	ln -s /usr/share/java/junit.jar cnf/repo/junit.osgi/junit.osgi-3.8.2.jar
+	ln -s /usr/share/java/osgi.core.jar cnf/repo/org.eclipse.osgi/org.eclipse.osgi-3.5.0.jar
+	ln -s /usr/share/java/osgi.core.jar cnf/repo/osgi.core/osgi.core-4.2.1.jar
+	ln -s /usr/share/java/osgi.compendium.jar cnf/repo/osgi.cmpn/osgi.cmpn-4.3.0.jar
+#	ln -s /usr/share/java/ee.foundation.jar cnf/repo/ee.minimum/ee.minimum-1.2.1.jar
+	ln -s /usr/share/java/ant.jar cnf/repo/org.apache.tools.ant/org.apache.tools.ant-1.7.1.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar cnf/repo/org.eclipse.core.runtime/org.eclipse.core.runtime-3.3.100.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.resources_*.jar cnf/repo/org.eclipse.core.resources/org.eclipse.core.resources-3.3.1.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar cnf/repo/org.eclipse.core.commands/org.eclipse.core.commands-3.3.3.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.jdt.core_*.jar cnf/repo/org.eclipse.jdt.core/org.eclipse.jdt.core-3.3.3.jar
+	ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.ui_*.jar cnf/repo/org.eclipse.jdt.ui/org.eclipse.jdt.ui-3.3.3.jar
+	ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*.jar cnf/repo/org.eclipse.jdt.debug.ui/org.eclipse.jdt.debug.ui-3.2.102.jar
+	ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit_*.jar cnf/repo/org.eclipse.jdt.junit/org.eclipse.jdt.junit-3.3.3.jar
+	ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.launching_*.jar cnf/repo/org.eclipse.jdt.launching/org.eclipse.jdt.launching-3.3.3.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.jface_*.jar cnf/repo/org.eclipse.jface/org.eclipse.jface-3.3.2.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.jface.text_*.jar cnf/repo/org.eclipse.jface.text/org.eclipse.jface.text-3.3.2.jar
+	ln -s /usr/lib/java/swt-gtk-*.jar cnf/repo/org.eclipse.swt/org.eclipse.swt-3.3.2.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.debug.ui_*.jar cnf/repo/org.eclipse.debug.ui/org.eclipse.debug.ui-3.3.2.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.debug.core_*.jar cnf/repo/org.eclipse.debug.core/org.eclipse.debug.core-3.3.2.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.equinox.common_*.jar cnf/repo/org.eclipse.equinox.common/org.eclipse.equinox.common-3.3.0.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.equinox.registry_*.jar cnf/repo/org.eclipse.equinox.registry/org.eclipse.equinox.registry-3.3.0.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui_*.jar cnf/repo/org.eclipse.ui/org.eclipse.ui-3.3.2.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.editors_*.jar cnf/repo/org.eclipse.ui.editors/org.eclipse.ui.editors-3.3.2.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.workbench_*.jar cnf/repo/org.eclipse.ui.workbench/org.eclipse.ui.workbench-3.3.2.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.workbench.texteditor_*.jar cnf/repo/org.eclipse.ui.workbench.texteditor/org.eclipse.ui.workbench.texteditor-3.3.2.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.ide_*.jar cnf/repo/org.eclipse.ui.ide/org.eclipse.ui.ide-3.3.2.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.jobs_*.jar cnf/repo/org.eclipse.core.jobs/org.eclipse.core.jobs-3.3.1.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.text_*.jar cnf/repo/org.eclipse.text/org.eclipse.text-3.5.100.jar
+	ln -s /usr/lib/eclipse/plugins/org.eclipse.swt.*_*.jar cnf/repo/org.eclipse.swt.carbon.macosx/org.eclipse.swt.carbon.macosx-3.3.3.jar
+	ln -s /usr/share/java/bindex.jar cnf/repo/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-2.2.0.jar
+	touch $@
+clean-bootstrap: DEB_BUILDDIR=$(CURDIR)
+clean-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
+clean-bootstrap:
+	$(DEB_ANT_INVOKE) clean
+	rm -rf cnf/repo/biz.aQute.bnd/
+	rm -f debian/stamp-bootstrap
+
+### Standard build
+install/$(PACKAGE)::
+	pod2man -c 'BND for Debian GNU/Linux' \
+	  -r $(PACKAGE)-$(VERSION) \
+	  debian/bnd.pod > debian/bnd.1
+
+binary-post-install/$(PACKAGE)::
+	mkdir install/
+	cp biz.aQute.bnd/tmp/biz.aQute.bnd.jar install/bnd.jar
+	cp biz.aQute.bndlib/tmp/biz.aQute.bndlib.jar install/bndlib.jar
+	cp biz.aQute.bnd/tmp/biz.aQute.bnd.annotation.jar install/bnd.annotation.jar
+	cp biz.aQute.launcher/tmp/biz.aQute.launcher.jar install/bnd.launcher.jar
+	cp biz.aQute.junit/tmp/biz.aQute.junit.jar install/bnd.junit.jar
+	mh_installpoms -p$(PACKAGE) -e$(VERSION)
+	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom.xml install/bndlib.jar
+	jh_installlibs -p$(PACKAGE) install/bnd.jar
+	jh_installlibs -p$(PACKAGE) install/bnd.annotation.jar
+	jh_installlibs -p$(PACKAGE) install/bnd.launcher.jar
+	jh_installlibs -p$(PACKAGE) install/bnd.junit.jar
+	dh_install -p$(PACKAGE) debian/bnd.sh /usr/bin/
+	mv $(DEB_DESTDIR)/usr/bin/bnd.sh $(DEB_DESTDIR)/usr/bin/bnd
+
+clean::
+	jh_clean
+	mh_clean
+	-rm -rf install/
+	-rm -f debian/bnd.1
+
+get-orig-source:
+	debian/orig-tar.sh "" $(VERSION)
+
+get-orig-pom:
+	wget --user-agent="" -O debian/pom.xml $(MAVEN_REPO)/$(MAVEN_VERSION)/bndlib-$(MAVEN_VERSION).pom 
+
+.PHONY: bootstrap clean-bootstrap




More information about the pkg-java-commits mailing list