[conversant-disruptor] 04/04: Add remove-jdkClassifier.patch and remove the jdkClassifier from the resulting
Markus Koschany
apo at moszumanska.debian.org
Sun Oct 15 17:37:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository conversant-disruptor.
commit 2f26f401f9bb46eede68346a1dc021d8f598b9e7
Author: Markus Koschany <apo at debian.org>
Date: Sun Oct 15 19:24:42 2017 +0200
Add remove-jdkClassifier.patch and remove the jdkClassifier from the resulting
jar file. This will ensure that dh_auto_install will correctly install the file
into the binary package.
Closes: #869002
---
debian/changelog | 3 +++
debian/patches/remove-jdkClassifier.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 26 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index d7a9ad6..c8b40fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ conversant-disruptor (1.2.10-2) unstable; urgency=medium
* Team upload.
* Declare compliance with Debian Policy 4.1.1.
* Use https for Format field.
+ * Add remove-jdkClassifier.patch and remove the jdkClassifier from the
+ resulting jar file. This will ensure that dh_auto_install will correctly
+ install the file into the binary package. (Closes: #869002)
-- Markus Koschany <apo at debian.org> Sun, 15 Oct 2017 19:06:32 +0200
diff --git a/debian/patches/remove-jdkClassifier.patch b/debian/patches/remove-jdkClassifier.patch
new file mode 100644
index 0000000..eabb5b2
--- /dev/null
+++ b/debian/patches/remove-jdkClassifier.patch
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 15 Oct 2017 19:24:25 +0200
+Subject: remove jdkClassifier
+
+---
+ pom.xml | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 251655c..8284b80 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -146,9 +146,6 @@
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+- <configuration>
+- <classifier>${jdkClassifier}</classifier>
+- </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bd236d7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove-jdkClassifier.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/conversant-disruptor.git
More information about the pkg-java-commits
mailing list