[excalibur-logger] 08/29: revert broken pom change

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository excalibur-logger.

commit 1f45c40dc6d83b0816001f87b485e46e2de8b740
Author: Torsten Werner <twerner at debian.org>
Date:   Thu Sep 15 09:43:43 2011 +0000

    revert broken pom change
---
 debian/changelog                     | 1 -
 debian/control                       | 2 +-
 debian/libexcalibur-logger-java.poms | 1 -
 debian/pom.xml                       | 6 ------
 debian/rules                         | 5 ++---
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dbfd3b4..a9e968d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ excalibur-logger (2.1-4) unstable; urgency=low
 
   UNRELEASED
   * Team upload.
-  * Add pom.xml and use maven-repo-helper for installation.
   * Disable cdbs' simple patchsys. We don't ship patches anyway.
   * Switch to source format 3.0.
   * Switch to debhelper level 7.
diff --git a/debian/control b/debian/control
index f269573..355d772 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>
 Build-Depends: debhelper (>= 7), cdbs, ant
-Build-Depends-Indep: default-jdk, libavalon-framework-java, libexcalibur-logkit-java, libjboss-j2ee-java, libgnumail-java, liblog4j1.2-java, libservlet2.4-java, libxalan2-java, maven-repo-helper
+Build-Depends-Indep: default-jdk, libavalon-framework-java, libexcalibur-logkit-java, libjboss-j2ee-java, libgnumail-java, liblog4j1.2-java, libservlet2.4-java, libxalan2-java
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/excalibur-logger/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/excalibur-logger/
diff --git a/debian/libexcalibur-logger-java.poms b/debian/libexcalibur-logger-java.poms
deleted file mode 100644
index 1a7e280..0000000
--- a/debian/libexcalibur-logger-java.poms
+++ /dev/null
@@ -1 +0,0 @@
-debian/pom.xml
diff --git a/debian/pom.xml b/debian/pom.xml
deleted file mode 100644
index 655dbc2..0000000
--- a/debian/pom.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>logkit</groupId>
-  <artifactId>logkit</artifactId>
-  <version>2.0</version>
-</project>
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 1241804..baff83b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,8 @@ DEB_JARS	:= avalon-framework excalibur-logkit geronimo-jms-1.1-spec gnumail.jar
 DEB_ANT_ARGS	:= -Dnoget=true -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
 
 install/libexcalibur-logger-java::
-	mh_installpoms -plibexcalibur-logger-java -e$(DEB_UPSTREAM_VERSION)
-	mh_installjar -plibexcalibur-logger-java -e$(DEB_UPSTREAM_VERSION) -l \
-          debian/pom.xml target/excalibur-logger-${DEB_UPSTREAM_VERSION}.jar
+	dh_install target/excalibur-logger-${DEB_UPSTREAM_VERSION}.jar usr/share/java/
+	dh_link usr/share/java/excalibur-logger-${DEB_UPSTREAM_VERSION}.jar usr/share/java/excalibur-logger.jar
 
 get-orig-source:
 	uscan --force-download --rename

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