[activemq-activeio] 04/07: Removed fix_osgi_metadata.diff (fixed upstream)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository activemq-activeio.

commit 65837018c206118d4f62256037312b37c2c2a617
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Mar 20 22:07:13 2016 +0100

    Removed fix_osgi_metadata.diff (fixed upstream)
---
 debian/changelog                      |  4 +++-
 debian/patches/fix_osgi_metadata.diff | 24 ------------------------
 debian/patches/series                 |  1 -
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f4afb0..1d87920 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-activemq-activeio (3.1.1-2) unstable; urgency=medium
+activemq-activeio (3.1.4-1) unstable; urgency=medium
 
   * Team upload.
 
@@ -12,6 +12,8 @@ activemq-activeio (3.1.1-2) unstable; urgency=medium
   * debian/copyright: Use Format 1.0.
 
   [ Emmanuel Bourg ]
+  * New upstream release
+    - Removed fix_osgi_metadata.diff (fixed upstream)
   * Updated debian/watch to catch the latest releases
   * Use XZ compression for the upstream tarball
 
diff --git a/debian/patches/fix_osgi_metadata.diff b/debian/patches/fix_osgi_metadata.diff
deleted file mode 100644
index cf95e15..0000000
--- a/debian/patches/fix_osgi_metadata.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/pom.xml
-+++ b/pom.xml
-@@ -216,10 +216,10 @@
-         <configuration>
-           <instructions>
-             <Bundle-Name>${artifactId}</Bundle-Name>
--            <Bundle-SymbolicName>${activemq.osgi.symbolic.name}</Bundle-SymbolicName>
--            <Export-Package>${activemq.osgi.export}</Export-Package>
--            <Import-Package>${activemq.osgi.import}</Import-Package>
--            <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
-+            <Bundle-SymbolicName>${activeio.osgi.symbolic.name}</Bundle-SymbolicName>
-+            <Export-Package>${activeio.osgi.export}</Export-Package>
-+            <Import-Package>${activeio.osgi.import}</Import-Package>
-+            <Private-Package>${activeio.osgi.private.pkg}</Private-Package>
-             <Implementation-Title>Apache ActiveMQ</Implementation-Title>
-             <Implementation-Version>${project.version}</Implementation-Version>
-           </instructions>
-@@ -314,4 +314,4 @@
- 
-   </profiles>
- 
--</project>
-\ No newline at end of file
-+</project>
diff --git a/debian/patches/series b/debian/patches/series
index 29bd7b9..075ee3b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-fix_osgi_metadata.diff
 exclude_howl_component.diff
 explicit_dependency_on_junit.diff

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