[Git][java-team/jameica][master] 3 commits: Switch to GTK3

[Jochen Sprickerhof]

Jochen Sprickerhof pushed to branch master at Debian Java Maintainers / jameica


Commits:
3b203e11 by Jochen Sprickerhof at 2018-12-29T12:35:03Z
Switch to GTK3

Closes: #917577

- - - - -
3f893bc4 by Jochen Sprickerhof at 2018-12-29T12:36:48Z
Bump policy version (no changes)

- - - - -
928516ea by Jochen Sprickerhof at 2018-12-29T12:37:17Z
Update changelog for 2.8.2+dfsg-6 release

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/0003-Adopt-jameica-executable.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+jameica (2.8.2+dfsg-6) unstable; urgency=medium
+
+  * Switch to GTK3 (Closes: #917577)
+  * Bump policy version (no changes)
+
+ -- Jochen Sprickerhof <jspricke at debian.org>  Sat, 29 Dec 2018 13:36:52 +0100
+
 jameica (2.8.2+dfsg-5) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -19,7 +19,7 @@ Build-Depends:
  libpaperclips-java,
  velocity
 Rules-Requires-Root: no
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/jameica.git
 Vcs-Browser: https://salsa.debian.org/java-team/jameica
 Homepage: https://www.willuhn.de/products/jameica/
@@ -52,7 +52,6 @@ Depends:
  libnanoxml2-java,
  libpaperclips-java,
  libswt-cairo-gtk-4-jni,
- libswt-gtk2-4-jni,
  libswtcalendar-java,
  libtxw2-java,
  velocity,


=====================================
debian/patches/0003-Adopt-jameica-executable.patch
=====================================
@@ -2,6 +2,7 @@ From: Jochen Sprickerhof <jspricke at debian.org>
 Date: Fri, 25 May 2018 15:26:57 +0200
 Subject: Adopt jameica executable
 
+- Remove environment variables (as we switch to GTK3 and so the user can set them)
 ---
  build/jameica    | 22 ++++++++++++++++++++++
  build/jameica.sh | 21 ---------------------
@@ -13,7 +14,7 @@ Subject: Adopt jameica executable
 
 diff --git a/build/jameica b/build/jameica
 new file mode 100755
-index 0000000..2fa6d05
+index 0000000..ed48d50
 --- /dev/null
 +++ b/build/jameica
 @@ -0,0 +1,22 @@
@@ -38,7 +39,7 @@ index 0000000..2fa6d05
 +fi
 +
 +cd /usr/share/jameica
-+LIBOVERLAY_SCROLLBAR=0 GDK_NATIVE_WINDOWS=1 SWT_GTK3=0 exec java -Djava.net.preferIPv4Stack=true -Xmx512m -Xss64m $_JCONSOLE -jar /usr/share/java/jameica.jar $@
++exec java -Djava.net.preferIPv4Stack=true -Xmx512m -Xss64m $_JCONSOLE -jar /usr/share/java/jameica.jar $@
 diff --git a/build/jameica.sh b/build/jameica.sh
 deleted file mode 100755
 index 18cbcf8..0000000



View it on GitLab: https://salsa.debian.org/java-team/jameica/compare/6cffd571f4c08e339fa310831430966018b669c2...928516eaed61cdc96f6a77c2b63fb25c3e33401e

-- 
View it on GitLab: https://salsa.debian.org/java-team/jameica/compare/6cffd571f4c08e339fa310831430966018b669c2...928516eaed61cdc96f6a77c2b63fb25c3e33401e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181229/e4dd075e/attachment.html>