Package: usermode
Version: 1.114-1
Severity: wishlist
Tags: patch

Hi,

the Debian packaging converts 3 PNG icons to XPM pixmaps; they were used
in the past by the Debian menu files, which were removed with version
1.109-1. Hence, there is no more need to convert them, dropping also the
netpbm build dependency.

Attached patch for this.

Thanks,
-- 
Pino
>From 269b6b62379239e816e8a1fc2f0cc7e0f796f6d1 Mon Sep 17 00:00:00 2001
From: Pino Toscano <p...@debian.org>
Date: Sun, 23 May 2021 10:56:45 +0200
Subject: [PATCH] stop generating custom XPM pixmaps, as were only used with
 old Debian menu files (dropped in 1.109-1); drop netpbm B-D, no more needed

---
 debian/clean            | 3 ---
 debian/control          | 1 -
 debian/rules            | 7 +------
 debian/usermode.install | 1 -
 4 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 debian/clean
 delete mode 100644 debian/usermode.install

diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 25ccdef..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/disks.xpm
-debian/password.xpm
-debian/user_icon.xpm
diff --git a/debian/control b/debian/control
index ed9e78e..c9ecc0f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends:
  libsm-dev,
  libuser1-dev,
  libxml-parser-perl,
- netpbm,
 Rules-Requires-Root: no
 Standards-Version: 4.4.1
 Homepage: https://pagure.io/usermode/
diff --git a/debian/rules b/debian/rules
index d25cdb0..f8591a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ override_dh_auto_configure:
                MKFS=/sbin/mkfs \
                FDFORMAT=/usr/bin/fdformat
 
-override_dh_install: user_icon.xpm password.xpm disks.xpm
+override_dh_install:
        dh_install
        # this functionality doesn't appear to be supported in Debian
        rm $(DEBDIR)/usr/bin/pam-panel-icon 
$(DEBDIR)/usr/share/pixmaps/badge-small.png
@@ -40,10 +40,5 @@ override_dh_fixperms:
        dh_fixperms
        chmod 04755 $(DEBDIR)/usr/sbin/userhelper
 
-%.xpm : %.png
-       pngtopnm -alpha $< | pnmscale -xysize 32 32 > debian/alpha.pnm
-       pngtopnm $< | pnmscale -xysize 32 32 | ppmtoxpm 
-alphamask=debian/alpha.pnm > debian/$@
-       rm debian/alpha.pnm
-
 override_dh_missing:
        dh_missing --fail-missing
diff --git a/debian/usermode.install b/debian/usermode.install
deleted file mode 100644
index e95a7b7..0000000
--- a/debian/usermode.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/user_icon.xpm debian/password.xpm debian/disks.xpm usr/share/pixmaps
-- 
2.30.2

Reply via email to