I have uploaded a NMU to DELAYED/10 in order to fix this.
Please find the debdiff attached.
diff -Nru wm-icons-0.4.0/Makefile.am wm-icons-0.4.0/Makefile.am
--- wm-icons-0.4.0/Makefile.am 2024-05-31 20:38:28.000000000 +0000
+++ wm-icons-0.4.0/Makefile.am 2006-04-09 00:22:06.000000000 +0000
@@ -14,7 +14,7 @@
# is for a distribution package building.
# Set the default icon set aliases (symlinks).
install-data-local:
- $(DESTDIR)$(bindir)/wm-icons-config --user-dir="$(DESTDIR)$(icondir)"
--defaults --quiet
+ $(bindir)/wm-icons-config --user-dir="$(icondir)" --defaults --quiet
wm-configs _pack-symlinks _unpack-symlinks:
cd devel/bin && $(MAKE) $(AM_MAKEFLAGS) $@
diff -Nru wm-icons-0.4.0/debian/changelog wm-icons-0.4.0/debian/changelog
--- wm-icons-0.4.0/debian/changelog 2024-05-31 20:38:28.000000000 +0000
+++ wm-icons-0.4.0/debian/changelog 2024-05-31 20:28:40.000000000 +0000
@@ -1,3 +1,12 @@
+wm-icons (0.4.0-11.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Convert to source format 3.0. (Closes: #1067535)
+ * Drop unused lintian override.
+ * d/control: Correct Vcs fields.
+
+ -- Bastian Germann <b...@debian.org> Fri, 31 May 2024 20:28:40 +0000
+
wm-icons (0.4.0-11) unstable; urgency=medium
* Updated to standards version 4.3.0 (no changes required)
diff -Nru wm-icons-0.4.0/debian/control wm-icons-0.4.0/debian/control
--- wm-icons-0.4.0/debian/control 2024-05-31 20:38:28.000000000 +0000
+++ wm-icons-0.4.0/debian/control 2024-05-31 20:28:40.000000000 +0000
@@ -1,6 +1,6 @@
Source: wm-icons
-VCS-Git: https://salsa.debian.org/srivasta/wm-icons.git
-VCS-Browser: https://salsa.debian.org/srivasta/wm-icons.git
+Vcs-Git: https://salsa.debian.org/srivasta/wm-icons.git
+Vcs-Browser: https://salsa.debian.org/srivasta/wm-icons
Section: misc
Standards-Version: 4.3.0
Maintainer: Manoj Srivastava <sriva...@debian.org>
diff -Nru wm-icons-0.4.0/debian/patches/debian.patch
wm-icons-0.4.0/debian/patches/debian.patch
--- wm-icons-0.4.0/debian/patches/debian.patch 1970-01-01 00:00:00.000000000
+0000
+++ wm-icons-0.4.0/debian/patches/debian.patch 2024-05-31 20:28:40.000000000
+0000
@@ -0,0 +1,163 @@
+--- wm-icons-0.4.0.orig/Makefile.am
++++ wm-icons-0.4.0/Makefile.am
+@@ -14,7 +14,7 @@ SUBDIRS = bin doc icons etc devel rpm
+ # is for a distribution package building.
+ # Set the default icon set aliases (symlinks).
+ install-data-local:
+- $(bindir)/wm-icons-config --user-dir="$(icondir)" --defaults --quiet
++ $(DESTDIR)$(bindir)/wm-icons-config --user-dir="$(DESTDIR)$(icondir)"
--defaults --quiet
+
+ wm-configs _pack-symlinks _unpack-symlinks:
+ cd devel/bin && $(MAKE) $(AM_MAKEFLAGS) $@
+--- wm-icons-0.4.0.orig/etc/debian-menu-system/README
++++ wm-icons-0.4.0/etc/debian-menu-system/README
+@@ -10,20 +10,14 @@ as a simple user.
+ the "standard sections" and wm-icons icons and a map from packages name
+ to wm-icons icons.
+
+-* wm-icons-fvwm2rc-menu is a menu-method script for FVWM. You should edit
+- the lines:
+- rootprefix="/usr/local/share/fvwm/debian-menu-system/"
+- userprefix="/.fvwm/debian-menu-system/"
+- replace "/usr/local/share/fvwm/" by the FVWM configuration directory
+- and ".fvwm" by the FVWM user directory. Then, you should add
+- Read debian-menu-system/wm-icons-menu
++* wm-icons-fvwm2rc-menu is a menu-method script for FVWM. You should add
++ Read wm-icons/menudefs.hook
+ in the configuration file and bind it in some ways e.g.:
+ add:
+- + "menu system%menu/programs.xpm" Popup MenuFvwmDebianMenuSystem
++ + "menu system%menu/programs.xpm" Popup "/DebianWmIcons"
+ in your root menu
+ or add say:
+- Mouse 1 R A Menu MenuFvwmDebianMenuSystem
+- You should also use the configuration file "this dir"/../fvwm2rc
++ Mouse 1 R A Menu "/DebianWmIcons"
+
+ * Other window managers: just (copy and rename and) edit the correponding
+ menu methods script; you should add "!include wm-icons.h" and then you
+--- wm-icons-0.4.0.orig/etc/debian-menu-system/wm-icons-fvwm2rc-menu.in
++++ wm-icons-0.4.0/etc/debian-menu-system/wm-icons-fvwm2rc-menu.in
+@@ -1,10 +1,11 @@
+-#!/usr/sbin/install-menu
++#!/usr/bin/install-menu
+ compat="menu-1"
++!include lang.h
+ !include menu.h
+ # you may/should edit/check the systemFindIcon in wm-icons.h
+ !include wm-icons.h
+
+-function ltitle()=translate(lang(),title())
++function ltitle()=translate($lang,title())
+
+ # if you want wm-icons only:
+ # replace "wmIconsFindIcon" by wmIconsFindIconWmOnly
+@@ -21,6 +22,9 @@ supported
+ fvwm2module= "+ \"" escfirst(ltitle(), $hotkey,"&") \
+ cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \
+ "\" Module " $command "\n"
++ fvwm= "+ \"" escfirst(ltitle() ,$hotkey,"&") \
++ cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \
++ "\" " $command "\n"
+ fvwm2= "+ \"" escfirst(ltitle() ,$hotkey,"&") \
+ cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \
+ "\" " $command "\n"
+@@ -46,8 +50,8 @@ submenutitle= "+ \"" escfirst(ltitle() ,
+ cond_surr(wmIconsFindSectionIcon($section,$icon,"menu/"),"%","%") \
+ "\" PopUp \"" replacewith($section, " ", "_") "\"\n"
+
+-rootprefix="/usr/local/share/fvwm/debian-menu-system/"
+-userprefix="/.fvwm/debian-menu-system/"
++rootprefix="/etc/X11/fvwm/wm-icons/"
++userprefix="/.fvwm/wm-icons/"
+ treewalk="c(m)"
+-genmenu="wm-icons-menu"
+-rootsection="MenuFvwmDebianMenuSystem"
++genmenu="menudefs.hook"
++rootsection="/DebianWmIcons"
+--- wm-icons-0.4.0.orig/etc/debian-menu-system/wm-icons.h.in
++++ wm-icons-0.4.0/etc/debian-menu-system/wm-icons.h.in
+@@ -13,13 +13,24 @@
+ # need to replace /urs/local/share/fvwm by "fvwm-themes @datadir@"/fvwm
+ function systemFindIcon($filename)= \
+ ifeqelse($filename, "", "", \
++ ifelsefile("/usr/share/icons/wm-icons/mini/" $filename, \
++ "/usr/share/icons/wm-icons/mini/" $filename, \
+ ifelsefile("/usr/share/icons/mini/" $filename, \
+- "/usr/share/icons/mini/" $filename, \
++ "/usr/share/icons/mini/" $filename, \
++ ifelsefile("/usr/share/icons/wm-icons/16x16-general/" $filename, \
++ "/usr/share/icons/wm-icons/16x16-general/" $filename, \
++ ifelsefile("/usr/share/icons/wm-icons/16x16-gnome/" $filename, \
++ "/usr/share/icons/wm-icons/16x16-gnome/" $filename, \
++ ifelsefile("/usr/share/icons/wm-icons/16x16-kde/" $filename, \
++ "/usr/share/icons/wm-icons/16x16-kde/" $filename, \
++ ifelsefile("/usr/share/fvwm-crystal/fvwm/icons/Default/" $filename, \
++ "/usr/share/fvwm-crystal/fvwm/icons/Default/" $filename, \
+ ifelsefile("/usr/local/share/fvwm/tr-images/16x16-gnome/" $filename, \
+- "/usr/local/share/fvwm/tr-images/16x16-gnome/" $filename, \
++ "/usr/local/share/fvwm/tr-images/16x16-gnome/" $filename, \
+ ifelsefile("/usr/local/share/fvwm/tr-images/16x16-kde2/" $filename, \
+- "/usr/local/share/fvwm/tr-images/16x16-kde2/" $filename,\
+- ""))))
++ "/usr/local/share/fvwm/tr-images/16x16-kde2/" $filename, \
++ "")))))))))
++
+
+ # return the wm-icons associated to a standard section. If the section is
+ # not standard return the "system/user" icons for this section and if not
+@@ -30,7 +41,7 @@ function wmIconsFindSectionIcon($s,$i,$t
+ ifeqelse(systemFindIcon($i),"",\
+ ifeqelse(wmIconsGetSectionIcon(parent($s)),"",\
+ ifeqelse(wmIconsGetSectionIcon(parent(parent($s))),"",\
+- $t "folder.xpm",\
++ $t "folder.xpm",\
+ $t wmIconsGetSectionIcon(parent(parent($s)))),\
+ $t wmIconsGetSectionIcon(parent($s))),\
+ systemFindIcon($i)),\
+@@ -41,7 +52,7 @@ function wmIconsFindSectionIconWmOnly($s
+ ifeqelse(wmIconsGetSectionIcon($s),"",\
+ ifeqelse(wmIconsGetSectionIcon(parent($s)),"",\
+ ifeqelse(wmIconsGetSectionIcon(parent(parent($s))),"",\
+- $t "folder.xpm",\
++ $t "folder.xpm",\
+ $t wmIconsGetSectionIcon(parent(parent($s)))),\
+ $t wmIconsGetSectionIcon(parent($s))),\
+ $t wmIconsGetSectionIcon($s))
+--- wm-icons-0.4.0.orig/icons/Makefile.am
++++ wm-icons-0.4.0/icons/Makefile.am
+@@ -16,16 +16,16 @@ EXTRA_DIST = \
+ SYMLINKS_LST = _symlinks.lst
+
+ install-data-local:
+- $(mkinstalldirs) $(icondir)
++ $(mkinstalldirs) $(DESTDIR)$(icondir)
+ chmod -R o-w,go+rX *
+ cd $(top_srcdir)/icons; \
+ for iconset in $(SELECTED_ICON_SETS); do \
+- rm -rf $(icondir)/$$iconset; \
++ rm -rf $(DESTDIR)$(icondir)/$$iconset; \
+ tar cpf - "$$iconset" \
+- | (cd "$(icondir)" && tar xfBp -); \
+- find "$(icondir)/$$iconset" -name CVS \
++ | (cd "$(DESTDIR)$(icondir)" && tar xfBp -); \
++ find "$(DESTDIR)$(icondir)/$$iconset" -name CVS \
+ -exec rm -r {} \; 2>/dev/null; \
+- (cd "$(icondir)/$$iconset" && [ -f $(SYMLINKS_LST) ] \
++ (cd "$(DESTDIR)$(icondir)/$$iconset" && [ -f $(SYMLINKS_LST) ] \
+ && $(AWK) '{ system("ln -sf " $$1 " " $$2) }' \
+ < $(SYMLINKS_LST) \
+ && rm $(SYMLINKS_LST) || true \
+@@ -34,9 +34,9 @@ install-data-local:
+
+ uninstall-local:
+ for iconset in $(SELECTED_ICON_SETS); do \
+- rm -rf $(icondir)/$$iconset; \
++ rm -rf $(DESTDIR)$(icondir)/$$iconset; \
+ done
+- for i in $(icondir)/*; do \
++ for i in $(DESTDIR)$(icondir)/*; do \
+ if [ -L "$$i" ] && [ ! -e "$$i" ]; then rm -f "$$i"; fi; \
+ done
+- -rmdir $(icondir)
++ -rmdir $(DESTDIR)$(icondir)
diff -Nru wm-icons-0.4.0/debian/patches/series
wm-icons-0.4.0/debian/patches/series
--- wm-icons-0.4.0/debian/patches/series 1970-01-01 00:00:00.000000000
+0000
+++ wm-icons-0.4.0/debian/patches/series 2024-05-31 20:28:40.000000000
+0000
@@ -0,0 +1 @@
+debian.patch
diff -Nru wm-icons-0.4.0/debian/source/format
wm-icons-0.4.0/debian/source/format
--- wm-icons-0.4.0/debian/source/format 2024-05-31 20:38:28.000000000 +0000
+++ wm-icons-0.4.0/debian/source/format 2024-05-31 20:28:40.000000000 +0000
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff -Nru wm-icons-0.4.0/debian/source/lintian-overrides
wm-icons-0.4.0/debian/source/lintian-overrides
--- wm-icons-0.4.0/debian/source/lintian-overrides 2024-05-31
20:38:28.000000000 +0000
+++ wm-icons-0.4.0/debian/source/lintian-overrides 2024-05-31
20:28:40.000000000 +0000
@@ -1,2 +1 @@
-wm-icons source: source-contains-cvs-control-dir devel/template/CVS
wm-icons source: debian-watch-may-check-gpg-signature
diff -Nru wm-icons-0.4.0/etc/debian-menu-system/README
wm-icons-0.4.0/etc/debian-menu-system/README
--- wm-icons-0.4.0/etc/debian-menu-system/README 2024-05-31
20:38:28.000000000 +0000
+++ wm-icons-0.4.0/etc/debian-menu-system/README 2001-03-24
13:43:16.000000000 +0000
@@ -10,14 +10,20 @@
the "standard sections" and wm-icons icons and a map from packages name
to wm-icons icons.
-* wm-icons-fvwm2rc-menu is a menu-method script for FVWM. You should add
- Read wm-icons/menudefs.hook
+* wm-icons-fvwm2rc-menu is a menu-method script for FVWM. You should edit
+ the lines:
+ rootprefix="/usr/local/share/fvwm/debian-menu-system/"
+ userprefix="/.fvwm/debian-menu-system/"
+ replace "/usr/local/share/fvwm/" by the FVWM configuration directory
+ and ".fvwm" by the FVWM user directory. Then, you should add
+ Read debian-menu-system/wm-icons-menu
in the configuration file and bind it in some ways e.g.:
add:
- + "menu system%menu/programs.xpm" Popup "/DebianWmIcons"
+ + "menu system%menu/programs.xpm" Popup MenuFvwmDebianMenuSystem
in your root menu
or add say:
- Mouse 1 R A Menu "/DebianWmIcons"
+ Mouse 1 R A Menu MenuFvwmDebianMenuSystem
+ You should also use the configuration file "this dir"/../fvwm2rc
* Other window managers: just (copy and rename and) edit the correponding
menu methods script; you should add "!include wm-icons.h" and then you
diff -Nru wm-icons-0.4.0/etc/debian-menu-system/wm-icons-fvwm2rc-menu.in
wm-icons-0.4.0/etc/debian-menu-system/wm-icons-fvwm2rc-menu.in
--- wm-icons-0.4.0/etc/debian-menu-system/wm-icons-fvwm2rc-menu.in
2024-05-31 20:38:28.000000000 +0000
+++ wm-icons-0.4.0/etc/debian-menu-system/wm-icons-fvwm2rc-menu.in
2001-03-24 13:43:16.000000000 +0000
@@ -1,11 +1,10 @@
-#!/usr/bin/install-menu
+#!/usr/sbin/install-menu
compat="menu-1"
-!include lang.h
!include menu.h
# you may/should edit/check the systemFindIcon in wm-icons.h
!include wm-icons.h
-function ltitle()=translate($lang,title())
+function ltitle()=translate(lang(),title())
# if you want wm-icons only:
# replace "wmIconsFindIcon" by wmIconsFindIconWmOnly
@@ -22,9 +21,6 @@
fvwm2module= "+ \"" escfirst(ltitle(), $hotkey,"&") \
cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \
"\" Module " $command "\n"
- fvwm= "+ \"" escfirst(ltitle() ,$hotkey,"&") \
- cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \
- "\" " $command "\n"
fvwm2= "+ \"" escfirst(ltitle() ,$hotkey,"&") \
cond_surr(wmIconsFindIcon($icon,$package,$section,"menu/"),"%","%") \
"\" " $command "\n"
@@ -50,8 +46,8 @@
cond_surr(wmIconsFindSectionIcon($section,$icon,"menu/"),"%","%") \
"\" PopUp \"" replacewith($section, " ", "_") "\"\n"
-rootprefix="/etc/X11/fvwm/wm-icons/"
-userprefix="/.fvwm/wm-icons/"
+rootprefix="/usr/local/share/fvwm/debian-menu-system/"
+userprefix="/.fvwm/debian-menu-system/"
treewalk="c(m)"
-genmenu="menudefs.hook"
-rootsection="/DebianWmIcons"
+genmenu="wm-icons-menu"
+rootsection="MenuFvwmDebianMenuSystem"
diff -Nru wm-icons-0.4.0/etc/debian-menu-system/wm-icons.h.in
wm-icons-0.4.0/etc/debian-menu-system/wm-icons.h.in
--- wm-icons-0.4.0/etc/debian-menu-system/wm-icons.h.in 2024-05-31
20:38:28.000000000 +0000
+++ wm-icons-0.4.0/etc/debian-menu-system/wm-icons.h.in 2001-03-24
13:43:16.000000000 +0000
@@ -13,24 +13,13 @@
# need to replace /urs/local/share/fvwm by "fvwm-themes @datadir@"/fvwm
function systemFindIcon($filename)= \
ifeqelse($filename, "", "", \
- ifelsefile("/usr/share/icons/wm-icons/mini/" $filename, \
- "/usr/share/icons/wm-icons/mini/" $filename, \
ifelsefile("/usr/share/icons/mini/" $filename, \
- "/usr/share/icons/mini/" $filename, \
- ifelsefile("/usr/share/icons/wm-icons/16x16-general/" $filename, \
- "/usr/share/icons/wm-icons/16x16-general/" $filename, \
- ifelsefile("/usr/share/icons/wm-icons/16x16-gnome/" $filename, \
- "/usr/share/icons/wm-icons/16x16-gnome/" $filename, \
- ifelsefile("/usr/share/icons/wm-icons/16x16-kde/" $filename, \
- "/usr/share/icons/wm-icons/16x16-kde/" $filename, \
- ifelsefile("/usr/share/fvwm-crystal/fvwm/icons/Default/" $filename, \
- "/usr/share/fvwm-crystal/fvwm/icons/Default/" $filename, \
+ "/usr/share/icons/mini/" $filename, \
ifelsefile("/usr/local/share/fvwm/tr-images/16x16-gnome/" $filename, \
- "/usr/local/share/fvwm/tr-images/16x16-gnome/" $filename, \
+ "/usr/local/share/fvwm/tr-images/16x16-gnome/" $filename, \
ifelsefile("/usr/local/share/fvwm/tr-images/16x16-kde2/" $filename, \
- "/usr/local/share/fvwm/tr-images/16x16-kde2/" $filename, \
- "")))))))))
-
+ "/usr/local/share/fvwm/tr-images/16x16-kde2/" $filename,\
+ ""))))
# return the wm-icons associated to a standard section. If the section is
# not standard return the "system/user" icons for this section and if not
@@ -41,7 +30,7 @@
ifeqelse(systemFindIcon($i),"",\
ifeqelse(wmIconsGetSectionIcon(parent($s)),"",\
ifeqelse(wmIconsGetSectionIcon(parent(parent($s))),"",\
- $t "folder.xpm",\
+ $t "folder.xpm",\
$t wmIconsGetSectionIcon(parent(parent($s)))),\
$t wmIconsGetSectionIcon(parent($s))),\
systemFindIcon($i)),\
@@ -52,7 +41,7 @@
ifeqelse(wmIconsGetSectionIcon($s),"",\
ifeqelse(wmIconsGetSectionIcon(parent($s)),"",\
ifeqelse(wmIconsGetSectionIcon(parent(parent($s))),"",\
- $t "folder.xpm",\
+ $t "folder.xpm",\
$t wmIconsGetSectionIcon(parent(parent($s)))),\
$t wmIconsGetSectionIcon(parent($s))),\
$t wmIconsGetSectionIcon($s))
diff -Nru wm-icons-0.4.0/icons/Makefile.am wm-icons-0.4.0/icons/Makefile.am
--- wm-icons-0.4.0/icons/Makefile.am 2024-05-31 20:38:28.000000000 +0000
+++ wm-icons-0.4.0/icons/Makefile.am 2006-04-09 20:02:58.000000000 +0000
@@ -16,16 +16,16 @@
SYMLINKS_LST = _symlinks.lst
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(icondir)
+ $(mkinstalldirs) $(icondir)
chmod -R o-w,go+rX *
cd $(top_srcdir)/icons; \
for iconset in $(SELECTED_ICON_SETS); do \
- rm -rf $(DESTDIR)$(icondir)/$$iconset; \
+ rm -rf $(icondir)/$$iconset; \
tar cpf - "$$iconset" \
- | (cd "$(DESTDIR)$(icondir)" && tar xfBp -); \
- find "$(DESTDIR)$(icondir)/$$iconset" -name CVS \
+ | (cd "$(icondir)" && tar xfBp -); \
+ find "$(icondir)/$$iconset" -name CVS \
-exec rm -r {} \; 2>/dev/null; \
- (cd "$(DESTDIR)$(icondir)/$$iconset" && [ -f $(SYMLINKS_LST) ] \
+ (cd "$(icondir)/$$iconset" && [ -f $(SYMLINKS_LST) ] \
&& $(AWK) '{ system("ln -sf " $$1 " " $$2) }' \
< $(SYMLINKS_LST) \
&& rm $(SYMLINKS_LST) || true \
@@ -34,9 +34,9 @@
uninstall-local:
for iconset in $(SELECTED_ICON_SETS); do \
- rm -rf $(DESTDIR)$(icondir)/$$iconset; \
+ rm -rf $(icondir)/$$iconset; \
done
- for i in $(DESTDIR)$(icondir)/*; do \
+ for i in $(icondir)/*; do \
if [ -L "$$i" ] && [ ! -e "$$i" ]; then rm -f "$$i"; fi; \
done
- -rmdir $(DESTDIR)$(icondir)
+ -rmdir $(icondir)
