This is an automated email from the git hooks/post-receive script. tpot-guest pushed a commit to branch master in repository jnr-posix.
commit d25d55e55aae8b6b96597a853271986e81842550 Author: Damien Raude-Morvan <[email protected]> Date: Tue Aug 28 00:16:33 2012 +0200 Team upload. --- .gitignore | 1 + .topdeps | 1 - .topmsg | 6 ----- debian/changelog | 13 +++++++++++ debian/control | 27 +++++++++++++++-------- debian/copyright | 18 +++++++-------- debian/patches/pom.diff | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 9 ++++---- debian/source/format | 2 +- pom.xml | 18 +++++++-------- 11 files changed, 114 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index b616b77..9f92bbd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ build dist target lib/nblibraries-private.properties +.pc diff --git a/.topdeps b/.topdeps deleted file mode 100644 index 0459513..0000000 --- a/.topdeps +++ /dev/null @@ -1 +0,0 @@ -upstream diff --git a/.topmsg b/.topmsg deleted file mode 100644 index d279656..0000000 --- a/.topmsg +++ /dev/null @@ -1,6 +0,0 @@ -From: Nicolas Duboc <[email protected]> -Subject: [PATCH] master - -Debian directory. - -Signed-off-by: Nicolas Duboc <[email protected]> diff --git a/debian/changelog b/debian/changelog index 51cb87d..f7f8810 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +libjnr-posix-java (1.1.8-1) UNRELEASED; urgency=low + + * Team upload. + * d/control: Use versionned B-D on libjaffl-java (>= 0.5.9), otherwise FTBFS. + * d/control: As per Java Policy, drop runtime dependency as + its a library package. + * d/rules: Force usage of offline Maven 2. + * d/patches/pom.diff: remove invalid dependencies from pom.xml. + * Switch to 3.0 source format. + * d/control: Bump Standards-Version to 3.9.3, no changes needed. + + -- Damien Raude-Morvan <[email protected]> Sun, 19 Aug 2012 01:49:58 +0200 + libjnr-posix-java (1.1.4~git1.8aa26268b-1) unstable; urgency=low * This package is a fork of the Debian libjna-posix-java package for diff --git a/debian/control b/debian/control index 3ce003b..39a4dcc 100644 --- a/debian/control +++ b/debian/control @@ -2,19 +2,28 @@ Source: libjnr-posix-java Section: java Priority: optional Maintainer: Nicolas Duboc <[email protected]> -Build-Depends: debhelper (>> 7.0.0), maven2, maven-debian-helper, - libmaven-clean-plugin-java -Build-Depends-Indep: default-jdk, maven-repo-helper, libmaven-resources-plugin-java, - libmaven-compiler-plugin-java, libmaven-jar-plugin-java, libmaven-site-plugin-java, - libsurefire-java, libmaven-javadoc-plugin-java, - libjaffl-java, libconstantine-java (>= 0.7-3) -Standards-Version: 3.9.2 +Build-Depends: debhelper (>> 7.0.0), + libmaven-clean-plugin-java, + maven-debian-helper, + maven2 +Build-Depends-Indep: 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.3 Homepage: https://github.com/wmeissner/jnr-posix Package: libjnr-posix-java Architecture: all -Section: java -Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, libjaffl-java, libconstantine-java (>= 0.7-3) +Depends: libconstantine-java (>= 0.7-3), + libjaffl-java (>= 0.5.9), + ${misc:Depends} 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 diff --git a/debian/copyright b/debian/copyright index 6aa75db..d35bef8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -44,7 +44,7 @@ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICEN ii) additions to the Program; - where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of th [...] + where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of th [...] "Contributor" means any person or entity that distributes the Program. @@ -58,11 +58,11 @@ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICEN a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. - b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contr [...] + b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contr [...] c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses grante [...] - d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. + d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 3. REQUIREMENTS @@ -72,19 +72,19 @@ A Contributor may choose to distribute the Program in object code form under its b) its license agreement: - i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; + i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; - ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; + ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and - iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. + iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. When the Program is made available in source code form: - a) it must be made available under this Agreement; and + a) it must be made available under this Agreement; and - b) a copy of this Agreement must be included with each copy of the Program. + b) a copy of this Agreement must be included with each copy of the Program. Contributors may not remove or alter any copyright notices contained within the Program. @@ -114,7 +114,7 @@ All Recipient's rights under this Agreement shall terminate if it fails to compl Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Stew [...] -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. +This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. === License for the Debian packaging (debian/* files in the Debian source package): diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff new file mode 100644 index 0000000..766a365 --- /dev/null +++ b/debian/patches/pom.diff @@ -0,0 +1,58 @@ +Description: remove invalid dependencies and fix + Javadoc to use UTF8 +Author: Damien Raude-Morvan <[email protected]> +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 new file mode 100644 index 0000000..7740e23 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +pom.diff diff --git a/debian/rules b/debian/rules index e4b0545..a39b7b4 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,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 - -MVN = mvn -s /etc/maven2/settings-debian.xml +M2_HOME = /usr/share/maven2/ +MVN = $(M2_HOME)/bin/mvn -o -s /etc/maven2/settings-debian.xml build: build-stamp @@ -24,8 +24,7 @@ clean: rm -f build-stamp $(MVN) clean - rm -rf debian/.mh/ - + mh_clean dh_clean install: build @@ -35,7 +34,7 @@ install: build 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.4.jar + 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) diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) diff --git a/pom.xml b/pom.xml index 016c609..04045cd 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.x</version> + <version>4.7</version> <scope>test</scope> </dependency> <dependency> @@ -101,13 +101,20 @@ <dependency> <groupId>org.jruby.extras</groupId> <artifactId>constantine</artifactId> - <version>debian</version> + <version>0.7</version> + <scope>provided</scope> </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> @@ -124,13 +131,6 @@ </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> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jnr-posix.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
