[libjtds-java] 01/01: Remove redundancy with maven helpers.

Martín Ferrari tincho at alioth.debian.org
Fri Aug 2 16:18:51 UTC 2013


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

tincho pushed a commit to branch master
in repository libjtds-java.

commit 77e66e11d74b9115bbe8ce9c8e56c95753b830d7
Author: Martín Ferrari <tincho at debian.org>
Date:   Fri Aug 2 16:14:03 2013 +0000

    Remove redundancy with maven helpers.
---
 debian/libjtds-java.poms |   28 ----------------------------
 debian/rules             |    6 ++----
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/debian/libjtds-java.poms b/debian/libjtds-java.poms
deleted file mode 100644
index 1d885c3..0000000
--- a/debian/libjtds-java.poms
+++ /dev/null
@@ -1,28 +0,0 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-#   --ignore: ignore this POM and its artifact if any
-#   --ignore-pom: don't install the POM. To use on POM files that are created
-#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
-#   --no-parent: remove the <parent> tag from the POM
-#   --package=<package>: an alternative package to use when installing this POM
-#      and its artifact
-#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-#      of the version for the package.
-#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
-#      during a clean operation with mh_cleanpom or mh_installpom
-#   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install. [mh_install]
-#   --java-lib: install the jar into /usr/share/java to comply with Debian
-#      packaging guidelines
-#   --usj-name=<name>: name to use when installing the library in /usr/share/java
-#   --usj-version=<version>: version to use when installing the library in /usr/share/java
-#   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar.
-#     It will be installed with mh_install. [mh_install]
-#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
-#     Empty by default. [mh_install]
-#
-pom.xml --has-package-version --java-lib
diff --git a/debian/rules b/debian/rules
index 1d0f6db..5937779 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 export JAVA_HOME=/usr/lib/jvm/default-java
 export CLASSPATH=/usr/share/java/jcifs.jar
 
-VERSION := $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9\.]+).*/\1/p')
-
 %:
 	dh $@ --with javahelper
 
@@ -17,5 +15,5 @@ override_dh_auto_build:
 	dh_auto_build -- -f debian/build.xml -Dcurdir=$(CURDIR) dist
 
 override_dh_auto_install:
-	mh_installpoms -plibjtds-java
-	mh_installjar -plibjtds-java pom.xml --java-lib dist/jtds-$(VERSION).jar
+	mh_installpom -plibjtds-java --has-package-version pom.xml
+	mh_installjar -plibjtds-java --java-lib pom.xml dist/jtds-*.jar

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



More information about the pkg-java-commits mailing list