[SCM] bindex packaging branch, master, updated. debian/2.2-3-9-gb4fcfa4
The following commit has been merged in the master branch: commit 1dc7346cd9fc3b6c38648eebdec2c21312391e87 Author: Damien Raude-Morvan draz...@debian.org Date: Tue Nov 8 00:32:01 2011 +0100 New upsteam snapshot. diff --git a/debian/changelog b/debian/changelog index c68df5a..f2a3b11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bindex (2.2+svn101-1) unstable; urgency=low + + * New upsteam snapshot. + + -- Damien Raude-Morvan draz...@debian.org Tue, 08 Nov 2011 00:29:17 +0100 + bindex (2.2-3) unstable; urgency=low * Fix call to new bnd buildx command. diff --git a/debian/rules b/debian/rules index 291a6bd..8f90ae3 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,7 @@ override_dh_clean: dh_clean svnURL := http://www.osgi.org/svn/public/trunk/org.osgi.impl.bundle.bindex/ -svnRev := 96 +svnRev := 101 get-orig-source: svn export -r $(svnRev) $(svnURL) $(PACKAGE)-$(VERSION).orig; -- bindex packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] bindex packaging branch, master, updated. debian/2.2-3-9-gb4fcfa4
The following commit has been merged in the master branch: commit 77320d1f9be3657253508ef8b3f8a7cbaed580b2 Merge: 1dc7346cd9fc3b6c38648eebdec2c21312391e87 e0d4d02a168b458611feb81f6d1a3f22f9f90d24 Author: Damien Raude-Morvan draz...@debian.org Date: Tue Nov 8 00:32:33 2011 +0100 Merge commit 'upstream/2.2+svn101' -- bindex packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] bindex packaging branch, master, updated. debian/2.2-3-9-gb4fcfa4
The following commit has been merged in the master branch: commit 5b9a36febf913de66cf7ab8f229b0e5cb1d90aab Author: Damien Raude-Morvan draz...@debian.org Date: Tue Nov 8 00:34:12 2011 +0100 Drop d/patches/classpath.patch. diff --git a/debian/changelog b/debian/changelog index f2a3b11..2f9191d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ bindex (2.2+svn101-1) unstable; urgency=low * New upsteam snapshot. + * Drop d/patches/classpath.patch. - -- Damien Raude-Morvan draz...@debian.org Tue, 08 Nov 2011 00:29:17 +0100 + -- Damien Raude-Morvan draz...@debian.org Tue, 08 Nov 2011 00:33:59 +0100 bindex (2.2-3) unstable; urgency=low diff --git a/debian/patches/classpath.patch b/debian/patches/classpath.patch deleted file mode 100644 index ccb73d3..000 --- a/debian/patches/classpath.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: b/.classpath -=== a/.classpath -+++ b/.classpath -@@ -2,9 +2,10 @@ - classpath - classpathentry kind=src path=src/ - classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/ -- classpathentry kind=lib path=jar/ant.jar/ -- classpathentry kind=lib path=jar/kxml2-min.jar/ -+ classpathentry kind=lib path=/usr/share/ant/lib/ant.jar/ -+ classpathentry kind=lib path=/usr/share/java/kxml2-min.jar/ - classpathentry kind=var path=JUNIT_HOME/junit.jar/ -- classpathentry kind=lib path=jar/org.osgi.service.obr.jar/ -+ classpathentry kind=lib path=/usr/share/java/org.osgi.service.obr.jar/ -+ classpathentry kind=lib path=/usr/share/java/osgi.core.jar/ - classpathentry kind=output path=bin/ - /classpath diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 51d6270..000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -classpath.patch -- bindex packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] bindex packaging branch, master, updated. debian/2.2-3-9-gb4fcfa4
The following commit has been merged in the master branch: commit 766349f9bf71cc6cfd315593d85f0122ffcb7939 Author: Damien Raude-Morvan draz...@debian.org Date: Tue Nov 8 00:34:51 2011 +0100 Ignore quilt dir diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..845ca06 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pc -- bindex packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] bindex packaging branch, master, updated. debian/2.2-3-9-gb4fcfa4
The following commit has been merged in the master branch: commit 125b1a36b8dd06058ff42f2b3af605eae9702df8 Author: Damien Raude-Morvan draz...@debian.org Date: Tue Nov 8 02:05:59 2011 +0100 Add bnd.annotation.jar to classpath diff --git a/debian/rules b/debian/rules index 8f90ae3..ada26aa 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') VERSION:= $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//') JAVA_HOME := /usr/lib/jvm/default-java/ JAR_BASE := /usr/share/java -CLASSPATH:= /usr/share/ant/lib/ant.jar:$(JAR_BASE)/kxml2-min.jar:$(JAR_BASE)/org.osgi.service.obr.jar:$(JAR_BASE)/osgi.core.jar:$(JAR_BASE)/junit4.jar +CLASSPATH:= /usr/share/ant/lib/ant.jar:$(JAR_BASE)/kxml2-min.jar:$(JAR_BASE)/org.osgi.service.obr.jar:$(JAR_BASE)/osgi.core.jar:$(JAR_BASE)/junit4.jar:$(JAR_BASE)/bnd.annotation.jar %: dh $@ --with javahelper -- bindex packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] bindex packaging branch, master, updated. debian/2.2-3-9-gb4fcfa4
The following commit has been merged in the master branch: commit 8b9fb9ded7fe7276dfe818eb09cea9b633bff9ac Author: Damien Raude-Morvan draz...@debian.org Date: Tue Nov 8 02:06:47 2011 +0100 Fix bnd.bnd location and version extract. diff --git a/debian/rules b/debian/rules index ada26aa..3b615d6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f PACKAGE:= $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') -VERSION:= $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//') +VERSION:= $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//' | sed -e 's/\+svn.*//') JAVA_HOME := /usr/lib/jvm/default-java/ JAR_BASE := /usr/share/java CLASSPATH:= /usr/share/ant/lib/ant.jar:$(JAR_BASE)/kxml2-min.jar:$(JAR_BASE)/org.osgi.service.obr.jar:$(JAR_BASE)/osgi.core.jar:$(JAR_BASE)/junit4.jar:$(JAR_BASE)/bnd.annotation.jar @@ -12,7 +12,7 @@ CLASSPATH:= /usr/share/ant/lib/ant.jar:$(JAR_BASE)/kxml2-min.jar:$(JAR_BASE)/org override_dh_auto_build: mkdir -p bin dist; \ javac -classpath $(CLASSPATH) -d bin $(shell find src -name *.java); \ - bnd buildx -output dist/bindex-$(VERSION).jar bindex.bnd; + bnd buildx -output dist/bindex-$(VERSION).jar bnd.bnd; override_dh_clean: rm -rf bin dist -- bindex packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] bindex packaging branch, master, updated. debian/2.2-3-9-gb4fcfa4
The following commit has been merged in the master branch: commit b4fcfa4b8e0af908832d1a09362fc498f539cb86 Author: Damien Raude-Morvan draz...@debian.org Date: Tue Nov 8 02:15:30 2011 +0100 Add d/patches/define_symbolic_name.diff. diff --git a/debian/changelog b/debian/changelog index 2f9191d..78565a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ bindex (2.2+svn101-1) unstable; urgency=low * New upsteam snapshot. * Drop d/patches/classpath.patch. + * Add d/patches/define_symbolic_name.diff. - -- Damien Raude-Morvan draz...@debian.org Tue, 08 Nov 2011 00:33:59 +0100 + -- Damien Raude-Morvan draz...@debian.org Tue, 08 Nov 2011 02:15:15 +0100 bindex (2.2-3) unstable; urgency=low diff --git a/debian/patches/define_symbolic_name.diff b/debian/patches/define_symbolic_name.diff new file mode 100644 index 000..805671d --- /dev/null +++ b/debian/patches/define_symbolic_name.diff @@ -0,0 +1,19 @@ +Index: b/bnd.bnd +=== +--- a/bnd.bnd b/bnd.bnd +@@ -8,6 +8,7 @@ + org.osgi.impl.bundle.obr + + Include-Resource: {LICENSE.txt},{about.html},{NOTICE.txt},{README} ++Bundle-SymbolicName: org.osgi.impl.bundle.bindex + Bundle-Version: 2.2 + Bundle-Vendor:OSGi Alliance + Bundle-Description: Provides a command line utility to index a set of bundles. This code can be run from the command line. +@@ -27,4 +28,4 @@ + Export-Package: org.osgi.service.bindex + Import-Package: org.apache.tools.ant;resolution:=optional,\ + org.apache.tools.ant.types;resolution:=optional,\ +- * +\ No newline at end of file ++ * diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..23cea52 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +define_symbolic_name.diff -- bindex packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits