[libxml-security-java] 30/32: Enabled the OSGi metadata

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libxml-security-java.

commit 5d56416c2a60fa6146dcee3e3dd5c07deaf995d8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Apr 29 01:36:30 2016 +0200

    Enabled the OSGi metadata
---
 debian/changelog                                  |  1 +
 debian/control                                    |  1 +
 debian/maven.ignoreRules                          |  1 -
 debian/patches/0001-change-packaging-to-jar.patch | 14 --------------
 debian/patches/series                             |  1 -
 5 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c3deec..1971d4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libxml-security-java (1.5.6-2) UNRELEASED; urgency=medium
 
   * Build with the DH sequencer instead of CDBS
+  * Enabled the OSGi metadata
   * Moved the package to Git
   * Removed Niels Thykier from the uploaders (Closes: #770585)
   * Updated debian/watch to track the latest releases
diff --git a/debian/control b/debian/control
index d0dc59f..5dcd5bc 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends-Indep: libmaven-dependency-plugin-java,
  default-jdk-doc,
  libcommons-logging-java-doc,  
  libxalan2-java-doc,
+ libmaven-bundle-plugin-java,
  libmaven-javadoc-plugin-java,
  libbcprov-java
 Standards-Version: 3.9.8
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index b59e079..434c573 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -14,5 +14,4 @@
 # from the POM
 #   junit junit jar s/3\\..*/3.x/
 
-org.apache.felix maven-bundle-plugin * * * *
 org.apache.maven.plugins maven-release-plugin * * * *
diff --git a/debian/patches/0001-change-packaging-to-jar.patch b/debian/patches/0001-change-packaging-to-jar.patch
deleted file mode 100644
index 9fbb979..0000000
--- a/debian/patches/0001-change-packaging-to-jar.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Tue, 30 Aug 2011 13:59:54 +0200
-Subject: [PATCH] change packaging to jar
---- a/pom.xml
-+++ b/pom.xml
-@@ -20,7 +20,7 @@
-     <modelVersion>4.0.0</modelVersion>
-     <groupId>org.apache.santuario</groupId>
-     <artifactId>xmlsec</artifactId>
--    <packaging>bundle</packaging>
-+    <packaging>jar</packaging>
-     <name>Apache XML Security for Java</name>
-     <version>1.5.6</version>
-     <description>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 73c6e3d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-change-packaging-to-jar.patch

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