This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven-debian-helper.
commit 3e4c2179c36f46761e72dc1a33bdf5bcc573cd27
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Tue Mar 27 11:55:24 2018 +0200
No longer support generating CDBS based packages
---
bin/mh_make | 6 ++----
debian/changelog | 1 +
.../org/debian/maven/packager/GenerateDebianFilesMojo.java | 11 -----------
maven-packager-utils/src/main/resources/control.vm | 2 +-
maven-packager-utils/src/main/resources/rules.cdbs.vm | 12 ------------
5 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/bin/mh_make b/bin/mh_make
index 6722824..43cf8c0 100755
--- a/bin/mh_make
+++ b/bin/mh_make
@@ -22,7 +22,6 @@ syntax()
echo -e "\t-d<true|false> --javadoc=<true|false>: include or not the
javadoc"
echo -e "\t during the build"
echo -e "\t-n --non-interactive: non interactive mode, don't ask questions"
- echo -e "\t--cdbs: use CDBS as the build helper instead of DH"
echo -e "\t-a --ant: use Ant for the packaging instead of Maven"
echo -e "\t-v --verbose: show more information while running"
echo -e ""
@@ -40,7 +39,7 @@ syntax()
exit 1
}
-ARGS="p package b bin-package t run-tests d javadoc a ant v verbose n
non-interactive s from-svn cdbs" parseargs "$@"
+ARGS="p package b bin-package t run-tests d javadoc a ant v verbose n
non-interactive s from-svn" parseargs "$@"
if [ -z "$DEBFULLNAME" ]; then
echo "Please define the environment variable DEBFULLNAME, e.g."
@@ -69,7 +68,6 @@ BIN_PACKAGE=$(getarg b bin-package)
RUN_TESTS=$(getarg t run-tests)
GEN_JAVADOC=$(getarg d javadoc)
ANT=$(getarg a ant)
-CDBS=$(getarg cdbs)
FROM_SVN=$(getarg s from-svn)
VERBOSE=$(getarg v verbose)
NON_INTERACTIVE=$(getarg n non-interactive)
@@ -219,7 +217,7 @@ eval $(cat debian/$BIN_PACKAGE.substvars | sed -e
's/maven\./maven_/' | grep mav
mh_patchpoms ${VERBOSE:+--verbose} -p$BIN_PACKAGE -rdebian/maven.rules
-idebian/maven.ignoreRules --keep-pom-version
-mvn org.debian.maven:maven-packager-utils:$MH_VERSION:generate
-Demail="$DEBEMAIL" -Dpackager="$DEBFULLNAME" -DpackagerLicense="$DEBLICENSE"
-Dpackage="$PACKAGE" -Dbin.package="$BIN_PACKAGE" -DrunTests="$RUN_TESTS"
-DgenerateJavadoc="$GEN_JAVADOC" -Dmaven.repo.local=/usr/share/maven-repo
${ANT:+-DpackageType=ant} ${CDBS:+-Dhelper=cdbs}
${FROM_SVN:+-DdownloadUrl=scm:svn:$FROM_SVN} --offline
+mvn org.debian.maven:maven-packager-utils:$MH_VERSION:generate
-Demail="$DEBEMAIL" -Dpackager="$DEBFULLNAME" -DpackagerLicense="$DEBLICENSE"
-Dpackage="$PACKAGE" -Dbin.package="$BIN_PACKAGE" -DrunTests="$RUN_TESTS"
-DgenerateJavadoc="$GEN_JAVADOC" -Dmaven.repo.local=/usr/share/maven-repo
${ANT:+-DpackageType=ant} ${FROM_SVN:+-DdownloadUrl=scm:svn:$FROM_SVN} --offline
if [ $? != 0 ]; then
if [ -f debian/$BIN_PACKAGE.poms ]; then
diff --git a/debian/changelog b/debian/changelog
index c09c0b3..4de95e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ maven-debian-helper (2.3~exp2) UNRELEASED; urgency=medium
* Team upload.
* Generate packages depending on default-jdk-headless instead of default-jdk
+ * No longer support generating CDBS based packages
-- Emmanuel Bourg <ebo...@apache.org> Tue, 27 Mar 2018 11:46:29 +0200
diff --git
a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
index 77e2a5b..62de934 100644
---
a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
+++
b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
@@ -158,13 +158,6 @@ public class GenerateDebianFilesMojo extends AbstractMojo {
*/
protected boolean generateJavadoc;
- /**
- * The packaging helper used to build the package (CDBS or DH).
- *
- * @parameter expression="${helper}" default-value="dh"
- */
- protected String helper;
-
private PackageScanner scanner = new PackageScanner(false);
private LicensesScanner licensesScanner = new LicensesScanner();
@@ -176,9 +169,6 @@ public class GenerateDebianFilesMojo extends AbstractMojo {
String controlTemplate = "control.vm";
String rulesTemplate = "rules.vm";
- if ("cdbs".equals(helper)) {
- rulesTemplate = "rules.cdbs.vm";
- }
if ("ant".equals(packageType)) {
controlTemplate = "control.ant.vm";
rulesTemplate = "rules.ant.vm";
@@ -197,7 +187,6 @@ public class GenerateDebianFilesMojo extends AbstractMojo {
context.put("package", packageName);
context.put("packageType", packageType);
context.put("binPackage", binPackageName);
- context.put("helper", helper);
context.put("packager", packager);
context.put("packagerEmail", email);
context.put("project", project);
diff --git a/maven-packager-utils/src/main/resources/control.vm
b/maven-packager-utils/src/main/resources/control.vm
index 9ce7c0b..7cbb8d5 100644
--- a/maven-packager-utils/src/main/resources/control.vm
+++ b/maven-packager-utils/src/main/resources/control.vm
@@ -18,7 +18,7 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: ${packager} <${packagerEmail}>
-Build-Depends: debhelper (>= 11),#if ($helper == "cdbs") cdbs,#end
default-jdk-headless, maven-debian-helper (>= 2.1)
+Build-Depends: debhelper (>= 11), default-jdk-headless, maven-debian-helper
(>= 2.1)
#if(!$buildDependencies.isEmpty())
Build-Depends-Indep:#printDependencies($buildDependencies)$space
#end
diff --git a/maven-packager-utils/src/main/resources/rules.cdbs.vm
b/maven-packager-utils/src/main/resources/rules.cdbs.vm
deleted file mode 100644
index 719e55d..0000000
--- a/maven-packager-utils/src/main/resources/rules.cdbs.vm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-#if ($project.Packaging == "pom")
-DEB_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate
-#end
-
-get-orig-source:
- uscan --download-current-version --force-download --no-symlink
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/maven-debian-helper.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
