[SCM] bindex packaging branch, master, updated. debian/2.2-1-4-gac572f1

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit ac572f1905dd6571128cebee1b8e3bde181b1339
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Tue Oct 11 22:39:09 2011 +0200

    Build-Depends on libosgi-core-java instead of libequinox-osgi-java.
    
    * Add myself to Uploaders.
    * Bump to Standards-Version 3.9.2: no changes needed.
    * Build-Depends on libosgi-core-java instead of libequinox-osgi-java.

diff --git a/debian/changelog b/debian/changelog
index 95850c7..ab2d4a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,17 @@
-bindex (2.2-2) UNRELEASED; urgency=low
+bindex (2.2-2) unstable; urgency=low
+
+  [ Andres Mejia ]
+  * Update to my @debian.org email.
 
   [ Damien Raude-Morvan ]
   * d/copyright: Add copyright assignment to "Gatespace AB" following
     Ansgar Burchardt comment.
+  * Add myself to Uploaders.
+  * Bump to Standards-Version 3.9.2: no changes needed.
+  * Build-Depends on libosgi-core-java instead of libequinox-osgi-java.
+  * Small fixes to package's description.
 
-  [ Andres Mejia ]
-  * Update to my @debian.org email.
-
- -- Andres Mejia <amejia at debian.org>  Sun, 17 Jul 2011 13:06:50 -0400
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 11 Oct 2011 22:43:47 +0200
 
 bindex (2.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c54ce32..13cc072 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,26 @@ 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>
-Build-Depends: debhelper (>= 7.0.50~), javahelper, default-jdk
-Build-Depends-Indep: ant, bnd, libxpp3-java, libkxml2-java, libfelix-osgi-obr-java, libequinox-osgi-java, junit4
-Standards-Version: 3.9.1
+           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,
+                     junit4,
+                     libfelix-osgi-obr-java,
+                     libkxml2-java,
+                     libosgi-core-java,
+                     libxpp3-java
+Standards-Version: 3.9.2
 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
 
 Package: libbindex-java
 Architecture: all
-Depends: ${misc:Depends}, ${java:Depends}
-Description: The BIndex program 
- Is a small Java progam that implements the manifest header to repository
+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
  over a directory structure and just creates a repository.xml file.
  The URLs can be rewritten using a template.
diff --git a/debian/copyright b/debian/copyright
index f5b4d22..838ded4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,10 +14,9 @@ License: GPL-2
 
 
 License: Apache-2.0
- On Debian systems, the complete text of the Apache License Version 2.0, 
+ On Debian systems, the complete text of the Apache License Version 2.0,
  can be found in /usr/share/common-licenses/Apache-2.0.
 
 License: GPL-2
  On Debian systems, the complete text of the GNU General Public
  License, version 2, can be found in /usr/share/common-licenses/GPL-2.
-
diff --git a/debian/libbindex-java.install b/debian/libbindex-java.install
index 0bf31da..3d76e59 100644
--- a/debian/libbindex-java.install
+++ b/debian/libbindex-java.install
@@ -1,2 +1,2 @@
-bindex-2.2.jar usr/share/java/
 
+bindex-2.2.jar usr/share/java/
diff --git a/debian/patches/classpath.patch b/debian/patches/classpath.patch
index 1463045..ccb73d3 100644
--- a/debian/patches/classpath.patch
+++ b/debian/patches/classpath.patch
@@ -1,7 +1,7 @@
-Index: bindex-2.2/.classpath
+Index: b/.classpath
 ===================================================================
---- bindex-2.2.orig/.classpath	2010-07-28 16:29:41.000000000 +0400
-+++ bindex-2.2/.classpath	2010-08-02 20:20:07.000000000 +0400
+--- a/.classpath
++++ b/.classpath
 @@ -2,9 +2,10 @@
  <classpath>
  	<classpathentry kind="src" path="src"/>
@@ -13,6 +13,6 @@ Index: bindex-2.2/.classpath
  	<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/org.eclipse.osgi.jar"/>
++	<classpathentry kind="lib" path="/usr/share/java/osgi.core.jar"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>
diff --git a/debian/rules b/debian/rules
index d7894eb..46ad7df 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)/org.eclipse.osgi.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
 
 %:
 	dh $@ --with javahelper

-- 
bindex packaging