[SCM] jsoup HTML parser branch, master, updated. debian/1.6.1-2-6-g48f7f10

[Jakub Adam]

The following commit has been merged in the master branch:
commit 674444f94180b6dcf714e58c0bcdde74a43de7c3
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Mar 25 21:53:29 2012 +0200

    Add OSGi metadata to JAR manifest

diff --git a/debian/changelog b/debian/changelog
index 722bbd2..a41b3f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jsoup (1.6.1-3) UNRELEASED; urgency=low
+
+  * Add OSGi metadata to JAR manifest.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 25 Mar 2012 21:32:27 +0200
+
 jsoup (1.6.1-2) unstable; urgency=low
 
   * Fix Uploaders field. (Closes: #640485)
diff --git a/debian/control b/debian/control
index 2f064ae..c4dba4f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
-Build-Depends-Indep: libmaven-javadoc-plugin-java, junit4, default-jdk-doc 
+Build-Depends-Indep: libmaven-javadoc-plugin-java, junit4, default-jdk-doc,
+ libmaven-bundle-plugin-java
 Standards-Version: 3.9.1
 Vcs-Git: git://anonscm.debian.org/pkg-java/jsoup.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jsoup.git
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 0ea3c63..c521bf6 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-source-plugin * * * *
diff --git a/debian/patches/0001-maven-bundle-plugin-is-not-available.patch b/debian/patches/0001-maven-bundle-plugin-is-not-available.patch
deleted file mode 100644
index fb5ea4f..0000000
--- a/debian/patches/0001-maven-bundle-plugin-is-not-available.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Mon, 29 Aug 2011 15:57:48 +0200
-Subject: [PATCH] maven-bundle-plugin is not available
-
----
- pom.xml |    8 --------
- 1 files changed, 0 insertions(+), 8 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 6b0dd06..0712070 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -75,14 +75,6 @@
-         </executions>
-       </plugin>
-       <plugin>
--        <artifactId>maven-jar-plugin</artifactId>
--        <configuration>
--          <archive>
--            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
--          </archive>
--        </configuration>
--      </plugin>
--      <plugin>
-         <groupId>org.apache.felix</groupId>
-         <artifactId>maven-bundle-plugin</artifactId>
-         <version>2.1.0</version>
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9985cf6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-maven-bundle-plugin-is-not-available.patch

-- 
jsoup HTML parser