This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjaxp1.3-java.
commit 494c1afe3ef532da001aff464c901169b1c2d2cc Author: Jakub Adam <[email protected]> Date: Tue Nov 15 22:48:29 2011 +0000 Use jh_manifest from javahelper to embed OSGi metadata --- debian/control | 3 +- debian/manifest | 7 +++++ debian/patches/add-osgi-metadata.patch | 50 ---------------------------------- debian/patches/series | 1 - debian/rules | 1 + 5 files changed, 10 insertions(+), 52 deletions(-) diff --git a/debian/control b/debian/control index 4893e44..6b14a57 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,8 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Matthias Klose <[email protected]>, Michael Koch <[email protected]>, Jakub Adam <[email protected]> -Build-Depends: cdbs, debhelper (>= 7), default-jdk-builddep, maven-repo-helper +Build-Depends: cdbs, debhelper (>= 7), default-jdk-builddep, maven-repo-helper, + javahelper Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjaxp1.3-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjaxp1.3-java diff --git a/debian/manifest b/debian/manifest new file mode 100644 index 0000000..0562e4e --- /dev/null +++ b/debian/manifest @@ -0,0 +1,7 @@ +usr/share/java/xml-apis.jar: + Bundle-ManifestVersion: 2 + Bundle-Name: Java XML parser and transformer APIs + Bundle-Version: 1.3 + Bundle-SymbolicName: javax.xml + Export-Package: javax.xml;version="1.3",javax.xml.namespace;version="1.3",javax.xml.transform;version="1.3",javax.xml.transform.stream;version="1.3",javax.xml.transform.dom;version="1.3",javax.xml.transform.sax;version="1.3",javax.xml.datatype;version="1.3",javax.xml.xpath;version="1.3",javax.xml.parsers;version="1.3",javax.xml.validation;version="1.3",org.xml.sax;version="2.0.2",org.xml.sax.ext;version="2.0.2",org.xml.sax.helpers;version="2.0.2",org.w3c.css.sac;version="1.0",org.w3c.do [...] + diff --git a/debian/patches/add-osgi-metadata.patch b/debian/patches/add-osgi-metadata.patch deleted file mode 100644 index fd90050..0000000 --- a/debian/patches/add-osgi-metadata.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Jakub Adam <[email protected]> -Date: Sun, 16 Oct 2011 22:09:36 +0200 -Subject: add-osgi-metadata - ---- - manifest.commons | 31 +++++++++++++++++++++++++++++++ - 1 files changed, 31 insertions(+), 0 deletions(-) - -diff --git a/manifest.commons b/manifest.commons -index 9718474..082c4fa 100644 ---- a/manifest.commons -+++ b/manifest.commons -@@ -1,5 +1,36 @@ - Manifest-Version: 1.0 - Created-By: 1.3.1 (IBM Corporation) -+Bundle-ManifestVersion: 2 -+Bundle-Name: Java XML parser and transformer APIs -+Bundle-Version: 1.3 -+Bundle-SymbolicName: javax.xml -+Export-Package: javax.xml;version="1.3", -+ javax.xml.namespace;version="1.3", -+ javax.xml.transform;version="1.3", -+ javax.xml.transform.stream;version="1.3", -+ javax.xml.transform.dom;version="1.3", -+ javax.xml.transform.sax;version="1.3", -+ javax.xml.datatype;version="1.3", -+ javax.xml.xpath;version="1.3", -+ javax.xml.parsers;version="1.3", -+ javax.xml.validation;version="1.3", -+ org.xml.sax;version="2.0.2", -+ org.xml.sax.ext;version="2.0.2", -+ org.xml.sax.helpers;version="2.0.2", -+ org.w3c.css.sac;version="1.0", -+ org.w3c.dom;version="1.0", -+ org.w3c.dom.html;version="1.0", -+ org.w3c.dom.traversal;version="1.0", -+ org.w3c.dom.css;version="1.0", -+ org.w3c.dom.svg;version="1.0", -+ org.w3c.dom.ls;version="1.0", -+ org.w3c.dom.stylesheet;version="1.0", -+ org.w3c.dom.events;version="1.0", -+ org.w3c.dom.ranges;version="1.0", -+ org.w3c.dom.xpath;version="1.0", -+ org.w3c.dom.bootstrap;version="1.0", -+ org.w3c.dom.views;version="1.0", -+ org.w3c.dom.smil;version="1.0" - - Name: org/apache/xmlcommons/Version - Comment: XmlCommonsExternal for http://xml.apache.org/ subproject's use --- diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index aa38e5d..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -add-osgi-metadata.patch diff --git a/debian/rules b/debian/rules index 0a0db85..b1b6005 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ # debian/rules file for libjaxp1.3-java (uses cdbs) include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/javahelper.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjaxp1.3-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
