Control: tags -1 patch
I am uploading a NMU to DELAYED/10 in order to fix this.
Please find the debdiff attached.
diff -Nru gkrellm-xkb-1.05/Makefile gkrellm-xkb-1.05/Makefile
--- gkrellm-xkb-1.05/Makefile 2024-04-17 21:36:56.000000000 +0000
+++ gkrellm-xkb-1.05/Makefile 2004-01-05 06:34:36.000000000 +0000
@@ -1,5 +1,5 @@
-PREFIX ?= $(DESTDIR)/usr
+PREFIX ?= /usr/local
GTK_CONFIG = pkg-config gtk+-2.0
PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins
GKRELLM_INCLUDE = -I$(PREFIX)/include
diff -Nru gkrellm-xkb-1.05/debian/changelog gkrellm-xkb-1.05/debian/changelog
--- gkrellm-xkb-1.05/debian/changelog 2024-04-17 21:36:56.000000000 +0000
+++ gkrellm-xkb-1.05/debian/changelog 2024-04-17 21:24:31.000000000 +0000
@@ -1,3 +1,17 @@
+gkrellm-xkb (1.05-5.2) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * d/copyright: Convert to machine-readable format
+ * Convert to source format 3.0 (Closes: #1007693)
+
+ [ Helmut Grohne ]
+ * Fix FTCBFS: (Closes: #958279)
+ + Let dh_auto_build pass cross tools to make.
+ + Make pkg-config substitutable.
+ + Defer stripping to dh_strip.
+
+ -- Bastian Germann <b...@debian.org> Wed, 17 Apr 2024 21:24:31 +0000
+
gkrellm-xkb (1.05-5.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru gkrellm-xkb-1.05/debian/control gkrellm-xkb-1.05/debian/control
--- gkrellm-xkb-1.05/debian/control 2024-04-17 21:36:56.000000000 +0000
+++ gkrellm-xkb-1.05/debian/control 2024-04-17 21:24:31.000000000 +0000
@@ -2,7 +2,7 @@
Section: x11
Priority: optional
Maintainer: Adam Sloboda <j...@disorder.sk>
-Build-Depends: debhelper (>= 5), gkrellm (>= 2.0.0), libgtk2.0-dev, pkg-config
+Build-Depends: debhelper (>= 7), gkrellm (>= 2.0.0), libgtk2.0-dev, pkgconf
Standards-Version: 3.7.3
Homepage: http://www.sweb.cz/tripie/gkrellm/xkb/
diff -Nru gkrellm-xkb-1.05/debian/copyright gkrellm-xkb-1.05/debian/copyright
--- gkrellm-xkb-1.05/debian/copyright 2024-04-17 21:36:56.000000000 +0000
+++ gkrellm-xkb-1.05/debian/copyright 2024-04-17 21:24:13.000000000 +0000
@@ -1,30 +1,34 @@
-This package was debianized by Adam Sloboda <j...@disorder.sk> on
-Thu, 13 Mar 2008 15:34:47 +0100.
-
-It was downloaded from http://www.sweb.cz/tripie/gkrellm/xkb/
-
-Upstream Author: Tomas Styblo <tri...@cpan.org>
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Comment:
+ This package was debianized by Adam Sloboda <j...@disorder.sk> on
+ Thu, 13 Mar 2008 15:34:47 +0100.
+Source:
+ http://www.sweb.cz/tripie/gkrellm/xkb/
+Upstream-Contact:
+ Tomas Styblo <tri...@cpan.org>
+Files: *
Copyright: Copyright (C) 2003 Tomas Styblo <tri...@cpan.org>
+License: GPL-2+
-License:
-
+License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+ .
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+ .
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2008, Adam Sloboda <j...@disorder.sk> and
-is licensed under the GPL, see above.
+Comment:
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
+
+Files: debian/*
+Copyright: (C) 2008, Adam Sloboda <j...@disorder.sk>
+License: GPL-2+
diff -Nru gkrellm-xkb-1.05/debian/patches/debian.patch
gkrellm-xkb-1.05/debian/patches/debian.patch
--- gkrellm-xkb-1.05/debian/patches/debian.patch 1970-01-01
00:00:00.000000000 +0000
+++ gkrellm-xkb-1.05/debian/patches/debian.patch 2024-04-17
21:24:31.000000000 +0000
@@ -0,0 +1,125 @@
+--- gkrellm-xkb-1.05.orig/Makefile
++++ gkrellm-xkb-1.05/Makefile
+@@ -1,5 +1,5 @@
+
+-PREFIX ?= /usr/local
++PREFIX ?= $(DESTDIR)/usr
+ GTK_CONFIG = pkg-config gtk+-2.0
+ PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins
+ GKRELLM_INCLUDE = -I$(PREFIX)/include
+--- gkrellm-xkb-1.05.orig/flags/unknown.xpm
++++ gkrellm-xkb-1.05/flags/unknown.xpm
+@@ -20,16 +20,16 @@ static char *flag_xpm_unknown[] = {
+ /* pixels */
+ ";;;;;;;;;;;;;;;;;;;;;",
+ ";;;;;;;;;;;;;;;;;;;;;",
+-";;;;;;;#O. X@;;;;;;;;",
+-";;;;;;; O*=@ +;;;;;;;",
+-";;;;;;;;;;;; ;;;;;;;",
+-";;;;;;;;;;;& .;;;;;;;",
+-";;;;;;;;;;=oX&;;;;;;;",
+-";;;;;;;;;$X %;;;;;;;;",
+-";;;;;;;;; *;;;;;;;;;",
+-";;;;;;;;; ;;;;;;;;;;",
+ ";;;;;;;;;;;;;;;;;;;;;",
+-";;;;;;;;; ;;;;;;;;;;",
+-";;;;;;;;; ;;;;;;;;;;",
++";;;;;;;;;;;;;;;;;;;;;",
++";;;;;;;;;;;;;;;;;;;;;",
++";;;;;;;;;;;;;;;;;;;;;",
++";;;;;;;;;;;;;;;;;;;;;",
++";;;;;;;;;;;;;;;;;;;;;",
++";;;;;;;;;;;;;;;;;;;;;",
++";;;;;;;;;;;;;;;;;;;;;",
++";;;;;;;;;;;;;;;;;;;;;",
++";;;;;;;;;;;;;;;;;;;;;",
++";;;;;;;;;;;;;;;;;;;;;",
+ ";;;;;;;;;;;;;;;;;;;;;"
+ };
+--- gkrellm-xkb-1.05.orig/main.c
++++ gkrellm-xkb-1.05/main.c
+@@ -105,6 +105,9 @@ static GkrellmTicks *pGK;
+ static int force_redraw = 0;
+ static int update_locked = 0;
+
++#define STYLE_NAME "xkb"
++static gint style_id;
++
+ static struct {
+ const char *country_code;
+ char **flag_pointer;
+@@ -197,6 +200,7 @@ static GkrellmMonitor plugin_mon = { /*
+ /* }}} */
+
+ GkrellmMonitor *gkrellm_init_plugin(void) { /* {{{ */
++ style_id = gkrellm_add_meter_style(&plugin_mon, STYLE_NAME);
+ monitor = &plugin_mon;
+ pGK = gkrellm_ticks();
+ return monitor;
+@@ -334,6 +338,7 @@ static void draw_flag(int redraw) { /* {
+ int num_groups = 0;
+ xkbGroup groups[XKB_MAX_GROUPS];
+ int active_group;
++ static int current_group;
+ int flag_width, flag_height;
+ int loc_x, loc_y;
+ static GdkPixmap *flag_pix = NULL;
+@@ -341,6 +346,7 @@ static void draw_flag(int redraw) { /* {
+ static GdkPixmap *num_pix = NULL;
+ static GdkPixmap *bg_scaled = NULL;
+ static GkrellmDecal *decal_flag = NULL;
++ static GkrellmDecal *decal_text = NULL;
+ static GkrellmDecal *decal_caps = NULL;
+ static GkrellmDecal *decal_num = NULL;
+ static GkrellmDecal *decal_bg = NULL;
+@@ -371,10 +377,12 @@ static void draw_flag(int redraw) { /* {
+ }
+
+ if (! (redraw || force_redraw ||
+- current_flag == NULL || current_flag !=
groups[active_group].flag_xpm ||
++ current_flag == NULL || /* current_flag !=
groups[active_group].flag_xpm || */
++ current_group != active_group ||
+ ind_caps != ind_caps_prev || ind_num != ind_num_prev))
+ goto cleanup;
+
++ current_group = active_group;
+ /* fprintf(stderr, "Redrawing...\n"); */
+
+ ind_caps_prev = ind_caps;
+@@ -388,6 +396,9 @@ static void draw_flag(int redraw) { /* {
+ if (!redraw && decal_flag) {
+ gkrellm_destroy_decal(decal_flag); decal_flag = NULL;
+ }
++ if (!redraw && decal_text) {
++ gkrellm_destroy_decal(decal_text); decal_text = NULL;
++ }
+ if (!redraw && decal_caps) {
+ gkrellm_destroy_decal(decal_caps); decal_caps = NULL;
+ }
+@@ -435,6 +446,26 @@ static void draw_flag(int redraw) { /* {
+ decal_caps = gkrellm_create_decal_pixmap(panel, caps_pix, NULL, 0,
NULL, 0, loc_y);
+ decal_num = gkrellm_create_decal_pixmap(panel, num_pix, NULL, 0,
NULL,
+ gkrellm_chart_width() - 14, loc_y);
++
++ /* Also draw country code if we don't have flag */
++ gchar **xkb_rules;
++ if (current_flag == flag_xpm_unknown &&
++ (xkb_rules = parse_xkb_rules_names())) {
++ GkrellmStyle *style;
++ GkrellmTextstyle *ts, *ts_alt;
++ style = gkrellm_meter_style(style_id);
++ ts = gkrellm_meter_textstyle(style_id);
++ ts_alt = gkrellm_meter_alt_textstyle(style_id);
++
++ decal_text = gkrellm_create_decal_text(panel, "XX", ts, style,
-1, -1, 0);
++ int string_w = gdk_string_width(decal_text->text_style.font,
xkb_rules[active_group]);
++ decal_text->x = loc_x + (flag_width/2) - (string_w/2);
++ decal_text->y = loc_y + 2;
++ gkrellm_draw_decal_text(panel, decal_text,
xkb_rules[active_group], 0);
++
++ g_strfreev(xkb_rules);
++ }
++
+ gkrellm_draw_decal_pixmap(panel, decal_flag, 0);
+ gkrellm_draw_decal_pixmap(panel, decal_caps, 0);
+ gkrellm_draw_decal_pixmap(panel, decal_num, 0);
diff -Nru gkrellm-xkb-1.05/debian/patches/pkgconf.patch
gkrellm-xkb-1.05/debian/patches/pkgconf.patch
--- gkrellm-xkb-1.05/debian/patches/pkgconf.patch 1970-01-01
00:00:00.000000000 +0000
+++ gkrellm-xkb-1.05/debian/patches/pkgconf.patch 2024-04-17
21:24:31.000000000 +0000
@@ -0,0 +1,11 @@
+--- gkrellm-xkb-1.05/Makefile
++++ gkrellm-xkb-1.05/Makefile
+@@ -1,6 +1,7 @@
+
+ PREFIX ?= $(DESTDIR)/usr
+-GTK_CONFIG = pkg-config gtk+-2.0
++PKG_CONFIG ?= pkg-config
++GTK_CONFIG = $(PKG_CONFIG) gtk+-2.0
+ PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins
+ GKRELLM_INCLUDE = -I$(PREFIX)/include
+ GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
diff -Nru gkrellm-xkb-1.05/debian/patches/series
gkrellm-xkb-1.05/debian/patches/series
--- gkrellm-xkb-1.05/debian/patches/series 1970-01-01 00:00:00.000000000
+0000
+++ gkrellm-xkb-1.05/debian/patches/series 2024-04-17 21:24:31.000000000
+0000
@@ -0,0 +1,2 @@
+debian.patch
+pkgconf.patch
diff -Nru gkrellm-xkb-1.05/debian/rules gkrellm-xkb-1.05/debian/rules
--- gkrellm-xkb-1.05/debian/rules 2024-04-17 21:36:56.000000000 +0000
+++ gkrellm-xkb-1.05/debian/rules 2024-04-17 21:24:31.000000000 +0000
@@ -22,7 +22,7 @@
build-stamp: configure-stamp
dh_testdir
- $(MAKE)
+ dh_auto_build
touch $@
clean:
@@ -37,7 +37,7 @@
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) DESTDIR=$(CURDIR)/debian/gkrellm-xkb install
+ $(MAKE) DESTDIR=$(CURDIR)/debian/gkrellm-xkb install 'INSTALL=install
--strip-program=true'
# Build architecture-independent files here.
diff -Nru gkrellm-xkb-1.05/debian/source/format
gkrellm-xkb-1.05/debian/source/format
--- gkrellm-xkb-1.05/debian/source/format 1970-01-01 00:00:00.000000000
+0000
+++ gkrellm-xkb-1.05/debian/source/format 2024-04-17 21:24:31.000000000
+0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru gkrellm-xkb-1.05/flags/unknown.xpm gkrellm-xkb-1.05/flags/unknown.xpm
--- gkrellm-xkb-1.05/flags/unknown.xpm 2024-04-17 21:36:56.000000000 +0000
+++ gkrellm-xkb-1.05/flags/unknown.xpm 2003-06-23 18:05:10.000000000 +0000
@@ -20,16 +20,16 @@
/* pixels */
";;;;;;;;;;;;;;;;;;;;;",
";;;;;;;;;;;;;;;;;;;;;",
+";;;;;;;#O. X@;;;;;;;;",
+";;;;;;; O*=@ +;;;;;;;",
+";;;;;;;;;;;; ;;;;;;;",
+";;;;;;;;;;;& .;;;;;;;",
+";;;;;;;;;;=oX&;;;;;;;",
+";;;;;;;;;$X %;;;;;;;;",
+";;;;;;;;; *;;;;;;;;;",
+";;;;;;;;; ;;;;;;;;;;",
";;;;;;;;;;;;;;;;;;;;;",
-";;;;;;;;;;;;;;;;;;;;;",
-";;;;;;;;;;;;;;;;;;;;;",
-";;;;;;;;;;;;;;;;;;;;;",
-";;;;;;;;;;;;;;;;;;;;;",
-";;;;;;;;;;;;;;;;;;;;;",
-";;;;;;;;;;;;;;;;;;;;;",
-";;;;;;;;;;;;;;;;;;;;;",
-";;;;;;;;;;;;;;;;;;;;;",
-";;;;;;;;;;;;;;;;;;;;;",
-";;;;;;;;;;;;;;;;;;;;;",
+";;;;;;;;; ;;;;;;;;;;",
+";;;;;;;;; ;;;;;;;;;;",
";;;;;;;;;;;;;;;;;;;;;"
};
diff -Nru gkrellm-xkb-1.05/main.c gkrellm-xkb-1.05/main.c
--- gkrellm-xkb-1.05/main.c 2024-04-17 21:36:56.000000000 +0000
+++ gkrellm-xkb-1.05/main.c 2004-02-21 16:26:36.000000000 +0000
@@ -105,9 +105,6 @@
static int force_redraw = 0;
static int update_locked = 0;
-#define STYLE_NAME "xkb"
-static gint style_id;
-
static struct {
const char *country_code;
char **flag_pointer;
@@ -200,7 +197,6 @@
/* }}} */
GkrellmMonitor *gkrellm_init_plugin(void) { /* {{{ */
- style_id = gkrellm_add_meter_style(&plugin_mon, STYLE_NAME);
monitor = &plugin_mon;
pGK = gkrellm_ticks();
return monitor;
@@ -338,7 +334,6 @@
int num_groups = 0;
xkbGroup groups[XKB_MAX_GROUPS];
int active_group;
- static int current_group;
int flag_width, flag_height;
int loc_x, loc_y;
static GdkPixmap *flag_pix = NULL;
@@ -346,7 +341,6 @@
static GdkPixmap *num_pix = NULL;
static GdkPixmap *bg_scaled = NULL;
static GkrellmDecal *decal_flag = NULL;
- static GkrellmDecal *decal_text = NULL;
static GkrellmDecal *decal_caps = NULL;
static GkrellmDecal *decal_num = NULL;
static GkrellmDecal *decal_bg = NULL;
@@ -377,12 +371,10 @@
}
if (! (redraw || force_redraw ||
- current_flag == NULL || /* current_flag !=
groups[active_group].flag_xpm || */
- current_group != active_group ||
+ current_flag == NULL || current_flag !=
groups[active_group].flag_xpm ||
ind_caps != ind_caps_prev || ind_num != ind_num_prev))
goto cleanup;
- current_group = active_group;
/* fprintf(stderr, "Redrawing...\n"); */
ind_caps_prev = ind_caps;
@@ -396,9 +388,6 @@
if (!redraw && decal_flag) {
gkrellm_destroy_decal(decal_flag); decal_flag = NULL;
}
- if (!redraw && decal_text) {
- gkrellm_destroy_decal(decal_text); decal_text = NULL;
- }
if (!redraw && decal_caps) {
gkrellm_destroy_decal(decal_caps); decal_caps = NULL;
}
@@ -446,26 +435,6 @@
decal_caps = gkrellm_create_decal_pixmap(panel, caps_pix, NULL, 0,
NULL, 0, loc_y);
decal_num = gkrellm_create_decal_pixmap(panel, num_pix, NULL, 0, NULL,
gkrellm_chart_width() - 14, loc_y);
-
- /* Also draw country code if we don't have flag */
- gchar **xkb_rules;
- if (current_flag == flag_xpm_unknown &&
- (xkb_rules = parse_xkb_rules_names())) {
- GkrellmStyle *style;
- GkrellmTextstyle *ts, *ts_alt;
- style = gkrellm_meter_style(style_id);
- ts = gkrellm_meter_textstyle(style_id);
- ts_alt = gkrellm_meter_alt_textstyle(style_id);
-
- decal_text = gkrellm_create_decal_text(panel, "XX", ts, style, -1,
-1, 0);
- int string_w = gdk_string_width(decal_text->text_style.font,
xkb_rules[active_group]);
- decal_text->x = loc_x + (flag_width/2) - (string_w/2);
- decal_text->y = loc_y + 2;
- gkrellm_draw_decal_text(panel, decal_text,
xkb_rules[active_group], 0);
-
- g_strfreev(xkb_rules);
- }
-
gkrellm_draw_decal_pixmap(panel, decal_flag, 0);
gkrellm_draw_decal_pixmap(panel, decal_caps, 0);
gkrellm_draw_decal_pixmap(panel, decal_num, 0);
