Source: apwal Version: 0.4.5-1.1 Severity: normal Tags: patch Dear maintainer,
I've prepared an NMU for apwal (versioned as 0.4.5-1.2). I intend to seek sponsorship for this upload. Please feel free to let me know if you wish to handle this. Kind regards, Hugh -- System Information: Debian Release: bookworm/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.16.0-4-amd64 (SMP w/2 CPU threads; PREEMPT) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8), LANGUAGE=en_AU:en Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
diff -Nru apwal-0.4.5/debian/changelog apwal-0.4.5/debian/changelog --- apwal-0.4.5/debian/changelog 2022-03-14 22:17:36.000000000 +1100 +++ apwal-0.4.5/debian/changelog 2022-03-14 22:04:23.000000000 +1100 @@ -1,3 +1,32 @@ +apwal (0.4.5-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Switch package to 3.0 (quilt) format. + * Use 'dh' format to avoid missing build-arch and/or build-indep + targets in debian/rules (Closes: #999315). + * debian/changelog: Remove trailing whitespace. + * debian/control: + - Use debian-compat v13. + - Raise Standards-Version to 4.6.0 (no changes needed). + - Declare Rules-Requires-Root: no. + - Drop duplicate Section field. + - Declare package Multi-Arch: foreign. + * debian/copyright: Use DEP-5 format and update for 2022. + * debian/patches: + - Fix cross-building and other issues (Closes: #929646). + Thanks to Helmut Grohne for supplying a patch. + - Don't override build system CFLAGS, CPPFLAGS or LDFLAGS. + - Use pkg-config to detect libxml2 (Closes: #949051). + - Don't manually strip the binary (Closes: #436940). + - Fix install path to work with dh_auto_install. + - Multiple spelling fixes (Lintian). + * debian/rules: + - Switch to `dh' format. + - Export hardening flags. + * Add debian/watch file. + + -- Hugh McMaster <hugh.mcmas...@outlook.com> Mon, 14 Mar 2022 22:04:23 +1100 + apwal (0.4.5-1.1) unstable; urgency=medium * Non-maintainer upload. @@ -19,4 +48,3 @@ * Initial release (Closes: #230373). -- Sam Hocevar (Debian packages) <sam+...@zoy.org> Wed, 25 Feb 2004 11:18:16 +0100 - diff -Nru apwal-0.4.5/debian/compat apwal-0.4.5/debian/compat --- apwal-0.4.5/debian/compat 2022-03-14 22:17:36.000000000 +1100 +++ apwal-0.4.5/debian/compat 1970-01-01 10:00:00.000000000 +1000 @@ -1 +0,0 @@ -9 diff -Nru apwal-0.4.5/debian/control apwal-0.4.5/debian/control --- apwal-0.4.5/debian/control 2022-03-14 22:17:36.000000000 +1100 +++ apwal-0.4.5/debian/control 2022-03-14 21:43:17.000000000 +1100 @@ -2,13 +2,14 @@ Section: gnome Priority: optional Maintainer: Sam Hocevar (Debian packages) <sam+...@zoy.org> -Build-Depends: debhelper (>= 9), libgtk2.0-dev, libxml2-dev -Standards-Version: 3.6.1.0 +Build-Depends: debhelper-compat (= 13), libgtk2.0-dev, libxml2-dev +Standards-Version: 4.6.0 Homepage: http://apwal.free.fr/ +Rules-Requires-Root: no Package: apwal -Section: gnome Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Description: icon-based floating application launcher with transparency Apwal is a simple icon-based application launcher. It consists of two diff -Nru apwal-0.4.5/debian/copyright apwal-0.4.5/debian/copyright --- apwal-0.4.5/debian/copyright 2022-03-14 22:17:36.000000000 +1100 +++ apwal-0.4.5/debian/copyright 2022-03-13 19:57:41.000000000 +1100 @@ -1,25 +1,49 @@ -This package was downloaded from http://apwal.free.fr/ by Sam Hocevar -<s...@zoy.org> on Wed, 25 Feb 2004 11:18:16 +0100. - -Upstream Author: Pascal Eberhard <pascal....@netcourrier.com> - -Copyright (C) 2002-2004 Pascal Eberhard <pascal....@netcourrier.com> - - This program 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 program 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 program; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - -On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Apwal +Upstream-Contact: Pascal Eberhard <pascal....@netcourrier.com> +Source: http://apwal.free.fr +Comment: This package was downloaded from http://apwal.free.fr by Sam Hocevar + on Wednesday, 25 February 2004 at 11:18:16 +0100. + +Files: * +Copyright: 2002-2004 Pascal Eberhard +License: GPL-2+ + +Files: debian/* +Copyright: 2022 Hugh McMaster + 2016 Tobias Frost + 2004 Sam Hocevar +License: GPL-2+ + +Files: src/cereimg.c + src/cereimg.h +Copyright: 2002-2004 Pascal Eberhard + 2000 Red Hat, Inc., Jonathan Blandford +License: GPL-2+ + +Files: src/gtkfnmatch.c +Copyright: 1991-1993 Free Software Foundation, Inc. + 1997-2000 GTK+ Team and others +License: GPL-2+ + +License: GPL-2+ + This program 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 program 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 full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. diff -Nru apwal-0.4.5/debian/dirs apwal-0.4.5/debian/dirs --- apwal-0.4.5/debian/dirs 2003-11-16 14:42:34.000000000 +1100 +++ apwal-0.4.5/debian/dirs 1970-01-01 10:00:00.000000000 +1000 @@ -1 +0,0 @@ -usr/bin diff -Nru apwal-0.4.5/debian/docs apwal-0.4.5/debian/docs --- apwal-0.4.5/debian/docs 1970-01-01 10:00:00.000000000 +1000 +++ apwal-0.4.5/debian/docs 2022-03-12 22:13:59.000000000 +1100 @@ -0,0 +1,3 @@ +ABOUT +FAQ +README diff -Nru apwal-0.4.5/debian/examples apwal-0.4.5/debian/examples --- apwal-0.4.5/debian/examples 1970-01-01 10:00:00.000000000 +1000 +++ apwal-0.4.5/debian/examples 2022-03-12 22:33:48.000000000 +1100 @@ -0,0 +1 @@ +example/apwalrc.xml diff -Nru apwal-0.4.5/debian/manpages apwal-0.4.5/debian/manpages --- apwal-0.4.5/debian/manpages 1970-01-01 10:00:00.000000000 +1000 +++ apwal-0.4.5/debian/manpages 2022-03-12 22:13:59.000000000 +1100 @@ -0,0 +1 @@ +debian/apwal.1 diff -Nru apwal-0.4.5/debian/patches/build-flags.patch apwal-0.4.5/debian/patches/build-flags.patch --- apwal-0.4.5/debian/patches/build-flags.patch 1970-01-01 10:00:00.000000000 +1000 +++ apwal-0.4.5/debian/patches/build-flags.patch 2022-03-14 22:04:04.000000000 +1100 @@ -0,0 +1,23 @@ +Description: Don't override build system CFLAGS, CPPFLAGS or LDFLAGS +Author: Hugh McMaster +Forwarded: not-needed +Last-Update: 2022-03-13 + +--- a/src/Makefile ++++ b/src/Makefile +@@ -7,11 +7,11 @@ + INSTALL ?= install + + ifdef APWAL_DEBUG +-CFLAGS=-g -Wall -Werror `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 libxml-2.0` -DGTK_DISABLE_DEPRECATED -DAPWAL_DEBUG +-LDFLAGS=`$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 libxml-2.0` ++CFLAGS += -g -Wall -Werror `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 libxml-2.0` -DGTK_DISABLE_DEPRECATED -DAPWAL_DEBUG $(CPPFLAGS) ++LDFLAGS += `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 libxml-2.0` + else +-CFLAGS=-O2 `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 libxml-2.0` +-LDFLAGS=-O2 `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 libxml-2.0` ++CFLAGS += -O2 `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 libxml-2.0` $(CPPFLAGS) ++LDFLAGS += -O2 `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 libxml-2.0` + endif + + OBJS=main.o app.o launcher.o editor.o property.o \ diff -Nru apwal-0.4.5/debian/patches/cross-tools.patch apwal-0.4.5/debian/patches/cross-tools.patch --- apwal-0.4.5/debian/patches/cross-tools.patch 1970-01-01 10:00:00.000000000 +1000 +++ apwal-0.4.5/debian/patches/cross-tools.patch 2022-03-14 21:57:49.000000000 +1100 @@ -0,0 +1,63 @@ +Description: Fix cross-building of apwal + - Let dh_auto_build pass cross-tools to `make'. + - Make build system tools substitutable + - Don't strip during build. +Author: Helmut Grohne +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/929646 +Last-Update: 2019-05-27 + +--- a/src/Makefile ++++ b/src/Makefile +@@ -1,12 +1,15 @@ + + include ../Makefile.inc + ++PKG_CONFIG ?= pkg-config ++STRIP ?= strip ++ + ifdef APWAL_DEBUG +-CFLAGS=-g -Wall -Werror `pkg-config --cflags gtk+-2.0 gthread-2.0` -DGTK_DISABLE_DEPRECATED -DAPWAL_DEBUG +-LDFLAGS=`pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs` ++CFLAGS=-g -Wall -Werror `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0` -DGTK_DISABLE_DEPRECATED -DAPWAL_DEBUG ++LDFLAGS=`$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0` `xml2-config --libs` + else +-CFLAGS=-O2 `pkg-config --cflags gtk+-2.0 gthread-2.0` +-LDFLAGS=-O2 `pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs` ++CFLAGS=-O2 `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0` ++LDFLAGS=-O2 `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0` `xml2-config --libs` + endif + + OBJS=main.o app.o launcher.o editor.o property.o \ +@@ -24,12 +27,12 @@ + ifdef APWAL_DEBUG + all: checktraceformat apwal tags + apwal: $(OBJS) +- gcc -o $@ $^ $(LDFLAGS) ++ $(CC) -o $@ $^ $(LDFLAGS) + else + all: apwal + apwal: $(OBJS) +- gcc -o $@ $^ $(LDFLAGS) +- strip $@ ++ $(CC) -o $@ $^ $(LDFLAGS) ++ $(STRIP) $@ + endif + + install: all +@@ -37,12 +40,12 @@ + ln -sf /usr/local/bin/apwal /usr/local/bin/apwal-editor + + .c.o: $(INCS) +- gcc -c $< -o $*.o $(CFLAGS) ++ $(CC) -c $< -o $*.o $(CFLAGS) + + xmlrc.o: xmlrc.c $(INCS) +- gcc -c $< -o $*.o $(CFLAGS) `xml2-config --cflags` ++ $(CC) -c $< -o $*.o $(CFLAGS) `xml2-config --cflags` + about.o: about.c $(INCS) ../Makefile.inc +- gcc -c $< -o $*.o $(CFLAGS) -DAPWAL_VERSION=\"$(VERS)\" ++ $(CC) -c $< -o $*.o $(CFLAGS) -DAPWAL_VERSION=\"$(VERS)\" + + gtkstuff.o: pixbufinline.inc + xmlrc.o: xmlrcinline.inc diff -Nru apwal-0.4.5/debian/patches/install-path.patch apwal-0.4.5/debian/patches/install-path.patch --- apwal-0.4.5/debian/patches/install-path.patch 1970-01-01 10:00:00.000000000 +1000 +++ apwal-0.4.5/debian/patches/install-path.patch 2022-03-13 20:13:38.000000000 +1100 @@ -0,0 +1,27 @@ +Description: Install binary file in $(DESTDIR) +Author: Hugh McMaster +Forwarded: not-needed +Last-Update: 2022-03-13 + +--- a/src/Makefile ++++ b/src/Makefile +@@ -3,6 +3,8 @@ + + PKG_CONFIG ?= pkg-config + STRIP ?= strip ++MKDIR_P = mkdir -p ++INSTALL ?= install + + ifdef APWAL_DEBUG + CFLAGS=-g -Wall -Werror `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 libxml-2.0` -DGTK_DISABLE_DEPRECATED -DAPWAL_DEBUG +@@ -36,8 +38,8 @@ + endif + + install: all +- cp apwal /usr/local/bin/ +- ln -sf /usr/local/bin/apwal /usr/local/bin/apwal-editor ++ $(MKDIR_P) $(DESTDIR)/usr/bin ++ $(INSTALL) apwal $(DESTDIR)/usr/bin + + .c.o: $(INCS) + $(CC) -c $< -o $*.o $(CFLAGS) diff -Nru apwal-0.4.5/debian/patches/libxml2.patch apwal-0.4.5/debian/patches/libxml2.patch --- apwal-0.4.5/debian/patches/libxml2.patch 1970-01-01 10:00:00.000000000 +1000 +++ apwal-0.4.5/debian/patches/libxml2.patch 2022-03-13 20:14:52.000000000 +1100 @@ -0,0 +1,33 @@ +Description: Use pkg-config to detect libxml2 +Author: Hugh McMaster +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/949051 +Last-Update: 2022-03-13 + +--- a/src/Makefile ++++ b/src/Makefile +@@ -5,11 +5,11 @@ + STRIP ?= strip + + ifdef APWAL_DEBUG +-CFLAGS=-g -Wall -Werror `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0` -DGTK_DISABLE_DEPRECATED -DAPWAL_DEBUG +-LDFLAGS=`$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0` `xml2-config --libs` ++CFLAGS=-g -Wall -Werror `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 libxml-2.0` -DGTK_DISABLE_DEPRECATED -DAPWAL_DEBUG ++LDFLAGS=`$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 libxml-2.0` + else +-CFLAGS=-O2 `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0` +-LDFLAGS=-O2 `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0` `xml2-config --libs` ++CFLAGS=-O2 `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 libxml-2.0` ++LDFLAGS=-O2 `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 libxml-2.0` + endif + + OBJS=main.o app.o launcher.o editor.o property.o \ +@@ -43,7 +43,7 @@ + $(CC) -c $< -o $*.o $(CFLAGS) + + xmlrc.o: xmlrc.c $(INCS) +- $(CC) -c $< -o $*.o $(CFLAGS) `xml2-config --cflags` ++ $(CC) -c $< -o $*.o $(CFLAGS) + about.o: about.c $(INCS) ../Makefile.inc + $(CC) -c $< -o $*.o $(CFLAGS) -DAPWAL_VERSION=\"$(VERS)\" + diff -Nru apwal-0.4.5/debian/patches/series apwal-0.4.5/debian/patches/series --- apwal-0.4.5/debian/patches/series 1970-01-01 10:00:00.000000000 +1000 +++ apwal-0.4.5/debian/patches/series 2022-03-13 22:04:29.000000000 +1100 @@ -0,0 +1,5 @@ +cross-tools.patch +libxml2.patch +install-path.patch +build-flags.patch +spelling.patch diff -Nru apwal-0.4.5/debian/patches/spelling.patch apwal-0.4.5/debian/patches/spelling.patch --- apwal-0.4.5/debian/patches/spelling.patch 1970-01-01 10:00:00.000000000 +1000 +++ apwal-0.4.5/debian/patches/spelling.patch 2022-03-13 22:22:10.000000000 +1100 @@ -0,0 +1,167 @@ +Description: Fix spelling errors as detected by Lintian +Author: Hugh McMaster +Forwarded: not-needed +Last-Update: 2022-03-13 + +--- a/src/apwalpref.c ++++ b/src/apwalpref.c +@@ -109,7 +109,7 @@ + gtk_tooltips_set_tip(apwal->tips, timeout_event, "Period of time during which the Apwal Launcher will still be displayed if not focused", NULL); + + // timeout label +- timeout_label = gtk_label_new("Launcher Timout (in second)"); ++ timeout_label = gtk_label_new("Launcher Timeout (in second)"); + gtk_container_add(GTK_CONTAINER(timeout_event), timeout_label); + gtk_widget_show(timeout_label); + +@@ -135,7 +135,7 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(exit_at_app_launch_chk), + apwal->apwal_pref->exit_at_app_launch); + gtk_widget_show(exit_at_app_launch_chk); +- gtk_tooltips_set_tip(apwal->tips, exit_at_app_launch_chk, "When you launch an application from the Apwal Launcher you can either prefer that Apwal hides itself immediatly or not", NULL); ++ gtk_tooltips_set_tip(apwal->tips, exit_at_app_launch_chk, "When you launch an application from the Apwal Launcher you can either prefer that Apwal hides itself immediately or not", NULL); + + // iconsel_modal + // editor frame +--- a/Changelog ++++ b/Changelog +@@ -54,7 +54,7 @@ + disk. It is a little slower but it consumes less memory + - all: Debian package created + - syssutff: correct exit of apwal when the program to launch do not exist +- - launcher: add an option to allow to close apwal at launch of an application ++ - launcher: add an option to close apwal at launch of an application + - iconsel: it is now possible to change the dimension of the Icon Selection + windows when it is in a separate window + - iconsel: Icon Selection window is showed automaticly in non modal mode +@@ -88,7 +88,7 @@ + - xmlrc: if it is the first launch of apwal then create a new xmrc file and + launch the editor. + - about: done. a little one :) +- - apwal_pref: new tab apwal_pref. options: timout and activate_tooltips ++ - apwal_pref: new tab apwal_pref. options: timeout and activate_tooltips + - launcher/editor: remove dependence of X11 call used to get the resolution + of the screen (use now gdk_screen_width and height) + - all: create LICENSE file and add GPL headers in source files. +--- a/src/iconsel_interface.c ++++ b/src/iconsel_interface.c +@@ -491,7 +491,7 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chk0), iconsel->apwal->iconsel_pref->select_48); + g_signal_connect(G_OBJECT(chk0), "toggled", + G_CALLBACK(iconsel_48_toggled), iconsel); +- gtk_tooltips_set_tip(iconsel->apwal->tips, chk0, "Filter icons when there are loaded from disk.\nSelect 48x48 pixels icons (Strongly recommanded)", NULL); ++ gtk_tooltips_set_tip(iconsel->apwal->tips, chk0, "Filter icons when they are loaded from disk.\nSelect 48x48 pixels icons (Strongly recommended)", NULL); + gtk_widget_show(chk0); + + // check button +@@ -500,7 +500,7 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chk1), iconsel->apwal->iconsel_pref->select_lt48); + g_signal_connect(G_OBJECT(chk1), "toggled", + G_CALLBACK(iconsel_lt48_toggled), iconsel); +- gtk_tooltips_set_tip(iconsel->apwal->tips, chk1, "Filter icons when there are loaded from disk.\nSelect icons smaller that 48x48 pixels", NULL); ++ gtk_tooltips_set_tip(iconsel->apwal->tips, chk1, "Filter icons when they are loaded from disk.\nSelect icons smaller that 48x48 pixels", NULL); + gtk_widget_show(chk1); + + // check button +@@ -509,7 +509,7 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chk2), iconsel->apwal->iconsel_pref->select_gt48); + g_signal_connect(G_OBJECT(chk2), "toggled", + G_CALLBACK(iconsel_gt48_toggled), iconsel); +- gtk_tooltips_set_tip(iconsel->apwal->tips, chk2, "Filter icons when there are loaded from disk. Select icons bigger that 48x48 pixels", NULL); ++ gtk_tooltips_set_tip(iconsel->apwal->tips, chk2, "Filter icons when they are loaded from disk. Select icons bigger that 48x48 pixels", NULL); + gtk_widget_show(chk2); + + // sort frame +@@ -585,7 +585,7 @@ + g_signal_connect(G_OBJECT(exts_btn_add), "clicked", + G_CALLBACK(iconsel_exts_add_clicked), iconsel); + gtk_box_pack_start(GTK_BOX(exts_vbox), exts_btn_add, FALSE, FALSE, 0); +- gtk_tooltips_set_tip(iconsel->apwal->tips, exts_btn_add, "Filter icons when there are loaded from disk.\nOnly icons which match one of this extension will be loaded", NULL); ++ gtk_tooltips_set_tip(iconsel->apwal->tips, exts_btn_add, "Filter icons when they are loaded from disk.\nOnly icons which match one of this extension will be loaded", NULL); + gtk_widget_show(exts_btn_add); + + } +@@ -995,7 +995,7 @@ + gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE); + + +- // cereimg for file selction ++ // cereimg for file selection + renderer = cereimg_new(); + g_object_set(renderer, + "activatable", TRUE, +--- a/src/editor.c ++++ b/src/editor.c +@@ -240,7 +240,7 @@ + ". Drag and drop an icon to move it on the grid\n" + ". Press the remove button to delete an application\n" + ". Use the arrow buttons to see all the grid\n" +- ". The red cross is the positon of the cursor"; ++ ". The red cross is the position of the cursor"; + gtk_tooltips_set_tip(e->apwal->tips, eventbox_for_image, tooltips_str, NULL); + image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO, + GTK_ICON_SIZE_MENU); +--- a/src/launcher.c ++++ b/src/launcher.c +@@ -254,7 +254,7 @@ + { + dialog = gtk_message_dialog_new(GTK_WINDOW(l->window), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, +- GTK_BUTTONS_CLOSE, "An error occured while trying to launch " ++ GTK_BUTTONS_CLOSE, "An error occurred while trying to launch " + "the application '%s'.\n(path:'%s')", + app->cmdline, app->path); + gtk_dialog_run(GTK_DIALOG(dialog)); +--- a/src/apwalapp.c ++++ b/src/apwalapp.c +@@ -128,7 +128,7 @@ + iconsel_refresh_selected(apwal->iconsel); + break; + default: +- ERR("BUG: should not happend, call from page:%d", page); ++ ERR("BUG: should not happen, call from page: %d", page); + } + /* + // if icon selection window is showed and editor has focus +--- a/src/xmlrc.c ++++ b/src/xmlrc.c +@@ -595,7 +595,7 @@ + char *home; + home = getenv("HOME"); + if (home == NULL) +- ERR("%s", "environement variable $HOME not set"); ++ ERR("%s", "environment variable $HOME not set"); + strcpy(g_xmlrc_filerc, home); + strcat(g_xmlrc_filerc, "/.apwalrc.xml"); + } +--- a/README ++++ b/README +@@ -21,7 +21,7 @@ + - effects: zooming ala mac, shadow, icon radiance, icon flying to borders, + - document the code with documentation system (doxygen?) + - SVG support +- - allow icons from any size. allow to resize them. ++ - allow icons of any size to be resized. + - position of the icons: free, snap to grid, elipse, spiral, ... + - really need to make a nicer 'unknown' icon + - rupport of rpm package and... +--- a/src/property.c ++++ b/src/property.c +@@ -244,7 +244,7 @@ + //img cmdline + img_cmdline = gtk_image_new_from_stock(GTK_STOCK_OPEN, + GTK_ICON_SIZE_SMALL_TOOLBAR); +- gtk_tooltips_set_tip(prop->apwal->tips, btn_cmdline, "Cmdline Browse...\nShow the File Selection Dialog Box which allow to select the executable to launch", NULL); ++ gtk_tooltips_set_tip(prop->apwal->tips, btn_cmdline, "Cmdline Browse...\nShow the File Selection Dialog Box to select the executable to launch", NULL); + gtk_widget_show(img_cmdline); + gtk_container_add(GTK_CONTAINER(btn_cmdline), img_cmdline); + +@@ -281,7 +281,7 @@ + GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_widget_show(img_path); + gtk_container_add(GTK_CONTAINER(btn_path), img_path); +- gtk_tooltips_set_tip(prop->apwal->tips, btn_path, "Path Browse...\nShow the Directory Selection Dialog Box which allow to select the execution path of the currently selected application", NULL); ++ gtk_tooltips_set_tip(prop->apwal->tips, btn_path, "Path Browse...\nShow the Directory Selection Dialog Box to select the execution path of the currently selected application", NULL); + + //hbox icon + hbox_icon = gtk_hbox_new(FALSE, 0); diff -Nru apwal-0.4.5/debian/rules apwal-0.4.5/debian/rules --- apwal-0.4.5/debian/rules 2022-03-14 22:17:36.000000000 +1100 +++ apwal-0.4.5/debian/rules 2022-03-14 21:48:45.000000000 +1100 @@ -1,75 +1,8 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# This file is public domain software, originally written by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all -build: build-stamp -build-stamp: - dh_testdir +export DEB_CFLAGS_MAINT_APPEND = -g -Wall - # Add here commands to compile the package. - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/<packagename> - #$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install - install -m 755 src/apwal `pwd`/debian/apwal/usr/bin - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs Changelog - dh_installdocs README FAQ ABOUT - dh_installexamples example/apwalrc.xml - dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installcatalogs -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo -# dh_undocumented - dh_installman debian/apwal.1 - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ diff -Nru apwal-0.4.5/debian/source/format apwal-0.4.5/debian/source/format --- apwal-0.4.5/debian/source/format 1970-01-01 10:00:00.000000000 +1000 +++ apwal-0.4.5/debian/source/format 2022-03-12 22:13:59.000000000 +1100 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru apwal-0.4.5/debian/watch apwal-0.4.5/debian/watch --- apwal-0.4.5/debian/watch 1970-01-01 10:00:00.000000000 +1000 +++ apwal-0.4.5/debian/watch 2022-03-13 20:04:51.000000000 +1100 @@ -0,0 +1,2 @@ +version=4 +# Apwal is no longer developed or maintained.
