[pkg-java] r17337 - trunk/bnd/debian

Emmanuel Bourg ebourg-guest at alioth.debian.org
Thu Oct 17 20:18:20 UTC 2013


Author: ebourg-guest
Date: 2013-10-17 20:18:19 +0000 (Thu, 17 Oct 2013)
New Revision: 17337

Added:
   trunk/bnd/debian/pom-annotation.xml
   trunk/bnd/debian/pom-bnd.xml
   trunk/bnd/debian/pom-bndlib.xml
Removed:
   trunk/bnd/debian/maven.rules
   trunk/bnd/debian/pom.xml
Modified:
   trunk/bnd/debian/bnd.poms
   trunk/bnd/debian/changelog
   trunk/bnd/debian/rules
Log:
Install the Maven artifacts biz.aQute:annotation and biz.aQute:bnd



Modified: trunk/bnd/debian/bnd.poms
===================================================================
--- trunk/bnd/debian/bnd.poms	2013-10-17 05:06:16 UTC (rev 17336)
+++ trunk/bnd/debian/bnd.poms	2013-10-17 20:18:19 UTC (rev 17337)
@@ -1 +1,3 @@
-debian/pom.xml
+debian/pom-bnd.xml --has-package-version --java-lib
+debian/pom-bndlib.xml --has-package-version --java-lib
+debian/pom-annotation.xml --has-package-version --java-lib

Modified: trunk/bnd/debian/changelog
===================================================================
--- trunk/bnd/debian/changelog	2013-10-17 05:06:16 UTC (rev 17336)
+++ trunk/bnd/debian/changelog	2013-10-17 20:18:19 UTC (rev 17337)
@@ -1,3 +1,9 @@
+bnd (1.50.0-7) unstable; urgency=low
+
+  * Install the Maven artifacts biz.aQute:annotation and biz.aQute:bnd
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 17 Oct 2013 22:15:13 +0200
+
 bnd (1.50.0-6) unstable; urgency=low
 
   [ Emmanuel Bourg ]

Deleted: trunk/bnd/debian/maven.rules
===================================================================
--- trunk/bnd/debian/maven.rules	2013-10-17 05:06:16 UTC (rev 17336)
+++ trunk/bnd/debian/maven.rules	2013-10-17 20:18:19 UTC (rev 17337)
@@ -1 +0,0 @@
-biz.aQute s/bnd/bndlib/

Added: trunk/bnd/debian/pom-annotation.xml
===================================================================
--- trunk/bnd/debian/pom-annotation.xml	                        (rev 0)
+++ trunk/bnd/debian/pom-annotation.xml	2013-10-17 20:18:19 UTC (rev 17337)
@@ -0,0 +1,35 @@
+<project xmlns='http://maven.apache.org/POM/4.0.0'
+xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>biz.aQute</groupId>
+  <artifactId>annotation</artifactId>
+  <version>1.50.0</version>
+  <name>bnd Annotations Library</name>
+  <description>The annotations for bnd.</description>
+  <url>http://www.aQute.biz/Code/Bnd</url>
+  <scm>
+    <url>git://github.com/bndtools/bnd.git</url>
+    <connection>scm:git:git://github.com/bndtools/bnd.git</connection>
+  </scm>
+  <organization>
+    <name>aQute SARL</name>
+    <url>http://www.aQute.biz</url>
+  </organization>
+  <developers>
+    <developer>
+      <id>Peter.Kriens at aQute.biz</id>
+      <name>Peter.Kriens</name>
+      <email>Peter.Kriens at aQute.biz</email>
+      <organization>aQute</organization>
+    </developer>
+  </developers>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>http://www.opensource.org/licenses/apache2.0.php</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+</project>

Added: trunk/bnd/debian/pom-bnd.xml
===================================================================
--- trunk/bnd/debian/pom-bnd.xml	                        (rev 0)
+++ trunk/bnd/debian/pom-bnd.xml	2013-10-17 20:18:19 UTC (rev 17337)
@@ -0,0 +1,34 @@
+<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>biz.aQute</groupId>
+  <artifactId>bnd</artifactId>
+  <version>1.50.0</version>
+  <packaging>jar</packaging>
+  <description>A utility and plugin to wrap, build, or print bundles</description>
+  <name>aQute Bundle Tool</name>
+  <url>http://www.aQute.biz/Code/Bnd</url>
+  <scm>
+    <url>https://github.com/bndtools/bnd</url>
+    <connection>scm:git:git://github.com/bndtools/bnd.git</connection>
+  </scm>
+  <organization>
+    <name>aQute SARL</name>
+    <url>http://www.aQute.biz</url>
+  </organization>
+  <developers>
+    <developer>
+      <name>Peter Kriens</name>
+      <email>peter.kriens at aqute.biz</email>
+      <roles>
+        <role>Primary Developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <licenses>
+    <license>
+    <name>All files contained in this JAR are licensed under the Apache 2.0 license, unless noted differently in their source (see swing2swt).</name>
+    <url>http://www.opensource.org/licenses/apache2.0.php</url>
+    <distribution>repo</distribution>
+    </license>
+  </licenses>
+</project>

Added: trunk/bnd/debian/pom-bndlib.xml
===================================================================
--- trunk/bnd/debian/pom-bndlib.xml	                        (rev 0)
+++ trunk/bnd/debian/pom-bndlib.xml	2013-10-17 20:18:19 UTC (rev 17337)
@@ -0,0 +1,64 @@
+
+<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>biz.aQute</groupId>
+  <artifactId>bndlib</artifactId>
+  <version>1.50.0</version>
+  <description>
+    A Swiss Army Knife for OSGi
+  </description>
+  <name>
+    bnd - Bundle Tool
+  </name>
+  <url>
+    http://www.aQute.biz/Code/Bnd
+  </url>
+  <scm>
+    <url>
+      git://github.com/bndtools/bnd.git
+    </url>
+    <connection>
+      git://github.com/bndtools/bnd.git
+    </connection>
+    <developerConnection>
+      git://github.com/bndtools/bnd.git
+    </developerConnection>
+  </scm>
+  <organization>
+    <name>
+      aQute SARL
+    </name>
+    <url>
+      http://www.aQute.biz
+    </url>
+  </organization>
+  <developers>
+    <developer>
+      <id>
+        Peter.Kriens at aQute.biz
+      </id>
+      <name>
+        Peter.Kriens
+      </name>
+      <email>
+        Peter.Kriens at aQute.biz
+      </email>
+      <organization>
+        aQute
+      </organization>
+    </developer>
+  </developers>
+  <licenses>
+    <license>
+      <name>
+        Apache Software License 2.0
+      </name>
+      <url>
+        http://www.opensource.org/licenses/apache2.0.php
+      </url>
+      <distribution>
+        repo
+      </distribution>
+    </license>
+  </licenses>
+</project>

Deleted: trunk/bnd/debian/pom.xml
===================================================================
--- trunk/bnd/debian/pom.xml	2013-10-17 05:06:16 UTC (rev 17336)
+++ trunk/bnd/debian/pom.xml	2013-10-17 20:18:19 UTC (rev 17337)
@@ -1,64 +0,0 @@
-
-<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>biz.aQute</groupId>
-  <artifactId>bndlib</artifactId>
-  <version>1.50.0</version>
-  <description>
-    A Swiss Army Knife for OSGi
-  </description>
-  <name>
-    bnd - Bundle Tool
-  </name>
-  <url>
-    http://www.aQute.biz/Code/Bnd
-  </url>
-  <scm>
-    <url>
-      git://github.com/bndtools/bnd.git
-    </url>
-    <connection>
-      git://github.com/bndtools/bnd.git
-    </connection>
-    <developerConnection>
-      git://github.com/bndtools/bnd.git
-    </developerConnection>
-  </scm>
-  <organization>
-    <name>
-      aQute SARL
-    </name>
-    <url>
-      http://www.aQute.biz
-    </url>
-  </organization>
-  <developers>
-    <developer>
-      <id>
-        Peter.Kriens at aQute.biz
-      </id>
-      <name>
-        Peter.Kriens
-      </name>
-      <email>
-        Peter.Kriens at aQute.biz
-      </email>
-      <organization>
-        aQute
-      </organization>
-    </developer>
-  </developers>
-  <licenses>
-    <license>
-      <name>
-        Apache Software License 2.0
-      </name>
-      <url>
-        http://www.opensource.org/licenses/apache2.0.php
-      </url>
-      <distribution>
-        repo
-      </distribution>
-    </license>
-  </licenses>
-</project>

Modified: trunk/bnd/debian/rules
===================================================================
--- trunk/bnd/debian/rules	2013-10-17 05:06:16 UTC (rev 17336)
+++ trunk/bnd/debian/rules	2013-10-17 20:18:19 UTC (rev 17337)
@@ -3,7 +3,7 @@
 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_REPO           := http://repo1.maven.org/maven2/biz/aQute/
 MAVEN_VERSION        := 1.50.0
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
@@ -97,15 +97,12 @@
 
 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
+	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bndlib.xml     --usj-name=bndlib         biz.aQute.bndlib/tmp/biz.aQute.bndlib.jar
+	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bnd.xml        --usj-name=bnd            biz.aQute.bnd/tmp/biz.aQute.bnd.jar
+	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-annotation.xml --usj-name=bnd.annotation biz.aQute.bnd/tmp/biz.aQute.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/
@@ -124,6 +121,8 @@
 	debian/orig-tar.sh "" $(VERSION)
 
 get-orig-pom:
-	wget --user-agent="" -O debian/pom.xml $(MAVEN_REPO)/$(MAVEN_VERSION)/bndlib-$(MAVEN_VERSION).pom 
+	wget --user-agent="" -O debian/pom-bnd.xml $(MAVEN_REPO)/bnd/$(MAVEN_VERSION)/bnd-$(MAVEN_VERSION).pom 
+	wget --user-agent="" -O debian/pom-bndlib.xml $(MAVEN_REPO)/bndlib/$(MAVEN_VERSION)/bndlib-$(MAVEN_VERSION).pom 
+	wget --user-agent="" -O debian/pom-annotation.xml $(MAVEN_REPO)/annotation/$(MAVEN_VERSION)/annotation-$(MAVEN_VERSION).pom 
 
 .PHONY: bootstrap clean-bootstrap




More information about the pkg-java-commits mailing list