[jackson-datatype-joda] 04/05: Depend on libreplacer-java and removed debian/replace-generate.sh

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jackson-datatype-joda.

commit 7b77946d4c3972ae389d241467d23cebaaf7f4c2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 19 11:57:48 2016 +0100

    Depend on libreplacer-java and removed debian/replace-generate.sh
---
 debian/changelog           |  1 +
 debian/control             |  1 +
 debian/maven.ignoreRules   |  1 -
 debian/replace-generate.sh | 34 ----------------------------------
 debian/rules               | 15 ---------------
 5 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3bd259..91a8465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jackson-datatype-joda (2.8.5-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Depend on libjackson2-{core,annotations,databind}-java (>= 2.8.5)
+  * Depend on libreplacer-java and removed debian/replace-generate.sh
   * Switch to debhelper level 10
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 19 Dec 2016 10:40:47 +0100
diff --git a/debian/control b/debian/control
index 3b153b5..21ea15e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 10),
                libjoda-time-java,
                libmaven-bundle-plugin-java,
                libmaven-javadoc-plugin-java,
+               libreplacer-java,
                maven-debian-helper,
                xmlstarlet
 Standards-Version: 3.9.8
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index ca35932..e69de29 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1 +0,0 @@
-com.google.code.maven-replacer-plugin replacer * * * *
diff --git a/debian/replace-generate.sh b/debian/replace-generate.sh
deleted file mode 100644
index e87bb49..0000000
--- a/debian/replace-generate.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# Simple replacement for mavan-replacer-plugin
-
-set -e
-
-TARGET=$1; shift
-
-TEMPLATE=$TARGET.in
-
-get_attr() {
-    < pom.xml xmlstarlet sel \
-        -N pom=http://maven.apache.org/POM/4.0.0 \
-        -T -t -v $1
-}
-
-package=$(dirname $TARGET | sed -e 's,.*src/main/java/\(.*\)$,\1,' | tr / .)
-projectversion=$(get_attr '/pom:project/pom:version')
-projectgroupid=$(get_attr '/pom:project/pom:groupId')
-projectartifactid=$(get_attr '/pom:project/pom:artifactId')
-
-sed \
-    -e "s, at package@,$package,g" \
-    -e "s, at projectversion@,$projectversion,g" \
-    -e "s, at projectgroupid@,$projectgroupid,g" \
-    -e "s, at projectartifactid@,$projectartifactid,g" \
-    < $TEMPLATE > $TARGET.t
-
-if grep -i '@[a-z]*@' $TARGET.t >&2; then
-    echo 'Not all tags were
-    replaced' >&2 exit 1
-fi
-
-mv $TARGET.t $TARGET
diff --git a/debian/rules b/debian/rules
index 4463d1a..af66655 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,7 @@
 #!/usr/bin/make -f
 
-#export DH_VERSION=1
-
-VERSION_FILE=src/main/java/com/fasterxml/jackson/datatype/joda/PackageVersion.java
-export JAVA_HOME=/usr/lib/jvm/default-java
-export TZ=GMT
-export LANG=C
-
 %:
 	dh $@ --with javahelper
 
-override_dh_auto_configure:
-	sh debian/replace-generate.sh $(VERSION_FILE)
-	dh_auto_configure
-
-override_dh_auto_clean:
-	rm -f $(VERSION_FILE)
-	dh_auto_clean
-
 override_dh_installchangelogs:
 	dh_installchangelogs release-notes/VERSION

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-datatype-joda.git