[libcommons-logging-java] 19/66: * New version

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libcommons-logging-java.

commit 9badf78f8e4a6a1af6f5af0677887cfcf0bf3ef2
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Thu Jul 2 12:23:07 2009 +0000

    * New version
---
 debian/copyright                    |  8 ++++----
 debian/libcommons-logging-java.poms |  1 +
 debian/maven.publishedRules         |  2 ++
 debian/maven.rules                  |  5 +++++
 debian/rules                        | 36 +++++++++++++++++++++++++-----------
 5 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 185f406..3456c4f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,16 +16,16 @@ Upstream Authors: Morgan Delagrange <morgand at apache.org>,
                   Dennis Lundberg <dennisl at apache.org>,
                   Brian Stansberry
 
-Copyright: © 2001-2008 The Apache Software Foundation
+Copyright: 2001-2008 The Apache Software Foundation
 
 License: Apache 2.0
 
 On Debian systems the full text of the Apache License can be found
 in `/usr/share/common-licenses/Apache-2.0'.
 
-Debian packaging: © 2001 - 2004, Takashi Okamoto <tora at debian.org>
-       		  © 2005 - 2007, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-		  © 2007, Michael Koch, <konqueror at gmx.de>, Varun Hiremath <varun at debian.org>,
+Debian packaging: Copyright 2001 - 2004, Takashi Okamoto <tora at debian.org>
+       		  Copyright 2005 - 2007, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+		  Copyright 2007, Michael Koch, <konqueror at gmx.de>, Varun Hiremath <varun at debian.org>,
 		  Kumar Appaiah <akumar at debian.org>
 
 The Debian packaging of this package is licensed under the Apache
diff --git a/debian/libcommons-logging-java.poms b/debian/libcommons-logging-java.poms
new file mode 100644
index 0000000..43e746b
--- /dev/null
+++ b/debian/libcommons-logging-java.poms
@@ -0,0 +1 @@
+pom.xml --no-parent
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..4bc0edf
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1,2 @@
+# force using commons-logging instead of only the api
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..23c7cc0
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,5 @@
+junit junit jar s/3\..*/3.x/
+log4j log4j jar s/1\.2\..*/1.2.x/
+# force using servlet 2.5
+javax.servlet * * s/.*/2.5/
+
diff --git a/debian/rules b/debian/rules
index 9660589..5d01787 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,16 +4,30 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME		 := /usr/lib/jvm/default-java
-ANT_HOME	 	 := /usr/share/ant
-DEB_ANT_BUILD_TARGET	 := dist
-DEB_JARS		 := commons-logging log4j-1.2 logkit avalon-framework servlet-2.3 junit ant-junit
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME		     := /usr/lib/jvm/default-java
+DEB_ANT_BUILD_TARGET := dist
+DEB_JARS		     := commons-logging log4j-1.2 logkit avalon-framework servlet-2.3 junit ant-junit
 
-install/libcommons-logging-java::
-	dh_install target/commons-logging-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_link usr/share/java/commons-logging-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-logging.jar
-	dh_install target/commons-logging-adapters-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_link usr/share/java/commons-logging-adapters-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-logging-adapters.jar
-	dh_install target/commons-logging-api-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_link usr/share/java/commons-logging-api-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-logging-api.jar
+makebuilddir/lib$(PACKAGE)-java::
+	# copy MANIFEST.MF to src/main/resources/META-INF/ to include it in the jar
+	install -d src/main/resources/META-INF/
+	install -m644 src/main/conf/MANIFEST.MF src/main/resources/META-INF/
+
+binary-post-install/$(PACKAGE)::
+	mh_installpoms -p$(PACKAGE)
+	mh_installjar -p$(PACKAGE) -l pom.xml target/commons-logging-$(VERSION).jar
+	# commons-logging-api and commons-logging-adapters have either no POMs or an old version of
+    # a POM file. Don't install them in the Maven repository for now.
+	dh_install target/commons-logging-api-$(VERSION).jar usr/share/java
+	dh_link usr/share/java/commons-logging-api-$(VERSION).jar usr/share/java/commons-logging-api.jar
+	dh_install target/commons-logging-adapters-$(VERSION).jar usr/share/java
+	dh_link usr/share/java/commons-logging-adapters-$(VERSION).jar usr/share/java/commons-logging-adapters.jar
+
+clean::
+	-rm -rf debian/tmp
+
+get-orig-source:
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 

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