[jackson-dataformat-smile] 04/08: fix-bundle-build.diff: Use extensions with bundle plugin.

Timo Aaltonen tjaalton at moszumanska.debian.org
Tue Sep 9 10:07:22 UTC 2014


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

tjaalton pushed a commit to branch master
in repository jackson-dataformat-smile.

commit fc91d2e60a49e6f3c9ef61d792ded2cc6e694a01
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Sep 9 12:29:05 2014 +0300

    fix-bundle-build.diff: Use extensions with bundle plugin.
---
 debian/changelog                     |  6 +++++-
 debian/control                       |  1 +
 debian/patches/fix-bundle-build.diff | 15 +++++++++++++++
 debian/patches/series                |  1 +
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dc2984a..aab7cf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-jackson-dataformat-smile (2.4.2-1) UNRELEASED; urgency=low
+jackson-dataformat-smile (2.4.2-1) debian; urgency=low
 
+  [ Wolodja Wentland ]
   * Use wrap-and-sort from devscripts to format d/control, d/copyright and
     d/libjackson2-dataformat-smile-doc.install
 
@@ -7,6 +8,9 @@ jackson-dataformat-smile (2.4.2-1) UNRELEASED; urgency=low
     - Correct Vcs-* field entries (svn → git)
     - Correct Homepage entry
 
+  [ Timo Aaltonen ]
+  * fix-bundle-build.diff: Use extensions with bundle plugin.
+
  -- Wolodja Wentland <debian at babilen5.org>  Thu, 26 Sep 2013 17:53:19 +0000
 
 jackson-dataformat-smile (2.2.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f384ef2..8ec1ffa 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 9),
                javahelper (>= 0.32),
                junit4,
                libjackson2-core-java,
+               libmaven-bundle-plugin-java,
                maven-debian-helper (>= 1.6.5),
                xmlstarlet
 Build-Depends-Indep: default-jdk-doc,
diff --git a/debian/patches/fix-bundle-build.diff b/debian/patches/fix-bundle-build.diff
new file mode 100644
index 0000000..08ae25f
--- /dev/null
+++ b/debian/patches/fix-bundle-build.diff
@@ -0,0 +1,15 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -80,6 +80,12 @@ tree model)
+           </excludes>
+         </configuration>
+       </plugin>
++      <plugin>
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
++        <version>2.3.5</version>
++        <extensions>true</extensions>
++      </plugin>
+     </plugins>
+   </build>
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d46f5cc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-bundle-build.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-dataformat-smile.git



More information about the pkg-java-commits mailing list