Author: ludovicc-guest
Date: 2009-07-02 12:23:07 +0000 (Thu, 02 Jul 2009)
New Revision: 8770
Added:
trunk/libcommons-logging-java/debian/libcommons-logging-java.poms
trunk/libcommons-logging-java/debian/maven.publishedRules
trunk/libcommons-logging-java/debian/maven.rules
Modified:
trunk/libcommons-logging-java/debian/copyright
trunk/libcommons-logging-java/debian/rules
Log:
* New version
Modified: trunk/libcommons-logging-java/debian/copyright
===================================================================
--- trunk/libcommons-logging-java/debian/copyright 2009-07-02 12:07:30 UTC
(rev 8769)
+++ trunk/libcommons-logging-java/debian/copyright 2009-07-02 12:23:07 UTC
(rev 8770)
@@ -16,16 +16,16 @@
Dennis Lundberg <[email protected]>,
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 <[email protected]>
- © 2005 - 2007, Arnaud Vandyck <[email protected]>,
Wolfgang Baer <[email protected]>
- © 2007, Michael Koch, <[email protected]>, Varun Hiremath
<[email protected]>,
+Debian packaging: Copyright 2001 - 2004, Takashi Okamoto <[email protected]>
+ Copyright 2005 - 2007, Arnaud Vandyck
<[email protected]>, Wolfgang Baer <[email protected]>
+ Copyright 2007, Michael Koch, <[email protected]>, Varun
Hiremath <[email protected]>,
Kumar Appaiah <[email protected]>
The Debian packaging of this package is licensed under the Apache
Added: trunk/libcommons-logging-java/debian/libcommons-logging-java.poms
===================================================================
--- trunk/libcommons-logging-java/debian/libcommons-logging-java.poms
(rev 0)
+++ trunk/libcommons-logging-java/debian/libcommons-logging-java.poms
2009-07-02 12:23:07 UTC (rev 8770)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: trunk/libcommons-logging-java/debian/maven.publishedRules
===================================================================
--- trunk/libcommons-logging-java/debian/maven.publishedRules
(rev 0)
+++ trunk/libcommons-logging-java/debian/maven.publishedRules 2009-07-02
12:23:07 UTC (rev 8770)
@@ -0,0 +1,2 @@
+# force using commons-logging instead of only the api
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/
Added: trunk/libcommons-logging-java/debian/maven.rules
===================================================================
--- trunk/libcommons-logging-java/debian/maven.rules
(rev 0)
+++ trunk/libcommons-logging-java/debian/maven.rules 2009-07-02 12:23:07 UTC
(rev 8770)
@@ -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/
+
Modified: trunk/libcommons-logging-java/debian/rules
===================================================================
--- trunk/libcommons-logging-java/debian/rules 2009-07-02 12:07:30 UTC (rev
8769)
+++ trunk/libcommons-logging-java/debian/rules 2009-07-02 12:23:07 UTC (rev
8770)
@@ -4,16 +4,30 @@
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
+
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
