[bindex] 01/02: Imported Debian patch 2.2+svn101-2

Fri Nov 13 22:21:12 UTC 2015

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

apo-guest pushed a commit to branch master
in repository bindex.

commit 3419081180a179738b0e4685dacd6de1257d322f
Author: Markus Koschany <apo at debian.org>
Date:   Fri Nov 13 23:07:22 2015 +0100

    Imported Debian patch 2.2+svn101-2
---
 .gitignore                    |  1 -
 debian/changelog              | 14 ++++++++++++++
 debian/compat                 |  2 +-
 debian/control                | 35 ++++++++++++++++++++---------------
 debian/copyright              |  6 +++---
 debian/libbindex-java.install |  1 -
 debian/libbindex-java.links   |  1 -
 debian/rules                  |  4 ++--
 8 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 845ca06..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.pc
diff --git a/debian/changelog b/debian/changelog
index 78565a5..15ea08c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+bindex (2.2+svn101-2) unstable; urgency=medium
+
+  * Team upload.
+  * Use compat level 9 and require debheler >= 9.
+  * Declare compliance with Debian Policy 3.9.6.
+  * wrap-and-sort -sa.
+  * Remove Andres Mejia from Uploaders. He is MIA. (Closes: #743517)
+  * Remove Yulia Novozhilova from Uploaders. She is also MIA.
+  * Use canonical Vcs-URI.
+  * Switch to bnd1.50 because bindex FTBFS with bnd >= 2.1.
+  * Fix Lintian warning syntax-error-dep5-copyright.
+
+ -- Markus Koschany <apo at debian.org>  Fri, 13 Nov 2015 23:07:22 +0100
+
 bindex (2.2+svn101-1) unstable; urgency=low
 
   * New upsteam snapshot.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index c6b479f..5a4ca27 100644
--- a/debian/control
+++ b/debian/control
@@ -2,25 +2,30 @@ Source: bindex
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Yulia Novozhilova <Yulia.Novozhilova at sun.com>,
-           Andres Mejia <amejia at debian.org>,
-           Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper
-Build-Depends-Indep: ant,
-                     bnd (>= 1.44.0),
-                     junit4,
-                     libfelix-osgi-obr-java,
-                     libkxml2-java,
-                     libosgi-core-java,
-                     libxpp3-java
-Standards-Version: 3.9.2
+Uploaders:
+ Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends:
+ debhelper (>= 9),
+ default-jdk,
+ javahelper
+Build-Depends-Indep:
+ ant,
+ bnd1.50,
+ junit4,
+ libfelix-osgi-obr-java,
+ libkxml2-java,
+ libosgi-core-java,
+ libxpp3-java
+Standards-Version: 3.9.6
 Homepage: http://www.osgi.org/Repository/BIndex
-Vcs-Git: git://git.debian.org/git/pkg-java/bindex.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/bindex.git
+Vcs-Git: git://anonscm.debian.org/pkg-java/bindex.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/bindex.git
 
 Package: libbindex-java
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
+Depends:
+ ${java:Depends},
+ ${misc:Depends}
 Description: OSGi BIndex reader
  BIndex is a small Java progam that implements the manifest header to repository
  format mapping as described in RFC-0112 Bundle Repository. BIndex can recurse
diff --git a/debian/copyright b/debian/copyright
index 838ded4..742805a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: bindex
 Source: http://www.osgi.org/Repository/BIndex
 
 Files: *
-Copyright: Copyright (c) OSGi Alliance (2002, 2006, 2007). All Rights Reserved.
-Copyright: (C) 2000 Gatespace AB. All Rights Reserved.
+Copyright: OSGi Alliance (2002, 2006, 2007). All Rights Reserved.
+           2000 Gatespace AB. All Rights Reserved.
 License: Apache-2.0
 
 
diff --git a/debian/libbindex-java.install b/debian/libbindex-java.install
index 84008c5..001f485 100644
--- a/debian/libbindex-java.install
+++ b/debian/libbindex-java.install
@@ -1,2 +1 @@
 dist/bindex-2.2.jar usr/share/java/
-
diff --git a/debian/libbindex-java.links b/debian/libbindex-java.links
index ed3c2fe..3bae878 100644
--- a/debian/libbindex-java.links
+++ b/debian/libbindex-java.links
@@ -1,2 +1 @@
 /usr/share/java/bindex-2.2.jar	/usr/share/java/bindex.jar
-
diff --git a/debian/rules b/debian/rules
index 3b615d6..a6bc340 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/-[^-]*$$//' | 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
+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-1.50.0.jar
 
 %:
 	dh $@ --with javahelper
@@ -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 bnd.bnd;
+	bnd-1.50 buildx -output dist/bindex-$(VERSION).jar bnd.bnd;
 
 override_dh_clean:
 	rm -rf bin dist

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

