[libjnr-posix-java] 02/02: Update packaging for new upstream version
Tim Potter
tpot-guest at moszumanska.debian.org
Tue Apr 7 04:06:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
tpot-guest pushed a commit to branch master
in repository libjnr-posix-java.
commit 09231c41c150fe4c07cf95dad71da585185ddc59
Author: Tim Potter <tpot at hp.com>
Date: Tue Apr 7 13:58:10 2015 +1000
Update packaging for new upstream version
---
debian/changelog | 9 +++++
debian/control | 39 +++++++-------------
debian/libjnr-posix-java-doc.javadoc | 1 +
debian/libjnr-posix-java.poms | 28 +++++++++++++++
debian/maven.ignoreRules | 2 ++
debian/maven.rules | 4 +++
debian/patches/pom.diff | 58 ------------------------------
debian/patches/series | 1 -
debian/rules | 70 +++---------------------------------
9 files changed, 61 insertions(+), 151 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9a741d9..d67c55f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jnr-posix (3.0.10-1) experimental; urgency=low
+
+ [ Tim Potter ]
+ * New upstream version.
+ * Update packaging to use maven-debian-helper.
+ * Rename source package to be consistent with other jnr packages.
+
+ -- Tim Potter <tpot at hp.com> Tue, 07 Apr 2015 13:21:36 +1000
+
libjnr-posix-java (1.1.8-2) unstable; urgency=low
[ Jakub Adam ]
diff --git a/debian/control b/debian/control
index 4bdae0a..a208670 100644
--- a/debian/control
+++ b/debian/control
@@ -1,34 +1,22 @@
-Source: libjnr-posix-java
+Source: jnr-posix
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Damien Raude-Morvan <drazzib at debian.org>,
- Jakub Adam <jakub.adam at ktknet.cz>
-Build-Depends: debhelper (>> 7.0.0),
- libmaven-clean-plugin-java,
- maven-debian-helper,
- maven2
-Build-Depends-Indep: bnd,
- default-jdk,
- libconstantine-java (>= 0.7-3),
- libjaffl-java (>= 0.5.9),
- libmaven-compiler-plugin-java,
- libmaven-jar-plugin-java,
- libmaven-javadoc-plugin-java,
- libmaven-resources-plugin-java,
- libmaven-site-plugin-java,
- libsurefire-java,
- maven-repo-helper
-Standards-Version: 3.9.4
-Homepage: https://github.com/wmeissner/jnr-posix
-Vcs-Git: git://anonscm.debian.org/pkg-java/libjnr-posix-java.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/libjnr-posix-java.git
+ Jakub Adam <jakub.adam at ktknet.cz>,
+ Tim Potter <tpot at hp.com>
+Build-Depends: debhelper (>= 9), default-jdk, javahelper, maven-debian-helper, libmaven-javadoc-plugin-java, libjnr-ffi-java, libjnr-constants-java
+Standards-Version: 3.9.6
+Homepage: https://github.com/jnr/jnr-posix
+Vcs-Git: git://anonscm.debian.org/pkg-java/jnr-posix.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jnr-posix.git
Package: libjnr-posix-java
Architecture: all
-Depends: libconstantine-java (>= 0.7-3),
+Depends: libjnr-constants-java,
libjaffl-java (>= 0.5.9),
- ${misc:Depends}
+ ${maven:Depends}, ${misc:Depends}
+Suggests: libjnr-posix-java-doc, ${maven:OptionalDepends}
Description: basic POSIX-like functions for Java
This package is a Java library providing access to various
POSIX functions like chmod(2), link(2) or getuid(2) through
@@ -37,9 +25,8 @@ Description: basic POSIX-like functions for Java
Package: libjnr-posix-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}
-Recommends: w3m | www-browser
-Suggests: libjnr-posix-java
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Suggests: libjnr-posix-java, ${maven:DocOptionalDepends}
Description: Java JNR-POSIX library API documentation
This package includes the development documentation for the
JNR-POSIX library which provides access to various POSIX
diff --git a/debian/libjnr-posix-java-doc.javadoc b/debian/libjnr-posix-java-doc.javadoc
new file mode 100644
index 0000000..f84f876
--- /dev/null
+++ b/debian/libjnr-posix-java-doc.javadoc
@@ -0,0 +1 @@
+target/site/apidocs usr/share/doc/libjnr-posix-java/api
diff --git a/debian/libjnr-posix-java.poms b/debian/libjnr-posix-java.poms
new file mode 100644
index 0000000..64b1188
--- /dev/null
+++ b/debian/libjnr-posix-java.poms
@@ -0,0 +1,28 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --no-parent --has-package-version --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..7c3e90e
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,2 @@
+
+org.apache.maven.wagon wagon-webdav-jackrabbit * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..d2c588c
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,4 @@
+
+junit junit jar s/.*/4.x/ * *
+junit junit jar s/4\..*/4.x/ * *
+s/org.jruby.extras/com.github.jnr/ s/constantine/jnr-constants/ * * * *
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
deleted file mode 100644
index 766a365..0000000
--- a/debian/patches/pom.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: remove invalid dependencies and fix
- Javadoc to use UTF8
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-08-29
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -89,32 +89,24 @@
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
-- <version>4.7</version>
-+ <version>4.x</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jruby.extras</groupId>
- <artifactId>jaffl</artifactId>
-- <version>0.5.9</version>
-- <scope>provided</scope>
-+ <version>debian</version>
- </dependency>
- <dependency>
- <groupId>org.jruby.extras</groupId>
- <artifactId>constantine</artifactId>
-- <version>0.7</version>
-- <scope>provided</scope>
-+ <version>debian</version>
- </dependency>
- </dependencies>
-
- <build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
-- <extensions>
-- <extension>
-- <groupId>org.apache.maven.wagon</groupId>
-- <artifactId>wagon-webdav</artifactId>
-- </extension>
-- </extensions>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
-@@ -131,6 +123,13 @@
- </archive>
- </configuration>
- </plugin>
-+ <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-javadoc-plugin</artifactId>
-+ <configuration>
-+ <encoding>UTF-8</encoding>
-+ </configuration>
-+ </plugin>
- </plugins>
- </build>
- </project>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7740e23..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-pom.diff
diff --git a/debian/rules b/debian/rules
index 4ffef82..027d7eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,69 +1,7 @@
#!/usr/bin/make -f
-# FIXME: support of DEB_BUILD_OPTIONS nocheck and nostrip
+export JAVA_HOME=/usr/lib/jvm/default-java
+export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
-JAVA_DIR = usr/share/java
-DOC_DIR = usr/share/doc/libjnr-posix-java-doc
-PKG_BUILDDIR = debian/libjnr-posix-java
-PKG_DOC_BUILDDIR = debian/libjnr-posix-java-doc
-M2_HOME = /usr/share/maven2/
-MVN = $(M2_HOME)/bin/mvn -o -s /etc/maven2/settings-debian.xml
-
-
-build-indep: build-stamp
-build-stamp:
- dh_testdir
-
- $(MVN) verify
- $(MVN) javadoc:javadoc
-
- # Generate OSGi metadata
- bnd wrap -properties debian/jnr-posix.bnd -output target/jnr-posix-*.jar target/jnr-posix-*.jar
-
- touch build-stamp
-
-build-arch:
-
-build: build-arch build-indep
-
-clean:
- dh_testdir
- dh_testroot
-
- rm -f build-stamp
- $(MVN) clean
- mh_clean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
-
- dh_installdirs -p libjnr-posix-java $(JAVA_DIR)
-
- mh_installjar -plibjnr-posix-java --java-lib --usj-name=jnr-posix pom.xml target/jnr-posix-1.1.8.jar
- mh_installpom -plibjnr-posix-java pom.xml
-
- dh_installdirs -p libjnr-posix-java-doc $(DOC_DIR)
- mv target/site/apidocs $(PKG_DOC_BUILDDIR)/$(DOC_DIR)/javadoc
-
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs --indep
- dh_installdocs --indep
- dh_compress --indep
- dh_fixperms --indep
- dh_installdeb --indep
- dh_gencontrol --indep
- dh_md5sums --indep
- dh_builddeb --indep
-
-binary-arch:
-
-binary: binary-indep binary-arch
-
-
-.PHONY: build install clean binary-indep binary
+%:
+ dh $@ --buildsystem=maven --with javahelper
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjnr-posix-java.git
More information about the pkg-java-commits
mailing list