Author: ludovicc-guest Date: 2009-07-02 22:42:40 +0000 (Thu, 02 Jul 2009) New Revision: 8811
Added: trunk/libslf4j-java/debian/libslf4j-java.poms trunk/libslf4j-java/debian/maven.rules Modified: trunk/libslf4j-java/debian/changelog trunk/libslf4j-java/debian/control trunk/libslf4j-java/debian/copyright trunk/libslf4j-java/debian/rules Log: * New version Modified: trunk/libslf4j-java/debian/changelog =================================================================== --- trunk/libslf4j-java/debian/changelog 2009-07-02 21:07:22 UTC (rev 8810) +++ trunk/libslf4j-java/debian/changelog 2009-07-02 22:42:40 UTC (rev 8811) @@ -1,13 +1,27 @@ -libslf4j-java (1.5.8-1.1) UNRELEASED; urgency=low +libslf4j-java (1.5.8-1.1) unstable; urgency=low + [Ludovic Claude] * Non-maintainer upload. + * Add the Maven POMs to the package + * Add a Build-Depends-Indep dependency on maven-repo-helper + * Use mh_installpom and mh_installjar to install the POM and the jar to the + Maven repository + * Fix Lintian warning: license for the Debian packaging is GPL version 2, + according to Varun Hiremath. - [ Emmanuel Bourg ] + [ Emmanuel Bourg and Sylvestre Ledru] * Update of the URLs * Rename Jakarta Commons to Apache Commons - -- Sylvestre Ledru <[email protected]> Wed, 17 Jun 2009 10:53:22 +0200 + -- Ludovic Claude <[email protected]> Thu, 02 Jul 2009 23:16:26 +0100 +libslf4j-java (1.5.8-1ubuntu1) karmic; urgency=low + + * debian/control: Set libslf4j-java runtime dependency on + "default-jre-headless | java2-runtime-headless" (LP: #387884) + + -- Thierry Carrez <[email protected]> Thu, 18 Jun 2009 15:23:25 +0200 + libslf4j-java (1.5.8-1) unstable; urgency=low * New upstream release Modified: trunk/libslf4j-java/debian/control =================================================================== --- trunk/libslf4j-java/debian/control 2009-07-02 21:07:22 UTC (rev 8810) +++ trunk/libslf4j-java/debian/control 2009-07-02 22:42:40 UTC (rev 8811) @@ -3,9 +3,9 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Varun Hiremath <[email protected]>, Damien Raude-Morvan <[email protected]> -Build-Depends: cdbs, debhelper (>= 6), ant, default-jdk-builddep -Build-Depends-Indep: liblog4j1.2-java, libcommons-logging-java, - libcommons-lang-java, libjavassist-java +Build-Depends: cdbs, debhelper (>= 6), default-jdk-builddep +Build-Depends-Indep: maven-repo-helper, ant, liblog4j1.2-java, + libcommons-logging-java, libcommons-lang-java, libjavassist-java Standards-Version: 3.8.1 Homepage: http://www.slf4j.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libslf4j-java @@ -13,7 +13,7 @@ Package: libslf4j-java Architecture: all -Depends: ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime +Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless Suggests: libjavassist-java, liblog4j1.2-java, libcommons-logging-java Description: Simple Logging Facade for Java The Simple Logging Facade for Java (or SLF4J) is intended to serve as Modified: trunk/libslf4j-java/debian/copyright =================================================================== --- trunk/libslf4j-java/debian/copyright 2009-07-02 21:07:22 UTC (rev 8810) +++ trunk/libslf4j-java/debian/copyright 2009-07-02 22:42:40 UTC (rev 8811) @@ -52,4 +52,4 @@ The Debian packaging is Copyright 2007-2009, Varun Hiremath <[email protected]> Copyright 2009, Damien Raude-Morvan <[email protected]> -and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +and is licensed under the GPL 2, see `/usr/share/common-licenses/GPL-2'. Added: trunk/libslf4j-java/debian/libslf4j-java.poms =================================================================== --- trunk/libslf4j-java/debian/libslf4j-java.poms (rev 0) +++ trunk/libslf4j-java/debian/libslf4j-java.poms 2009-07-02 22:42:40 UTC (rev 8811) @@ -0,0 +1,12 @@ +pom.xml --no-parent +jcl-over-slf4j/pom.xml +jul-to-slf4j/pom.xml +log4j-over-slf4j/pom.xml +slf4j-api/pom.xml +slf4j-nop/pom.xml +slf4j-jdk14/pom.xml +slf4j-jcl/pom.xml +slf4j-log4j12/pom.xml +slf4j-migrator/pom.xml +slf4j-simple/pom.xml + Added: trunk/libslf4j-java/debian/maven.rules =================================================================== --- trunk/libslf4j-java/debian/maven.rules (rev 0) +++ trunk/libslf4j-java/debian/maven.rules 2009-07-02 22:42:40 UTC (rev 8811) @@ -0,0 +1,2 @@ +junit junit jar s/3\..*/3.x/ +log4j log4j jar s/1\.2\..*/1.2.x/ Modified: trunk/libslf4j-java/debian/rules =================================================================== --- trunk/libslf4j-java/debian/rules 2009-07-02 21:07:22 UTC (rev 8810) +++ trunk/libslf4j-java/debian/rules 2009-07-02 22:42:40 UTC (rev 8811) @@ -1,24 +1,26 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/debhelper.mk -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILD_TARGET := jar -DEB_ANT_BUILDFILE := debian/build.xml -DEB_JARS := commons-logging log4j-1.2 +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_ANT_BUILD_TARGET := jar +DEB_ANT_BUILDFILE := debian/build.xml +DEB_JARS := commons-logging log4j-1.2 +MODULES := jcl-over-slf4j jul-to-slf4j log4j-over-slf4j slf4j-api \ + slf4j-jcl slf4j-jdk14 slf4j-log4j12 slf4j-migrator slf4j-nop slf4j-simple -ALL_JARS = $(wildcard *.jar) -DEST_DIR = $(DEB_DESTDIR)/usr/share/java - -common-install-prehook-indep:: - for jar in $(ALL_JARS); do \ - BASENAME=`basename $$jar .jar`; \ - FULLNAME=$$BASENAME-$(DEB_UPSTREAM_VERSION).jar; \ - install -m 644 -D $$jar $(DEST_DIR)/$$FULLNAME; \ - ln -s $$FULLNAME $(DEST_DIR)/$$BASENAME.jar; \ +binary-post-install/$(PACKAGE):: + mh_installpoms -p$(PACKAGE) + set -e; for MODULE in $(MODULES); do \ + mh_installjar -p$(PACKAGE) -l $$MODULE/pom.xml $$MODULE.jar; \ done +clean:: + -rm -rf debian/tmp + get-orig-source: - -uscan --upstream-version 0 --rename + -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
