This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch master in repository nailgun.
commit babed2ce7268cd929e013c790572160a6f2bacfb Author: Miguel Landaeta <[email protected]> Date: Fri Feb 13 00:55:22 2015 -0300 Prepare 0.9.1-1 upload --- debian/changelog | 23 +++++++-- debian/control | 17 +++++-- debian/copyright | 2 +- debian/nailgun.links | 1 - debian/nailgun.poms | 1 + debian/patches/adjust_maven_plugins_versions.patch | 56 ++++++++++++++++++++++ debian/patches/remove_parent_from_main_pom.patch | 20 ++++++++ debian/patches/series | 2 + debian/rules | 11 ++++- debian/watch | 3 +- 10 files changed, 124 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index aad32d1..2e17567 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,33 @@ -nailgun (0.9.1-1) UNRELEASED; urgency=low +nailgun (0.9.1-1) UNRELEASED; urgency=medium + [ Hideki Yamane ] + * Team upload. * New upstream release * debian/patches - drop 0001-update-build.xml-for-cobertura.patch and 0002-update-build.xml-disable-junitreport.patch. Since upstream dropped build.xml - - refresh Makefile_enable_hardening.patch and name_define_as_ng-nailgun_ng.c.patch + - refresh patches: + + Makefile_enable_hardening.patch + + name_define_as_ng-nailgun_ng.c.patch - add disable_install_target.patch * add debian/install * improve debian/control via mh_make * enable maven build in debian/rules - * update debian/watch, Thanks to Bart Martens <[email protected]> - -- Hideki Yamane <[email protected]> Tue, 11 Jun 2013 17:38:42 +0900 + [ Miguel Landaeta ] + * Update debian/watch. + * Provide maven artifacts. (Closes: #776087). + - Introduce 2 new patches: + + debian/patches/adjust_maven_plugins_versions.patch + + debian/patches/remove_parent_from_main_pom.patch + - Add B-D on libmaven-source-plugin-java and libmaven-install-plugin-java. + * Wrap and sort dependencies lists. + * Bump Standards-Version to 3.9.6. No changes were required. + * Update dates in d/copyright. + * Fix clean target in d/rules to allow twice in row builds. + + -- Miguel Landaeta <[email protected]> Thu, 12 Feb 2015 23:06:03 -0300 nailgun (0.9.0+trunk95-3) unstable; urgency=low diff --git a/debian/control b/debian/control index e3ec01e..bb00cd7 100644 --- a/debian/control +++ b/debian/control @@ -4,16 +4,25 @@ Priority: extra Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Hideki Yamane <[email protected]>, Torsten Werner <[email protected]> -Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5), -Build-Depends-Indep: default-jdk-doc, libmaven-javadoc-plugin-java -Standards-Version: 3.9.4 +Build-Depends: + debhelper (>= 9), + default-jdk, + maven-debian-helper (>= 1.5), + maven-repo-helper, + default-jdk-doc, + libmaven-javadoc-plugin-java, + libmaven-source-plugin-java, + libmaven-install-plugin-java +Standards-Version: 3.9.6 Homepage: http://martiansoftware.com/nailgun/ Vcs-Git: git://anonscm.debian.org/pkg-java/nailgun.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/nailgun.git Package: nailgun Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends} Description: client, protocol, and server for running Java programs from CLI Nailgun is a client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead. Programs run diff --git a/debian/copyright b/debian/copyright index 74e7213..3b71e76 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: Martian Software, Inc Source: http://sourceforge.net/projects/nailgun/files/nailgun/ Files: * -Copyright: 2004, Martian Software, Inc +Copyright: 2004-2012, Martian Software, Inc License: Apache-2 On Debian systems, the full text of the Apache License version 2.0 can be found in the file `/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/nailgun.links b/debian/nailgun.links deleted file mode 100644 index ab59ca3..0000000 --- a/debian/nailgun.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/java/nailgun-0.9.0.jar usr/share/java/nailgun.jar diff --git a/debian/nailgun.poms b/debian/nailgun.poms new file mode 100644 index 0000000..f658e8d --- /dev/null +++ b/debian/nailgun.poms @@ -0,0 +1 @@ +./nailgun-server/pom.xml --no-parent diff --git a/debian/patches/adjust_maven_plugins_versions.patch b/debian/patches/adjust_maven_plugins_versions.patch new file mode 100644 index 0000000..9689057 --- /dev/null +++ b/debian/patches/adjust_maven_plugins_versions.patch @@ -0,0 +1,56 @@ +Description: Adjust maven plugins versions to what is available in Debian +Author: Miguel Landaeta <[email protected]> +Forwarded: no +Last-Update: 2015-02-12 + +--- nailgun-0.9.1.orig/pom.xml ++++ nailgun-0.9.1/pom.xml +@@ -55,7 +55,7 @@ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> +- <version>3.0</version> ++ <version>2.5.1</version> + <configuration> + <source>1.4</source> + <target>1.4</target> +@@ -77,7 +77,7 @@ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> +- <version>2.9</version> ++ <version>2.9.1</version> + <executions> + <execution> + <id>attach-javadocs</id> +@@ -87,6 +87,7 @@ + </execution> + </executions> + </plugin> ++ <!-- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> +@@ -95,6 +96,7 @@ + <arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments> + </configuration> + </plugin> ++ --> + </plugins> + </build> + +@@ -111,6 +113,7 @@ + </repository> + </distributionManagement> + ++ <!-- + <profiles> + <profile> + <id>release-sign-artifacts</id> +@@ -143,5 +146,6 @@ + </build> + </profile> + </profiles> ++ --> + + </project> diff --git a/debian/patches/remove_parent_from_main_pom.patch b/debian/patches/remove_parent_from_main_pom.patch new file mode 100644 index 0000000..910eb86 --- /dev/null +++ b/debian/patches/remove_parent_from_main_pom.patch @@ -0,0 +1,20 @@ +Description: Remove reference to parent artifact +Author: Miguel Landaeta <[email protected]> +Forwarded: no +Last-Update: 2015-02-12 + +--- nailgun-0.9.1.orig/pom.xml ++++ nailgun-0.9.1/pom.xml +@@ -2,12 +2,6 @@ + <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + +- <parent> +- <groupId>org.sonatype.oss</groupId> +- <artifactId>oss-parent</artifactId> +- <version>7</version> +- </parent> +- + <groupId>com.martiansoftware</groupId> + <artifactId>nailgun-all</artifactId> + <version>0.9.1</version> diff --git a/debian/patches/series b/debian/patches/series index afe6f5c..91c3d1e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,5 @@ name_define_as_ng-nailgun_ng.c.patch Makefile_enable_hardening.patch disable_install_target.patch +remove_parent_from_main_pom.patch +adjust_maven_plugins_versions.patch diff --git a/debian/rules b/debian/rules index 2663041..74700c3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,6 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +include /usr/share/dpkg/default.mk export DEB_BUILD_MAINT_OPTIONS := hardening=+all export ANT="ant -propertyfile $(CURDIR)/debian/ant.properties" @@ -10,11 +11,19 @@ export ANT="ant -propertyfile $(CURDIR)/debian/ant.properties" override_dh_auto_build: dh_auto_build cp $(CURDIR)/ng $(CURDIR)/ng-nailgun - mvn clean install -o + mvn-debian clean install -o + +override_dh_auto_install: + dh_auto_install + mh_installjar -pnailgun --java-lib ./nailgun-server/pom.xml \ + ./nailgun-server/target/nailgun-server-$(DEB_VERSION_UPSTREAM).jar + mh_installpoms -pnailgun override_dh_auto_clean: -dh_auto_clean -rm $(CURDIR)/ng-nailgun + mh_clean + -find $(CURDIR) -type d -name target -exec rm -rf {} \; 2>/dev/null get-orig-source: uscan --force-download --rename diff --git a/debian/watch b/debian/watch index 661963e..f777fbf 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -https://github.com/martylamb/nailgun/tags .*/nailgun-all-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) +https://github.com/martylamb/nailgun/releases \ + /martylamb/nailgun/archive/nailgun-all-([0-9]+.*)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/nailgun.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
