[lucene4.10] 23/24: Fixed debian/install-poms.sh; use dh_install with --fail-missing

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository lucene4.10.

commit a128a63093426da7595321b1587d7ed2282ca3b8
Author: Hilko Bengen <bengen at debian.org>
Date:   Sun Nov 9 12:08:13 2014 +0100

    Fixed debian/install-poms.sh; use dh_install with --fail-missing
---
 debian/install-poms.sh | 40 +++++++++++++++++++---------------------
 debian/rules           |  3 +++
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/debian/install-poms.sh b/debian/install-poms.sh
index 777ef66..12af63d 100755
--- a/debian/install-poms.sh
+++ b/debian/install-poms.sh
@@ -3,27 +3,24 @@
 set -e
 
 VERSION=$1
-MAJOR=$(echo $VERSION | sed 's/\..*/.x/')
-LOCAL_REPO=$(pwd)/debian/tmp/usr/share/maven-repo
+MAJOR=$(echo $VERSION | sed 's,\(.*\)\.[0-9]$,\1.x,')
+USJ=$(pwd)/debian/tmp/usr/share/java
+USMR=$(pwd)/debian/tmp/usr/share/maven-repo
 
-rm -rf $LOCAL_REPO
-/usr/share/maven-debian-helper/copy-repo.sh $(dirname $LOCAL_REPO)
-# Make sure we don't pull in any previous Lucene versions
-rm -rf $LOCAL_REPO/org/apache/lucene
-
-mkdir -p debian/tmp/usr/share/java
+rm -rf $USMR
+mkdir -p $USJ $USMR
 
 find build -name 'lucene-*.jar' |
-tee -a /dev/stderr |
-while read file; do
-    basename=$(basename $file)
-    artifact=$(basename $file -$VERSION.jar)
-
-    install -m644 $file debian/tmp/usr/share/java/
+    while read file; do
+        basename=$(basename $file)
+        artifact=$(basename $file -$VERSION.jar)
 
-    for version in $VERSION $MAJOR; do
-        mkdir -p debian/tmp/usr/share/maven-repo/org/apache/lucene/$artifact/$version
-        echo "\
+        echo "$0: installing file"
+        install -m644 $file $USJ
+        for version in $VERSION $MAJOR; do
+            echo "$0: generating POM for $artifact/$version"
+            mkdir -p $USMR/org/apache/lucene/$artifact/$version
+            echo "\
 <?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <project xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\" xmlns=\"http://maven.apache.org/POM/4.0.0\"
     xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">
@@ -34,8 +31,9 @@ while read file; do
   <description>dummy POM</description>
   <packaging>jar</packaging>
 </project>\
-" > debian/tmp/usr/share/maven-repo/org/apache/lucene/$artifact/$version/$artifact-$version.pom
-        ln -rs debian/tmp/usr/share/java/$basename \
-            debian/tmp/usr/share/maven-repo/org/apache/lucene/$artifact/$version/$artifact-$version.jar
+" \
+                 > $USMR/org/apache/lucene/$artifact/$version/$artifact-$version.pom
+            ln -rs $USJ/$basename \
+               $USMR/org/apache/lucene/$artifact/$version/$artifact-$version.jar
+        done
     done
-done
diff --git a/debian/rules b/debian/rules
index 3248c6d..26bb93a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,3 +25,6 @@ override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf debian/_ivy
 	find -path \*/lib/\*.jar | xargs -r rm -f
+
+override_dh_install:
+	dh_install --fail-missing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene4.10.git