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 c9b0cd503866ccb2df69e268fe3da426583371ae Author: Niels Thykier <[email protected]> Date: Sat Nov 28 08:14:27 2009 +0000 libcommons-logging-java (1.1.1-6) UNRELEASED; urgency=low * Added myself to uploaders. * Imported patch from Fedora to add OSGi metadata. (Closes: #558183) * Switched to quilt patch system. * Made debian/rules respect errors in the clean target. -- Niels Thykier <[email protected]> Sat, 28 Nov 2009 09:06:51 +0100 --- debian/changelog | 9 +++++++++ debian/control | 6 ++++-- debian/patches/05_OSGi_metadata.patch | 18 ++++++++++++++++++ debian/patches/series | 5 +++++ debian/rules | 6 +++--- 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2b17a94..7ea834b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libcommons-logging-java (1.1.1-6) UNRELEASED; urgency=low + + * Added myself to uploaders. + * Imported patch from Fedora to add OSGi metadata. (Closes: #558183) + * Switched to quilt patch system. + * Made debian/rules respect errors in the clean target. + + -- Niels Thykier <[email protected]> Sat, 28 Nov 2009 09:06:51 +0100 + libcommons-logging-java (1.1.1-5) unstable; urgency=low * Build-Depends on libservlet2.5-java instead of libservlet2.3-java. diff --git a/debian/control b/debian/control index 84e7457..9b01e3e 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,10 @@ Source: libcommons-logging-java Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]>, Kumar Appaiah <[email protected]>, Varun Hiremath <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional +Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]>, + Kumar Appaiah <[email protected]>, Varun Hiremath <[email protected]>, + Niels Thykier <[email protected]> +Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional, quilt Build-Depends-Indep: maven-repo-helper, liblogkit-java, liblog4j1.2-java, junit, libservlet2.5-java Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-logging-java diff --git a/debian/patches/05_OSGi_metadata.patch b/debian/patches/05_OSGi_metadata.patch new file mode 100644 index 0000000..1a8515a --- /dev/null +++ b/debian/patches/05_OSGi_metadata.patch @@ -0,0 +1,18 @@ +Description: Adds OSGi metadata to the jar file. +Origin: Fedora + +--- a/src/conf/MANIFEST.MF 2006-08-10 18:13:20.000000000 -0400 ++++ b/src/conf/MANIFEST.MF 2007-07-11 13:19:50.000000000 -0400 +@@ -7,3 +7,12 @@ + Implementation-Vendor-Id: org.apache + Implementation-Vendor: Apache Software Foundation + Implementation-Version: 1.1.1 ++Bundle-ManifestVersion: 2 ++Export-Package: org.apache.commons.logging;version="1.0.4",org.apache. ++ commons.logging.impl;version="1.0.4" ++Bundle-Version: 1.0.4.v20080605-1930 ++Bundle-SymbolicName: org.apache.commons.logging ++Bundle-Name: Apache Commons Logging Plug-in ++Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 ++Bundle-Localization: plugin ++Bundle-Vendor: Apache Software Foundation diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..016dcae --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,5 @@ +01_target13_BuildXml.patch +02_build_javadoc.patch +03_disable_securityallow_test.patch +04_fix_jarname.patch +05_OSGi_metadata.patch diff --git a/debian/rules b/debian/rules index 8b88552..4c343b9 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ 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 +include /usr/share/cdbs/1/rules/patchsys-quilt.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) @@ -19,14 +19,14 @@ 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. + # 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 + 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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
