Author: ludovicc-guest
Date: 2009-07-20 16:32:51 +0000 (Mon, 20 Jul 2009)
New Revision: 9380
Modified:
trunk/maven-repo-helper/debian/changelog
trunk/maven-repo-helper/src/main/bin/mh_installjar
trunk/maven-repo-helper/src/main/bin/mh_installpom
Log:
Use install instead of dh_install in the scripts as it can
interfer if there is a .install file in the debian folder.
Modified: trunk/maven-repo-helper/debian/changelog
===================================================================
--- trunk/maven-repo-helper/debian/changelog 2009-07-17 21:32:52 UTC (rev
9379)
+++ trunk/maven-repo-helper/debian/changelog 2009-07-20 16:32:51 UTC (rev
9380)
@@ -4,7 +4,9 @@
the Maven repository (as suggested by Marcus Better)
* Add a new script, mh_linkjar, which creates links to the jar into
/usr/share/maven-repo. Unlike mh_installjar, it does not copy the
- jar into the build directory.
+ jar into the build directory.
+ * Use install instead of dh_install in the scripts as it can
+ interfer if there is a .install file in the debian folder.
-- Ludovic Claude <[email protected]> Thu, 16 Jul 2009 10:09:26
+0100
Modified: trunk/maven-repo-helper/src/main/bin/mh_installjar
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_installjar 2009-07-17 21:32:52 UTC
(rev 9379)
+++ trunk/maven-repo-helper/src/main/bin/mh_installjar 2009-07-20 16:32:51 UTC
(rev 9380)
@@ -134,6 +134,10 @@
local destDir=$3
local destJar=$4
+ if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
+ echo "mh_installjar: Install $srcDir $srcJar to $destDir
$destJar"
+ fi
+
if [[ ("$destDir" == "$TARGET_DIR") && ("$destJar" == "$TARGET_JAR")
]]; then
# avoid duplication as install_jar is called twice
if [[ -n "$JAR_INSTALLED" ]]; then
@@ -141,9 +145,10 @@
fi
cp ${srcJar} debian/tmp/${destJar}
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
- echo -e "\tdh_install $DH_OPTS -p${PACKAGE}
--sourcedir=debian/tmp ${destJar} ${destDir}"
+ echo -e "\tinstall -m 644 -D ${srcJar}
debian/${PACKAGE}/${destDir}/${destJar}"
fi
- dh_install $DH_OPTS -p${PACKAGE} --sourcedir=debian/tmp
${destJar} ${destDir}
+ install -m 644 -D ${srcJar}
debian/${PACKAGE}/${destDir}/${destJar}
+
JAR_INSTALLED=done
else
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
Modified: trunk/maven-repo-helper/src/main/bin/mh_installpom
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_installpom 2009-07-17 21:32:52 UTC
(rev 9379)
+++ trunk/maven-repo-helper/src/main/bin/mh_installpom 2009-07-20 16:32:51 UTC
(rev 9380)
@@ -70,17 +70,15 @@
mv debian/tmp/pom.xml debian/tmp/${artifactId}-${debianVersion}.pom
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
- echo -e "\tdh_install $DH_OPTS -p${PACKAGE} --sourcedir=debian/tmp
${artifactId}-${version}.pom
usr/share/maven-repo/${groupPath}/${artifactId}/${version}"
+ echo -e "\tinstall -m 644 -D debian/tmp/${artifactId}-${version}.pom
debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${version}/${artifactId}-${version}.pom"
fi
-dh_install $DH_OPTS -p${PACKAGE} --sourcedir=debian/tmp
${artifactId}-${version}.pom \
- usr/share/maven-repo/${groupPath}/${artifactId}/${version}
+install -m 644 -D debian/tmp/${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 "\tdh_install $DH_OPTS -p${PACKAGE} --sourcedir=debian/tmp
${artifactId}-${debianVersion}.pom
usr/share/maven-repo/${groupPath}/${artifactId}/${debianVersion}"
+ echo -e "\tinstall -m 644 -D
debian/tmp/${artifactId}-${debianVersion}.pom
debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${debianVersion}/${artifactId}-${debianVersion}.pom"
fi
- dh_install $DH_OPTS -p${PACKAGE} --sourcedir=debian/tmp
${artifactId}-${debianVersion}.pom \
- usr/share/maven-repo/${groupPath}/${artifactId}/${debianVersion}
+ install -m 644 -D debian/tmp/${artifactId}-${debianVersion}.pom
debian/${PACKAGE}/usr/share/maven-repo/${groupPath}/${artifactId}/${debianVersion}/${artifactId}-${debianVersion}.pom
fi
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
