[SCM] ini4j packaging branch, master, updated. debian/0.5.2-SNAPSHOT-1-2-gce3e285

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit ce3e285ed3c1a39a58de122372e8e6405d1fcbc5
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Sun Jun 17 11:45:58 2012 -0430

    Prepare 0.5.2-SNAPSHOT-2 upload
    
    * Bump Standards-Version to 3.9.3. No changes were required.
    * Fix bug with versionless jar symlink of libini4j-java. (Closes: #670671).

diff --git a/debian/changelog b/debian/changelog
index 5b57043..e56531f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
 ini4j (0.5.2-SNAPSHOT-2) UNRELEASED; urgency=low
 
+  * Team upload.
+
+  [ Andres Mejia ]
   * Update to my @debian.org email.
 
- -- Andres Mejia <amejia at debian.org>  Sun, 17 Jul 2011 13:48:16 -0400
+  [ Miguel Landaeta ]
+  * Bump Standards-Version to 3.9.3. No changes were required.
+  * Fix bug with versionless jar symlink of libini4j-java. (Closes: #670671).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sun, 17 Jun 2012 11:34:00 -0430
 
 ini4j (0.5.2-SNAPSHOT-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index db7f491..11d5263 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Marek Slama <marek.slama at sun.com>,
  Andres Mejia <amejia at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), javahelper, ant, ant-optional,
  default-jdk, libjetty-java, libservlet2.5-java, junit4, bsh, libeasymock-java
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Homepage: http://www.ini4j.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-java/ini4j.git
 Vcs-Git: git://git.debian.org/git/pkg-java/ini4j.git
diff --git a/debian/libini4j-java.jlibs b/debian/libini4j-java.jlibs
index 29e2cfc..88bd79a 100644
--- a/debian/libini4j-java.jlibs
+++ b/debian/libini4j-java.jlibs
@@ -1 +1 @@
-dist/ini4j-0.5.2-SNAPSHOT.jar
+#dist/ini4j-0.5.2-SNAPSHOT.jar
diff --git a/debian/rules b/debian/rules
index e9bcc95..8be0cf5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@ DEB_ANT_BUILDFILE = ./debian/build.xml
 DEB_ANT_BUILD_TARGET = build javadoc
 DEB_ANT_ARGS = -Dbuild.sysclasspath=first \
 	-Dbuild.servlet.jar=/usr/share/java/servlet-api-2.5.jar
+VERSION = $(shell dpkg-parsechangelog | grep ^Version: | cut -f2 -d' ' \
+	| sed -r 's/^(.*)-.*$$/\1/')
 
 JARS = /usr/share/java/jetty.jar
 JARS := $(JARS):/usr/share/java/servlet-api-2.5.jar
@@ -24,6 +26,9 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	ant $(DEB_ANT_ARGS) -f $(DEB_ANT_BUILDFILE) clean
 
+override_jh_installlibs:
+	jh_installlibs --upstream-version=$(VERSION) dist/ini4j-*.jar
+
 get-orig-source:
 # Use external script
 	$(dir $_)ini4j-get-orig-source --remove-upstream-tarball

-- 
ini4j packaging