[Git][java-team/maven-repo-helper][master] 6 commits: Standards-Version updated to 4.6.1
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Mon May 23 12:08:27 BST 2022
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-repo-helper
Commits:
565515c6 by Emmanuel Bourg at 2022-05-23T11:45:46+02:00
Standards-Version updated to 4.6.1
- - - - -
8900fb7b by Emmanuel Bourg at 2022-05-23T12:02:40+02:00
Moved the temporary debian/.mh directory under debian/.debhelper (Closes: #985650)
- - - - -
1e504fba by Emmanuel Bourg at 2022-05-23T12:35:35+02:00
No longer call mh_clean during the build sequence
- - - - -
5a70bf2c by Emmanuel Bourg at 2022-05-23T13:01:49+02:00
mh_clean is now deprecated and doesn't do anything
- - - - -
114e9585 by Emmanuel Bourg at 2022-05-23T13:06:21+02:00
Provide dh-sequence-maven-repo-helper (Closes: #985651)
- - - - -
9e6fc1e3 by Emmanuel Bourg at 2022-05-23T13:08:09+02:00
Upload to unstable
- - - - -
16 changed files:
- debian/changelog
- debian/clean
- debian/control
- debian/maven-repo-helper.install
- debian/rules
- doc/ref/mh_clean.rst
- doc/ref/mh_clean.txt
- src/main/bin/mh_clean
- src/main/bin/mh_cleanpom
- src/main/bin/mh_installjar
- src/main/bin/mh_installpom
- src/main/bin/mh_installsite
- src/main/bin/mh_linkjar
- src/main/bin/mh_linkrepojar
- src/main/share/jh_maven_repo_helper.pm
- src/main/share/maven_repo_helper.pm
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+maven-repo-helper (1.11) unstable; urgency=medium
+
+ * Provide dh-sequence-maven-repo-helper (Closes: #985651)
+ * Moved the temporary debian/.mh directory under debian/.debhelper
+ (Closes: #985650)
+ * No longer call mh_clean during the build sequence, the temporary files
+ are now cleaned by debhelper
+ * mh_clean is now deprecated and doesn't do anything
+ * Standards-Version updated to 4.6.1
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 23 May 2022 13:07:43 +0200
+
maven-repo-helper (1.10) unstable; urgency=medium
* Fixed the resolution of the dependencies with a classifier (Closes: #982438)
=====================================
debian/clean
=====================================
@@ -1,2 +1 @@
-debian/.mh/
debian/maven-repo/
=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends:
libcommons-io-java,
libxmlunit-java,
python3-docutils
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/java-team/maven-repo-helper.git
Vcs-Browser: https://salsa.debian.org/java-team/maven-repo-helper
Homepage: https://wiki.debian.org/Java/MavenRepoSpec
@@ -26,6 +26,7 @@ Depends: ${misc:Depends}, default-jre-headless (>= 2:1.7) | java7-runtime-headle
Recommends: debhelper-compat (= 13)
Suggests: maven-debian-helper
Breaks: maven-debian-helper (<= 1.6.6)
+Provides: dh-sequence-maven-repo-helper
Description: Helper tools for including Maven metadata in Debian packages
This package enables Debian packages which are not using Maven in their
build process to provide and install Maven POMs and libraries in the
=====================================
debian/maven-repo-helper.install
=====================================
@@ -1,7 +1,7 @@
-build/maven-repo-helper-debian.jar /usr/share/maven-repo/org/debian/maven/maven-repo-helper/debian/
-debian/.mh/maven-repo-helper-debian.pom /usr/share/maven-repo/org/debian/maven/maven-repo-helper/debian/
+build/maven-repo-helper-debian.jar /usr/share/maven-repo/org/debian/maven/maven-repo-helper/debian/
+debian/.debhelper/.mh/maven-repo-helper-debian.pom /usr/share/maven-repo/org/debian/maven/maven-repo-helper/debian/
src/main/bin/mh_* /usr/bin
src/main/share/mh_* /usr/share/maven-repo-helper
src/main/share/*.pm /usr/share/perl5/Debian/Debhelper/Sequence
-debian/.mh/doc/*.html /usr/share/doc/maven-repo-helper/
+debian/.debhelper/.mh/doc/*.html /usr/share/doc/maven-repo-helper/
=====================================
debian/rules
=====================================
@@ -11,7 +11,7 @@ export CLASSPATH=/usr/share/java/junit4.jar
dh $@ --buildsystem=ant
override_dh_auto_configure:
- mkdir -p debian/.mh
+ mkdir -p debian/.debhelper/.mh
override_dh_auto_build: man-pages
dh_auto_build -- -f debian/build.xml -Dpackage=$(PACKAGE) -Dversion=$(VERSION) package -Dmaven.test.skip=true
@@ -19,7 +19,7 @@ override_dh_auto_build: man-pages
java -cp build/$(PACKAGE)-debian.jar:$(CLASSPATH) $(JAVA_OPTIONS) org.debian.maven.repo.POMCleaner \
--no-parent --has-package-version --rules=debian/maven.rules pom.xml \
- debian/.mh/$(PACKAGE)-debian.pom debian/.mh/pom.properties
+ debian/.debhelper/.mh/$(PACKAGE)-debian.pom debian/.debhelper/.mh/pom.properties
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -34,7 +34,7 @@ override_dh_auto_clean:
# Generation of man pages
SCRIPTS := $(wildcard src/main/bin/mh_*)
-MAN_PAGES := $(addprefix debian/.mh/doc/,$(addsuffix .1, $(notdir $(SCRIPTS))))
+MAN_PAGES := $(addprefix debian/.debhelper/.mh/doc/,$(addsuffix .1, $(notdir $(SCRIPTS))))
mh_checkrepo_description = "Checks the Maven repository."
mh_clean_description = "Cleans the temporary files created by the other mh_* utilities."
@@ -53,28 +53,28 @@ mh_patchpom_description = "Patches one POM file using the Maven dependency ru
mh_patchpoms_description = "Patches the POM files using the Maven dependency rules."
mh_unpatchpoms_description = "Undo the patches on the POM files."
-debian/.mh/mh_lib.sh : src/main/share/mh_lib.sh
- cp src/main/share/mh_lib.sh debian/.mh/mh_lib.sh
+debian/.debhelper/.mh/mh_lib.sh : src/main/share/mh_lib.sh
+ cp src/main/share/mh_lib.sh debian/.debhelper/.mh/mh_lib.sh
-debian/.mh/mh_% : src/main/bin/mh_% debian/.mh/mh_lib.sh
+debian/.debhelper/.mh/mh_% : src/main/bin/mh_% debian/.debhelper/.mh/mh_lib.sh
cp $< $@
- perl -i -pe 's,\. /usr/share/maven-repo-helper/mh_lib.sh,\. debian/.mh/mh_lib.sh,' $@
+ perl -i -pe 's,\. /usr/share/maven-repo-helper/mh_lib.sh,\. debian/.debhelper/.mh/mh_lib.sh,' $@
chmod +x $@
-debian/.mh/doc:
- mkdir -p debian/.mh/doc
- rst2html --title="Maven Repo Helper tutorial" --stylesheet-path=doc/style.css doc/tutorial.rst debian/.mh/doc/tutorial.html
+debian/.debhelper/.mh/doc:
+ mkdir -p debian/.debhelper/.mh/doc
+ rst2html --title="Maven Repo Helper tutorial" --stylesheet-path=doc/style.css doc/tutorial.rst debian/.debhelper/.mh/doc/tutorial.html
cat doc/reference.rst doc/ref/mh_cleanpom.rst doc/ref/mh_installpom.rst doc/ref/mh_installpoms.rst doc/ref/mh_patchpom.rst \
doc/ref/mh_patchpoms.rst doc/ref/mh_unpatchpoms.rst doc/reference2.rst doc/ref/mh_installjar.rst \
doc/ref/mh_linkjar.rst doc/ref/mh_linkjars.rst doc/reference3.rst doc/ref/mh_clean.rst doc/ref/mh_installsite.rst \
doc/ref/mh_install.rst doc/reference4.rst doc/ref/mh_checkrepo.rst doc/reference5.rst \
- doc/ref/dh_with_maven_repo_helper.rst doc/ref/dh_with_jh_maven_repo_helper.rst > debian/.mh/doc/reference.rst
- rst2html --title="Maven Repo Helper reference" --stylesheet-path=doc/style.css debian/.mh/doc/reference.rst debian/.mh/doc/reference.html
- rst2html --title="Maven Repo Helper repository specification" --stylesheet-path=doc/style.css doc/repository.rst debian/.mh/doc/repository.html
+ doc/ref/dh_with_maven_repo_helper.rst doc/ref/dh_with_jh_maven_repo_helper.rst > debian/.debhelper/.mh/doc/reference.rst
+ rst2html --title="Maven Repo Helper reference" --stylesheet-path=doc/style.css debian/.debhelper/.mh/doc/reference.rst debian/.debhelper/.mh/doc/reference.html
+ rst2html --title="Maven Repo Helper repository specification" --stylesheet-path=doc/style.css doc/repository.rst debian/.debhelper/.mh/doc/repository.html
-debian/.mh/doc/mh_%.1 : debian/.mh/mh_%
+debian/.debhelper/.mh/doc/mh_%.1 : debian/.debhelper/.mh/mh_%
help2man -N -n $(mh_$*_description) -o $@ $<
-man-pages: debian/.mh/doc $(MAN_PAGES)
+man-pages: debian/.debhelper/.mh/doc $(MAN_PAGES)
.PHONY: man-pages
=====================================
doc/ref/mh_clean.rst
=====================================
@@ -1,19 +1,4 @@
mh\_clean:
~~~~~~~~~~
-Cleans the temporary files created by the other mh\_\* utilities. Add it
-to the clean: target in debian/rules
-
-Usage:
-
-::
-
- mh_clean
-
-In debian/rules, use:
-
-::
-
- clean::
- mh_clean
-
+DEPRECATED: Use debian/clean instead
=====================================
doc/ref/mh_clean.txt
=====================================
@@ -1,15 +1,3 @@
### mh\_clean:
-Cleans the temporary files created by the other mh_* utilities.
-Add it to the clean: target in debian/rules
-
-Usage:
-
- mh_clean
-
-In debian/rules, use:
-
- clean::
- mh_clean
-
-
+DEPRECATED: Use debian/clean instead
=====================================
src/main/bin/mh_clean
=====================================
@@ -21,15 +21,9 @@ set -e
syntax()
{
echo -e "Usage: mh_clean"
- echo -e "Cleans the temporary files created by the other mh_* utilities."
+ echo -e "DEPRECATED: Use debian/clean instead"
echo -e ""
exit 1
}
parseargs "$@"
-
-if [ -f "debian/.mh_clean" ]; then
- rm -f `cat debian/.mh_clean` debian/.mh_clean
-fi
-rm -rf debian/.mh
-
=====================================
src/main/bin/mh_cleanpom
=====================================
@@ -31,9 +31,9 @@ syntax()
echo -e "\t[pom] is the location of the POM file to clean."
echo -e "\t Default to pom.xml or debian/pom.xml"
echo -e "\t[target] is where the cleaned POM is written to."
- echo -e "\t Default to debian/.mh/pom.xml"
+ echo -e "\t Default to debian/.debhelper/.mh/pom.xml"
echo -e "\t[pom-props] is where the POM properties file will be written."
- echo -e "\t Default to debian/.mh/pom.properties"
+ echo -e "\t Default to debian/.debhelper/.mh/pom.properties"
echo -e "Options:"
echo -e "\t-h --help: show this text"
echo -e "\t-V --version: show the version"
@@ -182,8 +182,8 @@ PACKAGE=${PACKAGE:?"Package parameter (-p) is mandatory"}
VERBOSE=$(getarg v verbose)
NOACT=$(getarg n no-act)
POM="${ARGV[0]}"
-TARGET="${ARGV[1]:-debian/.mh/pom.xml}"
-POM_PROPS="${ARGV[2]:-debian/.mh/pom.properties}"
+TARGET="${ARGV[1]:-debian/.debhelper/.mh/pom.xml}"
+POM_PROPS="${ARGV[2]:-debian/.debhelper/.mh/pom.properties}"
HAS_PACKAGE_VERSION=$(getarg h has-package-version)
KEEP_ELEMENTS=$(getarg keep-elements)
=====================================
src/main/bin/mh_installjar
=====================================
@@ -109,17 +109,17 @@ fi
DH_OPTS="${VERBOSE:+-v} ${NOACT:+-n}"
CLEAN_ARGS="--package=${PACKAGE} ${SETVERSION:+--set-version=$SETVERSION} ${RULES:+--rules=$RULES}"
-mkdir -p debian/.mh 2> /dev/null
+mkdir -p debian/.debhelper/.mh 2> /dev/null
if [ -z "$SKIP_CLEAN_POM" ]; then
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
- echo -e "\tmh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.mh/pom.xml debian/.mh/pom.properties"
+ echo -e "\tmh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.debhelper/.mh/pom.xml debian/.debhelper/.mh/pom.properties"
fi
- mh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.mh/pom.xml debian/.mh/pom.properties
+ mh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.debhelper/.mh/pom.xml debian/.debhelper/.mh/pom.properties
fi
-source debian/.mh/pom.properties
+source debian/.debhelper/.mh/pom.properties
groupPath=$(echo $groupId | tr . / )
if [ -z "$CLASSIFIER" ]; then
@@ -181,11 +181,11 @@ install_jar ()
if [[ -n "$JAR_INSTALLED" ]]; then
return
fi
- cp ${srcJar} debian/.mh/${destJar}
+ cp ${srcJar} debian/.debhelper/.mh/${destJar}
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
- echo -e "\tinstall -m 644 -D debian/.mh/${destJar} debian/${PACKAGE}/${destDir}/${destJar}"
+ echo -e "\tinstall -m 644 -D debian/.debhelper/.mh/${destJar} debian/${PACKAGE}/${destDir}/${destJar}"
fi
- install -m 644 -D debian/.mh/${destJar} debian/${PACKAGE}/${destDir}/${destJar}
+ install -m 644 -D debian/.debhelper/.mh/${destJar} debian/${PACKAGE}/${destDir}/${destJar}
JAR_INSTALLED=done
else
=====================================
src/main/bin/mh_installpom
=====================================
@@ -137,41 +137,41 @@ fi
DH_OPTS="${VERBOSE:+-v} ${NOACT:+-n}"
CLEAN_ARGS="--package=${PACKAGE} ${NOPARENT:+--no-parent} ${NORULES:+--no-rules} ${KEEP_POM_VERSION:+--keep-pom-version} ${HAS_PACKAGE_VERSION:+--has-package-version} ${NO_PUBLISH_USED_RULE:+--no-publish-used-rule} ${SETVERSION:+--set-version=$SETVERSION} ${RULES:+--rules=$RULES} ${PUBLISHED_RULES:+--published-rules=$PUBLISHED_RULES} ${IGNORE_RULES:+--ignore-rules=$IGNORE_RULES} ${CLEAN_IGNORE_RULES:+--clean-ignore-rules=$CLEAN_IGNORE_RULES} ${KEEP_ELEMENTS:+--keep-elements=$KEEP_ELEMENTS} ${MAVEN_REPO:+--maven-repo=$MAVEN_REPO}"
-mkdir -p debian/.mh 2> /dev/null
+mkdir -p debian/.debhelper/.mh 2> /dev/null
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
- echo -e "\tmh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.mh/pom.xml debian/.mh/pom.properties"
+ echo -e "\tmh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.debhelper/.mh/pom.xml debian/.debhelper/.mh/pom.properties"
fi
-mh_cleanpom $DH_OPTS $CLEAN_ARGS --keep-pom-version $POM debian/.mh/pom.xml.keep debian/.mh/pom.properties.keep
-mh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.mh/pom.xml debian/.mh/pom.properties
-source debian/.mh/pom.properties
+mh_cleanpom $DH_OPTS $CLEAN_ARGS --keep-pom-version $POM debian/.debhelper/.mh/pom.xml.keep debian/.debhelper/.mh/pom.properties.keep
+mh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.debhelper/.mh/pom.xml debian/.debhelper/.mh/pom.properties
+source debian/.debhelper/.mh/pom.properties
groupPath=$(echo $groupId | tr . / )
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
- echo -e "\tmv debian/.mh/pom.xml debian/.mh/${artifactId}-${debianVersion}.pom"
+ echo -e "\tmv debian/.debhelper/.mh/pom.xml debian/.debhelper/.mh/${artifactId}-${debianVersion}.pom"
fi
if [ -n "${IGNORE_POM}" ]; then
exit
fi
-mv debian/.mh/pom.xml.keep debian/.mh/${artifactId}-${version}.pom
-mv debian/.mh/pom.xml debian/.mh/${artifactId}-${debianVersion}.pom
+mv debian/.debhelper/.mh/pom.xml.keep debian/.debhelper/.mh/${artifactId}-${version}.pom
+mv debian/.debhelper/.mh/pom.xml debian/.debhelper/.mh/${artifactId}-${debianVersion}.pom
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
- echo -e "\tinstall -m 644 -D debian/.mh/${artifactId}-${version}.pom debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${version}/${artifactId}-${version}.pom"
+ echo -e "\tinstall -m 644 -D debian/.debhelper/.mh/${artifactId}-${version}.pom debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${version}/${artifactId}-${version}.pom"
fi
-install -m 644 -D debian/.mh/${artifactId}-${version}.pom debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${version}/${artifactId}-${version}.pom
+install -m 644 -D debian/.debhelper/.mh/${artifactId}-${version}.pom debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${version}/${artifactId}-${version}.pom
if [[ "${version}" != "${debianVersion}" ]]; then
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
- echo -e "\tinstall -m 644 -D debian/.mh/${artifactId}-${debianVersion}.pom debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${debianVersion}/${artifactId}-${debianVersion}.pom"
+ echo -e "\tinstall -m 644 -D debian/.debhelper/.mh/${artifactId}-${debianVersion}.pom debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${debianVersion}/${artifactId}-${debianVersion}.pom"
fi
- install -m 644 -D debian/.mh/${artifactId}-${debianVersion}.pom debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${debianVersion}/${artifactId}-${debianVersion}.pom
+ install -m 644 -D debian/.debhelper/.mh/${artifactId}-${debianVersion}.pom debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${debianVersion}/${artifactId}-${debianVersion}.pom
fi
if [[ ! -z "$RELOCATE" ]]; then
=====================================
src/main/bin/mh_installsite
=====================================
@@ -70,17 +70,17 @@ SITE_FILE="${ARGV[1]}"
DH_OPTS="${VERBOSE:+-v} ${NOACT:+-n}"
CLEAN_ARGS="--package=${PACKAGE} ${SETVERSION:+--set-version=$SETVERSION} ${RULES:+--rules=$RULES}"
-mkdir -p debian/.mh 2> /dev/null
+mkdir -p debian/.debhelper/.mh 2> /dev/null
if [ -z "$SKIP_CLEAN_POM" ]; then
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
- echo -e "\tmh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.mh/pom.xml debian/.mh/pom.properties"
+ echo -e "\tmh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.debhelper/.mh/pom.xml debian/.debhelper/.mh/pom.properties"
fi
- mh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.mh/pom.xml debian/.mh/pom.properties
+ mh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.debhelper/.mh/pom.xml debian/.debhelper/.mh/pom.properties
fi
-source debian/.mh/pom.properties
+source debian/.debhelper/.mh/pom.properties
groupPath=$(echo $groupId | tr . / )
@@ -105,11 +105,11 @@ install_site ()
echo "mh_installsite: Install $srcSite to $destDir $destSite"
fi
- cp ${srcSite} debian/.mh/${destSite}
+ cp ${srcSite} debian/.debhelper/.mh/${destSite}
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
- echo -e "\tinstall -m 644 -D debian/.mh/${destSite} debian/${PACKAGE}/${destDir}/${destSite}"
+ echo -e "\tinstall -m 644 -D debian/.debhelper/.mh/${destSite} debian/${PACKAGE}/${destDir}/${destSite}"
fi
- install -m 644 -D debian/.mh/${destSite} debian/${PACKAGE}/${destDir}/${destSite}
+ install -m 644 -D debian/.debhelper/.mh/${destSite} debian/${PACKAGE}/${destDir}/${destSite}
}
# Install site.xml in the Maven repository
=====================================
src/main/bin/mh_linkjar
=====================================
@@ -97,17 +97,17 @@ JAR="${ARGV[1]}"
DH_OPTS="${VERBOSE:+-v} ${NOACT:+-n}"
CLEAN_ARGS="--package=${PACKAGE} ${SETVERSION:+--set-version=$SETVERSION} ${RULES:+--rules=$RULES}"
-mkdir -p debian/.mh 2> /dev/null
+mkdir -p debian/.debhelper/.mh 2> /dev/null
if [ -z "$SKIP_CLEAN_POM" ]; then
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
- echo -e "\tmh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.mh/pom.xml debian/.mh/pom.properties"
+ echo -e "\tmh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.debhelper/.mh/pom.xml debian/.debhelper/.mh/pom.properties"
fi
- mh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.mh/pom.xml debian/.mh/pom.properties
+ mh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.debhelper/.mh/pom.xml debian/.debhelper/.mh/pom.properties
fi
-source debian/.mh/pom.properties
+source debian/.debhelper/.mh/pom.properties
groupPath=$(echo $groupId | tr . / )
if [ -z "$CLASSIFIER" ]; then
=====================================
src/main/bin/mh_linkrepojar
=====================================
@@ -63,14 +63,14 @@ POM="${ARGV[0]}"
DH_OPTS="${VERBOSE:+-v} ${NOACT:+-n}"
CLEAN_ARGS="--package=${PACKAGE} ${RULES:+--rules=$RULES}"
-mkdir -p debian/.mh 2> /dev/null
+mkdir -p debian/.debhelper/.mh 2> /dev/null
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
- echo -e "\tmh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.mh/pom.xml debian/.mh/pom.properties"
+ echo -e "\tmh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.debhelper/.mh/pom.xml debian/.debhelper/.mh/pom.properties"
fi
-mh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.mh/pom.xml debian/.mh/pom.properties
-source debian/.mh/pom.properties
+mh_cleanpom $DH_OPTS $CLEAN_ARGS $POM debian/.debhelper/.mh/pom.xml debian/.debhelper/.mh/pom.properties
+source debian/.debhelper/.mh/pom.properties
groupPath=$(echo $groupId | tr . / )
=====================================
src/main/share/jh_maven_repo_helper.pm
=====================================
@@ -9,6 +9,5 @@ use Debian::Debhelper::Dh_Lib;
insert_after("jh_depends", "mh_installpoms");
insert_after("mh_installpoms", "mh_linkjars");
add_command_options("mh_linkjars", "--skip-clean-poms");
-insert_before("dh_clean", "mh_clean");
1;
=====================================
src/main/share/maven_repo_helper.pm
=====================================
@@ -6,6 +6,5 @@ use Debian::Debhelper::Dh_Lib;
# dh $@ --with maven_repo_helper
insert_after("dh_install", "mh_install");
-insert_before("dh_clean", "mh_clean");
1;
View it on GitLab: https://salsa.debian.org/java-team/maven-repo-helper/-/compare/f767bba1c8f9397e05723f31e85859d971c0fe6a...9e6fc1e38a8f322bd85359d0205f3dfdb5c0452a
--
View it on GitLab: https://salsa.debian.org/java-team/maven-repo-helper/-/compare/f767bba1c8f9397e05723f31e85859d971c0fe6a...9e6fc1e38a8f322bd85359d0205f3dfdb5c0452a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220523/4ae2bced/attachment.htm>
More information about the pkg-java-commits
mailing list