[jruby-maven-plugins] 01/02: Build with maven-debian-helper 2
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Dec 21 15:57:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jruby-maven-plugins.
commit 4e23661c41f638f1aa2424cd0956f2a321867093
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Dec 21 16:54:47 2015 +0100
Build with maven-debian-helper 2
---
debian/changelog | 7 +++++++
debian/control | 18 ++----------------
debian/m2.conf | 7 -------
debian/maven.cleanIgnoreRules | 1 -
debian/maven.properties | 3 +++
debian/maven.publishedRules | 1 -
debian/maven3.mk | 14 --------------
debian/rules | 27 +++++----------------------
8 files changed, 17 insertions(+), 61 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3bde0b0..93cb86b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jruby-maven-plugins (1.0.10.ds1-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Build with maven-debian-helper 2
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 21 Dec 2015 16:07:25 +0100
+
jruby-maven-plugins (1.0.10.ds1-1) unstable; urgency=medium
* Initial release. (Closes: #796002).
diff --git a/debian/control b/debian/control
index 2ad5692..d755af1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,12 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Miguel Landaeta <nomadium at debian.org>
Build-Depends: debhelper (>= 9), default-jdk, maven-repo-helper (>= 1.5)
Build-Depends-Indep: jruby (>= 1.7.22~),
- libmaven-compiler-plugin-java (>= 3.2~),
libmaven-dependency-plugin-java,
libmaven-exec-plugin-java,
libbuild-helper-maven-plugin-java,
libmaven-install-plugin-java,
libmaven-source-plugin-java,
- maven-debian-helper,
- maven (>= 3.3~)
+ maven-debian-helper (>= 2.0~)
Standards-Version: 3.9.6
Homepage: https://github.com/torquebox/jruby-maven-plugins
Vcs-Git: git://anonscm.debian.org/pkg-java/jruby-maven-plugins.git
@@ -20,19 +18,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jruby-maven-plugins.gi
Package: jruby-maven-plugins
Architecture: all
-Depends: ant,
- jruby (>= 1.7.22~),
- junit4,
- libplexus-archiver-java,
- libplexus-build-api-java,
- libplexus-classworlds2-java,
- libplexus-containers1.5-java,
- libplexus-utils2-java,
- libplexus-velocity-java,
- libyaml-snake-java,
- maven (>= 3.3~),
- ${maven:Depends},
- ${misc:Depends},
+Depends: ${maven:Depends}, ${misc:Depends}
Recommends: ${maven:OptionalDepends}
Description: Maven plugins to handle Ruby gems in a Maven compatible way
jruby-maven-plugins is a set of utilities and plugins to handle
diff --git a/debian/m2.conf b/debian/m2.conf
deleted file mode 100644
index a107568..0000000
--- a/debian/m2.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-main is org.apache.maven.cli.MavenCli from plexus.core
-
-set maven.home default /usr/share/maven
-
-[plexus.core]
-optionally ${maven.home}/lib/ext/*.jar
-load ${maven.home}/lib/*.jar
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
deleted file mode 100644
index 8b13789..0000000
--- a/debian/maven.cleanIgnoreRules
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..f2f2afa
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,3 @@
+
+source.skip=true
+jruby.version=debian
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
deleted file mode 100644
index 8b13789..0000000
--- a/debian/maven.publishedRules
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/maven3.mk b/debian/maven3.mk
deleted file mode 100644
index 331165a..0000000
--- a/debian/maven3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# replace this with a saner integration between maven3 and debhelper
-DEB_BUILDDIR = .
-JAVACMD = $(JAVA_HOME)/bin/java
-DEB_MAVEN_REPO := $(CURDIR)/debian/maven-repo
-MAVEN_HOME = /usr/share/maven
-DEB_CLASSPATH = $(MAVEN_HOME)/boot/plexus-classworlds-2.x.jar
-DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -classpath $(DEB_CLASSPATH) \
- $(JAVA_OPTS) -Dclassworlds.conf=$(CURDIR)/debian/m2.conf \
- -Dmaven.home=/usr/share/maven \
- -Dmaven.multiModuleProjectDirectory=$(CURDIR) \
- org.codehaus.plexus.classworlds.launcher.Launcher \
- -s/etc/maven2/settings-debian.xml \
- -Dmaven.repo.local=$(DEB_MAVEN_REPO) \
- $(if $(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS))
diff --git a/debian/rules b/debian/rules
index 15026da..2c53b0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,32 +1,15 @@
#!/usr/bin/make -f
-export JAVA_HOME := /usr/lib/jvm/default-java
-
-include /usr/share/dpkg/default.mk
-include $(CURDIR)/debian/maven3.mk
+export JAVA_HOME = /usr/lib/jvm/default-java
%:
- dh $@ --with maven_repo_helper
-
-override_dh_auto_clean:
- -$(DEB_MAVEN_INVOKE) clean
- dh_clean
- mh_unpatchpoms -p$(DEB_SOURCE)
- mh_clean
- rm -rf -- "$(DEB_MAVEN_REPO)"
-
-override_dh_auto_configure:
- /usr/share/maven-debian-helper/copy-repo.sh "$(CURDIR)/debian"
- mh_patchpoms -p$(DEB_SOURCE) --debian-build --keep-pom-version \
- --maven-repo="$(DEB_MAVEN_REPO)" --build-no-docs
+ dh $@ --buildsystem=maven
override_dh_auto_build:
- dh_auto_build
- $(DEB_MAVEN_INVOKE) -Dsource.skip=true -Djruby.version=debian package install
+ dh_auto_build -- install
-override_dh_installdeb:
- -cd "$(CURDIR)/debian/$(DEB_SOURCE)" && rm -rf ./gem-maven-plugin/ ./jruby-maven-plugin/
- dh_installdeb
+override_dh_auto_test:
+ dh_auto_test -- install test
get-orig-source:
uscan --verbose --download-current-version
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby-maven-plugins.git
More information about the pkg-java-commits
mailing list