[Git][debian-gis-team/josm][bullseye-backports] 5 commits: Drop 03-default_look_and_feel.patch, doesn't work any more. (closes: #1000344)

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch bullseye-backports at Debian GIS Project / josm


Commits:
992dda68 by Bas Couwenberg at 2021-11-22T08:27:52+01:00
Drop 03-default_look_and_feel.patch, doesn't work any more. (closes: #1000344)

- - - - -
775cc330 by Bas Couwenberg at 2021-11-22T09:30:34+01:00
Use Noto font in SVG files.

- - - - -
a33122b3 by Bas Couwenberg at 2021-11-22T09:54:06+01:00
Set distribution to unstable.

- - - - -
ae64ba05 by Bas Couwenberg at 2021-11-27T07:00:40+01:00
Merge tag 'debian/0.0.svn18303+dfsg-2' into bullseye-backports

releasing package josm version 0.0.svn18303+dfsg-2

- - - - -
f6b974e0 by Bas Couwenberg at 2021-11-27T07:00:49+01:00
Rebuild for bullseye-backports.

- - - - -


6 changed files:

- debian/changelog
- + debian/images-check.sh
- − debian/patches/03-default_look_and_feel.patch
- debian/patches/08-use_noto_font.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+josm (0.0.svn18303+dfsg-2~bpo11+1) bullseye-backports; urgency=medium
+
+  * Rebuild for bullseye-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 27 Nov 2021 07:00:43 +0100
+
+josm (0.0.svn18303+dfsg-2) unstable; urgency=medium
+
+  * Drop 03-default_look_and_feel.patch, doesn't work any more.
+    (closes: #1000344)
+  * Use Noto font in SVG files.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 22 Nov 2021 09:53:34 +0100
+
 josm (0.0.svn18303+dfsg-1~bpo11+1) bullseye-backports; urgency=medium
 
   * Rebuild for bullseye-backports.


=====================================
debian/images-check.sh
=====================================
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+PKGDIR="$(dirname "$0")"
+PARENTDIR="$(dirname "${PKGDIR}")"
+
+OUTPUT=$(grep "font-family:'Droid Sans'" "${PARENTDIR}/resources/images/" -r 2> /dev/null)
+
+if [ -n "${OUTPUT}" ]; then
+	echo "Images using Droid font:"
+	echo "${OUTPUT}"
+
+	exit 1
+fi
+
+exit 0


=====================================
debian/patches/03-default_look_and_feel.patch deleted
=====================================
@@ -1,17 +0,0 @@
-Description: Use GTK look and feel by default.
- Patch rewritten for new code, original patch was from Ubuntu's
- 01-default-look-and-feel.dpatch by Mathieu Trudel <mathieu.tl at gmail.com>
-Author: David Paleino <dapal at debian.org>
-Forwarded: not-needed
-
---- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-+++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-@@ -104,7 +104,7 @@ public class PlatformHookUnixoid impleme
- 
-     @Override
-     public String getDefaultStyle() {
--        return "javax.swing.plaf.metal.MetalLookAndFeel";
-+        return "javax.swing.plaf.gtk.GTKLookAndFeel";
-     }
- 
-     /**


=====================================
debian/patches/08-use_noto_font.patch
=====================================
The diff for this file was not included because it is too large.

=====================================
debian/patches/series
=====================================
@@ -1,6 +1,5 @@
 00-build.patch
 01-bts.patch
-03-default_look_and_feel.patch
 05-fix_version.patch
 06-move_data_out_of_jar.patch
 07-use_system_fonts.patch


=====================================
debian/rules
=====================================
@@ -70,6 +70,8 @@ override_dh_install:
 	# remove empty directory
 	[ -z "$(ls ${IMGSTYLES_DIR} 2> /dev/null)" ] && rm -rf ${IMGSTYLES_DIR}
 	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/josm/usr/share/josm/data/security/
+	# check font in SVG files
+	sh $(CURDIR)/debian/images-check.sh
 
 get-orig-source:
 	dh_testdir



View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/d69e3422e6993327eae72f2facc46de82d6e6495...f6b974e0245b5ea6530fc394b081430a053dc50b

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/d69e3422e6993327eae72f2facc46de82d6e6495...f6b974e0245b5ea6530fc394b081430a053dc50b
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-grass-devel/attachments/20211127/1d7c54d6/attachment-0001.htm>