[trove3] 25/33: Add pom, for local maven-repo
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Apr 18 17:19:04 BST 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository trove3.
commit 883f0d9923c5a71f7a0c89cbc21f6beaaddf439f
Author: Erich Schubert <erich at debian.org>
Date: Fri May 1 14:46:40 2015 +0000
Add pom, for local maven-repo
---
debian/changelog | 14 ++++++++++
debian/compat | 2 +-
debian/control | 8 +++---
debian/patches/01_build_target_5_0.patch | 22 +++++++++++++--
debian/patches/add-maven-pom.patch | 46 ++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/poms/trove4j-3.0.3.pom | 41 ++++++++++++++++++++++++++++
debian/rules | 37 ++++++++++++++++---------
8 files changed, 151 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b71cad1..f1d0e6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+trove3 (3.0.3-2) unstable; urgency=low
+
+ * Bump to policy version 3.9.6 (no changes)
+ * Do not include user name in Manifest, to make build easier to
+ reproduce (via reproducible.debian.net)
+ * Switch build system to DH7 + javahelper instead of CDBS
+ * Install a pom file into /usr/share/maven-repo to allow secure builds
+ using maven in offline mode.
+ * Jars were renamed to trove4j due to compatibility with maven,
+ install legacy symlinks named trove-3.jar and trove-3.0.3.jar
+ (Used inconsistenly by upstream, too.)
+
+ -- Erich Schubert <erich at debian.org> Fri, 01 May 2015 14:19:01 +0200
+
trove3 (3.0.3-1) unstable; urgency=low
* New upstream bug fix release.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index c2fe2e3..c2753ce 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Erich Schubert <erich at debian.org>, Torsten Werner <twerner at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant
-Standards-Version: 3.9.3
-Homepage: http://trove4j.sourceforge.net
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/trove3
+Build-Depends: debhelper (>= 9), javahelper, default-jdk, ant, maven-repo-helper
+Standards-Version: 3.9.6
+Homepage: http://trove4j.sourceforge.net/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/trove3
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/trove3/
Package: libtrove3-java
diff --git a/debian/patches/01_build_target_5_0.patch b/debian/patches/01_build_target_5_0.patch
index ac08655..2f42a38 100644
--- a/debian/patches/01_build_target_5_0.patch
+++ b/debian/patches/01_build_target_5_0.patch
@@ -1,5 +1,7 @@
---- trove3-3.0.2.orig/build.xml 2012-05-03 06:57:06.000000000 +0200
-+++ trove3-3.0.2/build.xml 2012-05-03 06:59:01.000000000 +0200
+Index: trove-3.0.3/build.xml
+===================================================================
+--- trove-3.0.3.orig/build.xml
++++ trove-3.0.3/build.xml
@@ -109,7 +109,7 @@
<target name="compile" depends="generate">
<javac destdir="${output.dest}"
@@ -9,6 +11,15 @@
<src path="${src}"/>
<src path="${output.generated}"/>
+@@ -128,7 +128,7 @@
+ <exclude name="gnu/trove/generate/**"/>
+ </fileset>
+ <manifest>
+- <attribute name="Built-By" value="${user.name}"/>
++ <attribute name="Built-By" value="Debian GNU/Linux"/>
+ <attribute name="Implementation-Title" value="${Name}"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-URL" value="http://trove4j.sourceforge.net/"/>
@@ -348,7 +348,7 @@
<!-- =================================================================== -->
@@ -18,3 +29,10 @@
<src path="${test_src}"/>
<exclude name="gnu/trove/benchmark/colt/**"/>
<exclude name="gnu/trove/benchmark/trove2/**"/>
+@@ -442,4 +442,4 @@
+ <format property="fullVersion" pattern="'build time' yyMMddHHmmss"/>
+ </tstamp>
+ </target>
+-</project>
+\ No newline at end of file
++</project>
diff --git a/debian/patches/add-maven-pom.patch b/debian/patches/add-maven-pom.patch
new file mode 100644
index 0000000..b443ec9
--- /dev/null
+++ b/debian/patches/add-maven-pom.patch
@@ -0,0 +1,46 @@
+Index: trove-3.0.3/resources/maven-manual-deploy-pom.xml
+===================================================================
+--- /dev/null
++++ trove-3.0.3/resources/maven-manual-deploy-pom.xml
+@@ -0,0 +1,41 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<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>
++ <groupId>net.sf.trove4j</groupId>
++ <artifactId>trove4j</artifactId>
++ <version>###VERSION###</version>
++ <packaging>jar</packaging>
++ <name>GNU Trove</name>
++ <description>The Trove library provides high speed regular and primitive
++ collections for Java.
++ </description>
++ <url>http://trove4j.sf.net</url>
++ <licenses>
++ <license>
++ <name>GNU Lesser General Public License 2.1</name>
++ <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
++ <distribution>repo</distribution>
++ </license>
++ </licenses>
++ <scm>
++ <connection>scm:svn:https://trove4j.svn.sourceforge.net/svnroot/trove4j</connection>
++ <url>https://trove4j.svn.sourceforge.net/svnroot/trove4j</url>
++ </scm>
++ <developers>
++ <developer>
++ <name>Rob Eden</name>
++ </developer>
++ <developer>
++ <name>Jeff Randall</name>
++ </developer>
++ <developer>
++ <name>Johan Parent</name>
++ </developer>
++ <developer>
++ <name>Eric D. Friedman</name>
++ </developer>
++ </developers>
++</project>
diff --git a/debian/patches/series b/debian/patches/series
index 2ff4c99..387e6e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_build_target_5_0.patch
+add-maven-pom.patch
diff --git a/debian/poms/trove4j-3.0.3.pom b/debian/poms/trove4j-3.0.3.pom
new file mode 100644
index 0000000..d0be2df
--- /dev/null
+++ b/debian/poms/trove4j-3.0.3.pom
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <groupId>net.sf.trove4j</groupId>
+ <artifactId>trove4j</artifactId>
+ <version>3.0.3</version>
+ <packaging>jar</packaging>
+ <name>GNU Trove</name>
+ <description>The Trove library provides high speed regular and primitive
+ collections for Java.
+ </description>
+ <url>http://trove4j.sf.net</url>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License 2.1</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:https://trove4j.svn.sourceforge.net/svnroot/trove4j</connection>
+ <url>https://trove4j.svn.sourceforge.net/svnroot/trove4j</url>
+ </scm>
+ <developers>
+ <developer>
+ <name>Rob Eden</name>
+ </developer>
+ <developer>
+ <name>Jeff Randall</name>
+ </developer>
+ <developer>
+ <name>Johan Parent</name>
+ </developer>
+ <developer>
+ <name>Eric D. Friedman</name>
+ </developer>
+ </developers>
+</project>
diff --git a/debian/rules b/debian/rules
index df9ca9b..a5797cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,37 @@
#!/usr/bin/make -f
-# debian/rules file for trove (uses cdbs)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+# debian/rules file for trove, using debhelper and javahelper
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := jar javadoc
-ANT_ARGS := -Dversion.number=$(DEB_UPSTREAM_VERSION)
+DEB_UPSTREAM_VERSION := 3.0.3
+
+%:
+ dh $@ --with javahelper,maven_repo_helper
-cleanbuilddir::
- $(RM) -r output
+override_dh_auto_build-indep:
+ dh_auto_build -- -Dversion.number=$(DEB_UPSTREAM_VERSION) jar javadoc
-binary-post-install/libtrove3-java::
- dh_install -plibtrove3-java \
- output/lib/trove-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/
+override_dh_auto_install-indep:
+ # Install pom and jar
+ mh_installpom -plibtrove3-java \
+ debian/poms/trove4j-$(DEB_UPSTREAM_VERSION).pom
+ mh_installjar -plibtrove3-java -l \
+ debian/poms/trove4j-$(DEB_UPSTREAM_VERSION).pom \
+ output/lib/trove-$(DEB_UPSTREAM_VERSION).jar
+ # Additional symlinks:
+ # The jar provided on the homepage is called trove-3.0.3.jar
+ # Whereas the one on maven is called trove4j-3.0.3.jar...
dh_link -plibtrove3-java \
+ /usr/share/java/trove4j-$(DEB_UPSTREAM_VERSION).jar \
/usr/share/java/trove-$(DEB_UPSTREAM_VERSION).jar \
+ /usr/share/java/trove4j-$(DEB_UPSTREAM_VERSION).jar \
/usr/share/java/trove-3.jar
-
-binary-post-install/libtrove3-java-doc::
+ # Install JavaDoc
dh_install -plibtrove3-java-doc \
output/javadocs/* /usr/share/doc/libtrove3-java-doc/api
+make-pom:
+ @mkdir -p debian/poms
+ sed -e 's/###VERSION###/$(DEB_UPSTREAM_VERSION)/' < resources/maven-manual-deploy-pom.xml > debian/poms/trove4j-$(DEB_UPSTREAM_VERSION).pom
+
get-orig-source:
uscan --upstream-version 0 --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/trove3.git
More information about the pkg-java-commits
mailing list