[libmiglayout-java] 03/05: Transition to libswt-gtk-4-java

[Emmanuel Bourg]

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

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

commit 79507c62ead0feba87c9f722eb99e6e1ee449325
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Aug 1 23:06:19 2016 +0200

    Transition to libswt-gtk-4-java
---
 debian/changelog                             |  1 +
 debian/control                               |  4 ++--
 debian/maven.rules                           |  1 +
 debian/patches/01-tweak-swt-dependency.patch | 23 -----------------------
 debian/patches/series                        |  1 -
 5 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c6fa822..cd44367 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libmiglayout-java (4.2-2) UNRELEASED; urgency=medium
 
+  * Transition to libswt-gtk-4-java
   * Moved the package to Git
   * Standards-Version updated to 3.9.8
 
diff --git a/debian/control b/debian/control
index 0a01653..d6f9316 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>, 
  Andrew Ross <ubuntu at rossfamily.co.uk>
 Build-Depends: debhelper (>= 9), cdbs, maven-debian-helper
-Build-Depends-Indep: ant, default-jdk, libswt-gtk-3-java
+Build-Depends-Indep: ant, default-jdk, libswt-gtk-4-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libmiglayout-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libmiglayout-java.git
@@ -14,7 +14,7 @@ Homepage: http://www.miglayout.com
 Package: libmiglayout-java
 Architecture: all
 Depends: ${misc:Depends}, 
-Suggests: libswt-gtk-3-java
+Suggests: libswt-gtk-4-java
 Description: Java Layout Manager
  MiGLayout is a superbly versatile SWT/Swing layout manager that makes
  layout problems trivial. It is using String or API type-checked
diff --git a/debian/maven.rules b/debian/maven.rules
index 8b13789..e8dd3ec 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1 +1,2 @@
 
+s/org.eclipse.swt.gtk.linux/org.eclipse.swt/ s/x86_64/org.eclipse.swt/ * s/.*/debian/ * *
diff --git a/debian/patches/01-tweak-swt-dependency.patch b/debian/patches/01-tweak-swt-dependency.patch
deleted file mode 100644
index 597c0b4..0000000
--- a/debian/patches/01-tweak-swt-dependency.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Link the org.eclipse.swt.gtk.linux:* artifacts to /usr/share/java/swt.jar
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/swt/pom.xml
-+++ b/swt/pom.xml
-@@ -51,6 +51,8 @@
-                     <groupId>org.eclipse.swt.gtk.linux</groupId>
-                     <artifactId>x86</artifactId>
-                     <version>3.3.0-v3346</version>
-+                    <scope>system</scope>
-+                    <systemPath>/usr/share/java/swt.jar</systemPath>
-                 </dependency>
-             </dependencies>
-         </profile>
-@@ -68,6 +70,8 @@
-                     <groupId>org.eclipse.swt.gtk.linux</groupId>
-                     <artifactId>x86_64</artifactId>
-                     <version>3.3.0-v3346</version>
-+                    <scope>system</scope>
-+                    <systemPath>/usr/share/java/swt.jar</systemPath>
-                 </dependency>
-             </dependencies>
-         </profile>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 628ed46..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-tweak-swt-dependency.patch

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