[dumbster] 12/18: Install the Maven artifacts
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue May 23 16:45:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository dumbster.
commit fa34b9066bd98da298de74e999e7d7d90a396e37
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue May 23 17:21:32 2017 +0200
Install the Maven artifacts
---
debian/changelog | 1 +
debian/control | 1 +
debian/dirs | 1 -
debian/libdumbster-java.poms | 1 +
debian/patches/buildxml.diff | 22 ++++++----------------
debian/pom.xml | 14 ++++++++++++++
debian/rules | 8 ++++++--
7 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 86d77f1..2fdae7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dumbster (1.6+debian-3) UNRELEASED; urgency=medium
* Team upload.
* The package is now co-maintained with the Java Team
+ * Install the Maven artifacts
* Depend on libmail-java instead of libgnumail-java
* Enabled the debugging symbols
* No longer install the javadoc and the test results in the binary package
diff --git a/debian/control b/debian/control
index 9a4bd9f..939f020 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends-Indep:
, junit
, ant
, ant-optional
+ , maven-repo-helper
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-java/dumbster.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/dumbster.git
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 65d015e..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/
diff --git a/debian/libdumbster-java.poms b/debian/libdumbster-java.poms
new file mode 100644
index 0000000..093479b
--- /dev/null
+++ b/debian/libdumbster-java.poms
@@ -0,0 +1 @@
+debian/pom.xml --has-package-version --java-lib --artifact=build/dumbster.jar
diff --git a/debian/patches/buildxml.diff b/debian/patches/buildxml.diff
index 58d7871..c0b4aea 100644
--- a/debian/patches/buildxml.diff
+++ b/debian/patches/buildxml.diff
@@ -1,16 +1,6 @@
--- a/build.xml
+++ b/build.xml
-@@ -20,6 +20,9 @@
- <project name="dumbster" default="world">
-
- <!-- === project configuration ========================================== -->
-+
-+ <property environment="env" />
-+ <property name="jardir" value="${env.DESTDIR}/usr/share/java" />
- <property name="release" value="1.6"/>
- <property name="srcdir" value="src" />
- <property name="etcdir" value="etc" />
-@@ -27,7 +30,7 @@
+@@ -27,7 +27,7 @@
<property name="docdir" value="doc" />
<property name="stagedir" value="${builddir}/stage" />
<property name="compiledir" value="${builddir}/classes" />
@@ -19,7 +9,7 @@
<property name="testsrcdir" value="test-src" />
<property name="testcompiledir" value="${builddir}/test" />
<property name="debug" value="" />
-@@ -35,12 +38,20 @@
+@@ -35,12 +35,20 @@
<property name="build.compiler" value="modern" />
<path id="compile.path">
@@ -42,12 +32,12 @@
<!-- === world ========================================================== -->
<target name="world" depends="jar, test" />
-@@ -58,7 +69,11 @@
+@@ -58,7 +66,11 @@
<target name="jar" depends="compile">
<delete file="${builddir}/dumbster.jar"/>
- <jar jarfile="${builddir}/dumbster.jar" basedir="${compiledir}/" />
-+ <jar jarfile="${jardir}/dumbster.jar" basedir="${compiledir}/" >
++ <jar jarfile="${builddir}/dumbster.jar" basedir="${compiledir}/" >
+ <manifest>
+ <attribute name="Class-Path" value="${jar.classpath}"/>
+ </manifest>
@@ -55,7 +45,7 @@
</target>
<!-- === clean ========================================================== -->
-@@ -90,12 +105,16 @@
+@@ -90,12 +102,16 @@
<classpath>
<pathelement path="${testcompiledir}" />
<pathelement path="${compiledir}" />
@@ -74,7 +64,7 @@
</junit>
</target>
-@@ -114,4 +133,4 @@
+@@ -114,4 +130,4 @@
<zipfileset dir="." includes="build/dumbster.jar" fullpath="dumbster${release}.jar"/>
</zip>
</target>
diff --git a/debian/pom.xml b/debian/pom.xml
new file mode 100644
index 0000000..849cb3a
--- /dev/null
+++ b/debian/pom.xml
@@ -0,0 +1,14 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>dumbster</groupId>
+ <artifactId>dumbster</artifactId>
+ <name>Dumbster: Fake SMTP Server</name>
+ <version>1.6</version>
+ <dependencies>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>javax.mail-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/rules b/debian/rules
index 19b825b..3d6a830 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-export DESTDIR=debian/libdumbster-java
-
# Add here any variable or target overrides you need.
# Set either a single (JAVA_HOME) or multiple (JAVA_HOME_DIRS) java locations
@@ -20,5 +18,11 @@ DEB_ANT_CLEAN_TARGET = clean
DEB_ANT_INSTALL_TARGET = jar
DEB_ANT_CHECK_TARGET = test
+install/libdumbster-java::
+ mh_install -plibdumbster-java
+
+clean::
+ mh_clean
+
get-orig-source:
bash debian/get_orig_source.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dumbster.git
More information about the pkg-java-commits
mailing list