[pkg-java] r14909 - trunk/excalibur-logger/debian

[Torsten Werner]

Author: twerner
Date: 2011-09-15 09:43:43 +0000 (Thu, 15 Sep 2011)
New Revision: 14909

Removed:
   trunk/excalibur-logger/debian/libexcalibur-logger-java.poms
   trunk/excalibur-logger/debian/pom.xml
Modified:
   trunk/excalibur-logger/debian/changelog
   trunk/excalibur-logger/debian/control
   trunk/excalibur-logger/debian/rules
Log:
revert broken pom change


Modified: trunk/excalibur-logger/debian/changelog
===================================================================
--- trunk/excalibur-logger/debian/changelog	2011-09-15 08:51:54 UTC (rev 14908)
+++ trunk/excalibur-logger/debian/changelog	2011-09-15 09:43:43 UTC (rev 14909)
@@ -2,7 +2,6 @@
 
   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.

Modified: trunk/excalibur-logger/debian/control
===================================================================
--- trunk/excalibur-logger/debian/control	2011-09-15 08:51:54 UTC (rev 14908)
+++ trunk/excalibur-logger/debian/control	2011-09-15 09:43:43 UTC (rev 14909)
@@ -4,7 +4,7 @@
 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/

Deleted: trunk/excalibur-logger/debian/libexcalibur-logger-java.poms
===================================================================
--- trunk/excalibur-logger/debian/libexcalibur-logger-java.poms	2011-09-15 08:51:54 UTC (rev 14908)
+++ trunk/excalibur-logger/debian/libexcalibur-logger-java.poms	2011-09-15 09:43:43 UTC (rev 14909)
@@ -1 +0,0 @@
-debian/pom.xml

Deleted: trunk/excalibur-logger/debian/pom.xml
===================================================================
--- trunk/excalibur-logger/debian/pom.xml	2011-09-15 08:51:54 UTC (rev 14908)
+++ trunk/excalibur-logger/debian/pom.xml	2011-09-15 09:43:43 UTC (rev 14909)
@@ -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

Modified: trunk/excalibur-logger/debian/rules
===================================================================
--- trunk/excalibur-logger/debian/rules	2011-09-15 08:51:54 UTC (rev 14908)
+++ trunk/excalibur-logger/debian/rules	2011-09-15 09:43:43 UTC (rev 14909)
@@ -8,9 +8,8 @@
 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