[eclipse-jgit] 02/05: Build with the DH sequencer instead of CDBS
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jun 22 08:40:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository eclipse-jgit.
commit fd70213831bebd57d3cf6c9ec1f52be82c96ac84
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jun 22 10:28:34 2016 +0200
Build with the DH sequencer instead of CDBS
---
debian/changelog | 1 +
debian/control | 4 +---
debian/jgit-cli.poms | 5 -----
debian/libjgit-ant-java.poms | 1 -
debian/libjgit-java.poms | 42 +++++++++++++++++++++++++++++++++------
debian/maven.ignoreRules | 2 ++
debian/rules | 47 ++++----------------------------------------
7 files changed, 44 insertions(+), 58 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 29aaa6b..80f314f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
jgit (3.7.1-3) UNRELEASED; urgency=medium
* Team upload.
+ * Build with the DH sequencer instead of CDBS
* Standards-Version updated to 3.9.8
-- Emmanuel Bourg <ebourg at apache.org> Tue, 21 Jun 2016 21:56:45 +0200
diff --git a/debian/control b/debian/control
index 279ec67..be54973 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Section: java
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
Build-Depends: debhelper (>= 9~),
- cdbs,
javahelper,
default-jdk,
junit4,
@@ -20,8 +19,7 @@ Build-Depends: debhelper (>= 9~),
libslf4j-java (>= 1.7.12-2),
libclirr-maven-plugin-java,
libxz-java,
- maven-debian-helper,
- maven-repo-helper
+ maven-debian-helper
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-java/eclipse-jgit.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/eclipse-jgit.git
diff --git a/debian/jgit-cli.poms b/debian/jgit-cli.poms
deleted file mode 100644
index e45960e..0000000
--- a/debian/jgit-cli.poms
+++ /dev/null
@@ -1,5 +0,0 @@
-org.eclipse.jgit.archive/pom.xml
-org.eclipse.jgit.console/pom.xml
-org.eclipse.jgit.pgm/pom.xml
-org.eclipse.jgit.ui/pom.xml
-
diff --git a/debian/libjgit-ant-java.poms b/debian/libjgit-ant-java.poms
deleted file mode 100644
index 73f5cf8..0000000
--- a/debian/libjgit-ant-java.poms
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.jgit.ant/pom.xml
diff --git a/debian/libjgit-java.poms b/debian/libjgit-java.poms
index 70e0d17..e849a93 100644
--- a/debian/libjgit-java.poms
+++ b/debian/libjgit-java.poms
@@ -1,10 +1,40 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
pom.xml
org.eclipse.jgit/pom.xml
-org.eclipse.jgit.ant/pom.xml --ignore-pom
-org.eclipse.jgit.archive/pom.xml --ignore-pom
-org.eclipse.jgit.console/pom.xml --ignore-pom
+org.eclipse.jgit.ant/pom.xml --package=libjgit-ant-java --java-lib
+org.eclipse.jgit.ant.test/pom.xml --ignore
+org.eclipse.jgit.archive/pom.xml --package=jgit-cli --java-lib
+org.eclipse.jgit.console/pom.xml --package=jgit-cli --java-lib
+org.eclipse.jgit.http.apache/pom.xml --ignore
org.eclipse.jgit.http.server/pom.xml
org.eclipse.jgit.java7/pom.xml
-org.eclipse.jgit.junit/pom.xml --ignore-pom
-org.eclipse.jgit.pgm/pom.xml --ignore-pom
-org.eclipse.jgit.ui/pom.xml --ignore-pom
+org.eclipse.jgit.junit/pom.xml --ignore
+org.eclipse.jgit.pgm/pom.xml --package=jgit-cli --java-lib
+org.eclipse.jgit.pgm.test/pom.xml --ignore
+org.eclipse.jgit.ui/pom.xml --package=jgit-cli --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 56357a6..00f43fc 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,3 +1,5 @@
* maven-shade-plugin * * * *
* maven-source-plugin * * * *
* jacoco-maven-plugin * * * *
+
+org.eclipse.jgit org.eclipse.jgit.junit * * * *
diff --git a/debian/rules b/debian/rules
index 856d09b..79cadda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,52 +1,13 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+ dh $@ --buildsystem=maven --with javahelper
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_MAVEN_DOC_TARGET :=
-DEB_MAVEN_INSTALL_TARGET :=
-DEB_MAVEN_INSTALL_DOC_TARGET :=
-
-install/libjgit-java::
- mh_installpoms -plibjgit-java
- mh_installjar -plibjgit-java -l org.eclipse.jgit/pom.xml org.eclipse.jgit/target/org.eclipse.jgit-*-r.jar
- mh_installjar -plibjgit-java -l org.eclipse.jgit.http.server/pom.xml org.eclipse.jgit.http.server/target/org.eclipse.jgit.http.server-*-r.jar
- mh_installjar -plibjgit-java -l org.eclipse.jgit.java7/pom.xml org.eclipse.jgit.java7/target/org.eclipse.jgit.java7-*-r.jar
- mh_unpatchpoms -plibjgit-java
-
-install/libjgit-ant-java::
- mh_installpoms -plibjgit-ant-java
- mh_installjar -plibjgit-ant-java -l org.eclipse.jgit.ant/pom.xml org.eclipse.jgit.ant/target/org.eclipse.jgit.ant-*-r.jar
- mh_unpatchpoms -plibjgit-ant-java
-
-install/jgit-cli::
- mh_installpoms -pjgit-cli
- mh_installjar -pjgit-cli -l org.eclipse.jgit.archive/pom.xml org.eclipse.jgit.archive/target/org.eclipse.jgit.archive-*-r.jar
- mh_installjar -pjgit-cli -l org.eclipse.jgit.console/pom.xml org.eclipse.jgit.console/target/org.eclipse.jgit.console-*-r.jar
- mh_installjar -pjgit-cli -l org.eclipse.jgit.pgm/pom.xml org.eclipse.jgit.pgm/target/org.eclipse.jgit.pgm-*-r.jar
- mh_installjar -pjgit-cli -l org.eclipse.jgit.ui/pom.xml org.eclipse.jgit.ui/target/org.eclipse.jgit.ui-*-r.jar
- mh_unpatchpoms -pjgit-cli
+override_dh_install:
+ dh_install
dh_install -pjgit-cli org.eclipse.jgit.pgm/jgit.sh /usr/bin
mv debian/jgit-cli/usr/bin/jgit.sh debian/jgit-cli/usr/bin/jgit
-install/libjgit-java-doc::
mv org.eclipse.jgit/target/apidocs org.eclipse.jgit/target/api
dh_install -plibjgit-java-doc org.eclipse.jgit/target/api /usr/share/doc/libjgit-java/
-
-clean::
- rm -f mvn-build
- rm -fr org.eclipse.jgit.ant.test/target/ \
- org.eclipse.jgit.ant/target/ \
- org.eclipse.jgit.console/target/ \
- org.eclipse.jgit.http.server/target/ \
- org.eclipse.jgit.java7/target/ \
- org.eclipse.jgit.junit/target/ \
- org.eclipse.jgit.pgm.test/target/ \
- org.eclipse.jgit.pgm/target/ \
- org.eclipse.jgit.ui/target/ \
- org.eclipse.jgit/target/ \
- target/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-jgit.git
More information about the pkg-java-commits
mailing list