[bnd] 01/02: bnd spin-off to ease the transition toward the version 2

Wed Dec 16 10:46:10 UTC 2015

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag debian/1.50.0-10
in repository bnd.

commit 27857c6323cdbfa5097ee30a122022dcfa4f3477
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jun 16 11:49:49 2015 +0200

    bnd spin-off to ease the transition toward the version 2
---
 debian/bnd.pod      | 14 +++++++-------
 debian/bnd.poms     |  3 ---
 debian/bnd.sh       |  2 +-
 debian/bnd1.50.poms |  3 +++
 debian/changelog    |  8 ++++++++
 debian/control      | 10 ++++++----
 debian/manpages     |  2 +-
 debian/maven.rules  |  1 +
 debian/orig-tar.sh  |  2 +-
 debian/rules        | 20 ++++++++++----------
 10 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/debian/bnd.pod b/debian/bnd.pod
index 155db18..59de4e4 100644
--- a/debian/bnd.pod
+++ b/debian/bnd.pod
@@ -1,14 +1,14 @@
 =head1 NAME
 
-bnd - Create and diagnose OSGi R4 bundles.
+bnd-1.50 - Create and diagnose OSGi R4 bundles.
 
 =head1 SYNOPSIS
 
-B<bnd> [S<I<general-options>>] [S<I<cmd>>] [S<I<cmd-options>>]
+B<bnd-1.50> [S<I<general-options>>] [S<I<cmd>>] [S<I<cmd-options>>]
 
-B<bnd> [S<I<general-options>>] E<lt>fileE<gt>.jar
+B<bnd-1.50> [S<I<general-options>>] E<lt>fileE<gt>.jar
 
-B<bnd> [S<I<general-options>>] E<lt>fileE<gt>.bnd
+B<bnd-1.50> [S<I<general-options>>] E<lt>fileE<gt>.bnd
 
 =head1 DESCRIPTION
 
@@ -47,7 +47,7 @@ The print function will take a list of JAR file and print one or more aspect of
     * -list - List the entries in the JAR file
     * -all - Do all (this is the default. 
 
-C<bnd print -verify *.jar>
+C<bnd-1.50 print -verify *.jar>
 
 =item buildx ( -classpath LIST | -eclipse <lt>fileE<gt> | -noeclipse | -output E<lt>fileE<gt> ) * E<lt>fileE<gt>.bnd +
 
@@ -64,7 +64,7 @@ The build function will assemble a bundle from the bnd specification. The defaul
       directory. If the output is a directory, the name will be
       derived from the bnd file name. 
 
-C<bnd build -classpath bin -noeclipse -output test.jar xyz.bnd>
+C<bnd-1.50 build -classpath bin -noeclipse -output test.jar xyz.bnd>
 
 =item wrap ( -classpath (<lt>fileE<gt>(','<lt>fileE<gt>)*)-output <lt>fileE|dir<gt> | -properties <lt>fileE<gt> ) *
 -ignoremanifest? <lt>fileE<gt>.jar *
@@ -85,7 +85,7 @@ The defaults can be overridden with a specific properties file.
     * -ignoremanifest - Do not include the manifest headers from
       the target bundle 
 
-C<bnd wrap -classpath osgi.jar *.jar>
+C<bnd-1.50 wrap -classpath osgi.jar *.jar>
 
 =back
 
diff --git a/debian/bnd.poms b/debian/bnd.poms
deleted file mode 100644
index 32060f0..0000000
--- a/debian/bnd.poms
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/debian/bnd.sh b/debian/bnd.sh
index 7859163..cfa23d4 100644
--- a/debian/bnd.sh
+++ b/debian/bnd.sh
@@ -7,7 +7,7 @@
 find_java_runtime java5
 
 # Define our classpath
-find_jars bnd
+find_jars bnd-1.50.0
 
 # Run bnd
 run_java aQute.bnd.main.bnd $extra_args "$@"
diff --git a/debian/bnd1.50.poms b/debian/bnd1.50.poms
new file mode 100644
index 0000000..2d18844
--- /dev/null
+++ b/debian/bnd1.50.poms
@@ -0,0 +1,3 @@
+debian/pom-bnd.xml        --has-package-version --java-lib --keep-pom-version
+debian/pom-bndlib.xml     --has-package-version --java-lib --keep-pom-version
+debian/pom-annotation.xml --has-package-version --java-lib --keep-pom-version
diff --git a/debian/changelog b/debian/changelog
index 2c8bb8e..50342d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bnd1.50 (1.50.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * bnd spin-off to ease the transition toward the version 2.
+    New packages should depend on the original bnd package instead.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 16 Jun 2015 11:47:56 +0200
+
 bnd (1.50.0-9) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index c1fc635..6515a20 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: bnd
+Source: bnd1.50
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
@@ -22,12 +22,14 @@ Build-Depends: ant,
                maven-ant-helper,
                maven-repo-helper
 Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/bnd.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/bnd.git
+Vcs-Git: git://anonscm.debian.org/pkg-java/bnd1.50.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/bnd1.50.git
 Homepage: http://www.aQute.biz/Bnd
 
-Package: bnd
+Package: bnd1.50
 Architecture: all
+Replaces: bnd (<< 2.0.0~)
+Breaks: bnd (<< 2.0.0~)
 Depends: default-jre-headless | java5-runtime-headless,
          java-wrappers,
          libosgi-compendium-java (>= 5.0.0),
diff --git a/debian/manpages b/debian/manpages
index 919665b..c296f5e 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1 +1 @@
-debian/bnd.1
+debian/bnd-1.50.1
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..988d6a9
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+biz.aQute * * * * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index bf78d35..2614e6c 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 VERSION=$2
-TAR=../bnd_$VERSION.orig.tar.gz
+TAR=../bnd1.50_$VERSION.orig.tar.gz
 DIR=bnd-$VERSION
 GIT_DIR=bnd-git
 
diff --git a/debian/rules b/debian/rules
index b869dc1..4fcd64e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,20 +93,20 @@ clean-bootstrap:
 install/$(PACKAGE)::
 	pod2man -c 'BND for Debian GNU/Linux' \
 	  -r $(PACKAGE)-$(VERSION) \
-	  debian/bnd.pod > debian/bnd.1
+	  debian/bnd.pod > debian/bnd-1.50.1
 
 binary-post-install/$(PACKAGE)::
 	mkdir install/
-	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
+	cp biz.aQute.launcher/tmp/biz.aQute.launcher.jar install/bnd.launcher-1.50.0.jar
+	cp biz.aQute.junit/tmp/biz.aQute.junit.jar install/bnd.junit-1.50.0.jar
 	mh_installpoms -p$(PACKAGE) -e$(VERSION)
-	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
+	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bndlib.xml     -s --usj-name=bndlib         biz.aQute.bndlib/tmp/biz.aQute.bndlib.jar
+	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bnd.xml        -s --usj-name=bnd            biz.aQute.bnd/tmp/biz.aQute.bnd.jar
+	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-annotation.xml -s --usj-name=bnd.annotation biz.aQute.bnd/tmp/biz.aQute.bnd.annotation.jar
+	dh_install -p$(PACKAGE) install/bnd.launcher-1.50.0.jar usr/share/java
+	dh_install -p$(PACKAGE) install/bnd.junit-1.50.0.jar usr/share/java
 	dh_install -p$(PACKAGE) debian/bnd.sh /usr/bin/
-	mv $(DEB_DESTDIR)/usr/bin/bnd.sh $(DEB_DESTDIR)/usr/bin/bnd
+	mv $(DEB_DESTDIR)/usr/bin/bnd.sh $(DEB_DESTDIR)/usr/bin/bnd-1.50
 
 clean::
 	-rm -f debian/stamp-bootstrap
@@ -114,7 +114,7 @@ clean::
 	jh_clean
 	mh_clean
 	-rm -rf install/
-	-rm -f debian/bnd.1
+	-rm -f debian/bnd-1.50.1
 	-rm -Rf bootstrap
 
 get-orig-source:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git

