Skip to content

Commit

Permalink
Debian packaging improvement (#459)
Browse files Browse the repository at this point in the history
* debian: use dh-sequence-python3

* d/control: add missed gir packages dependencies to cinnamon-screensaver

including the ones that are virtual for now

* d/control: Remove unnecessary constraints

when version in oldstable is major is not needed anymore

* switch to debhelper-compat and compat 13

also remove from d/rules things that are now default

* debian: remove file of a package that was removed

* d/control: remove old breaks/replaces

are older that Debian oldstable and previous ubuntu LTS so are not
needed anymore and without risk
  • Loading branch information
Fantu committed Aug 14, 2024
1 parent 0ad273f commit 96e5395
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 27 deletions.
1 change: 0 additions & 1 deletion debian/cinnamon-screensaver-pam-helper.install

This file was deleted.

1 change: 0 additions & 1 deletion debian/compat

This file was deleted.

36 changes: 17 additions & 19 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,54 +3,52 @@ Section: x11
Priority: optional
Maintainer: Linux Mint <[email protected]>
Build-Depends:
debhelper (>= 11.1~),
dh-python,
gnome-pkg-tools (>= 0.10),
debhelper-compat (= 13),
dh-sequence-python3,
gnome-pkg-tools,
gobject-introspection,
intltool (>= 0.40.0),
intltool,
libdbus-1-dev,
libgirepository1.0-dev,
libglib2.0-dev (>= 2.37.3),
libgtk-3-dev (>= 3.22),
libglib2.0-dev,
libgtk-3-dev,
libpam0g-dev,
libxdo-dev,
libxext-dev,
meson (>= 0.40.0),
meson,
python3,
Standards-Version: 3.9.6

Package: cinnamon-screensaver
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends:
cinnamon-desktop-data (>= 3.5),
gir1.2-cinnamondesktop-3.0 (>= 4.8),
cinnamon-desktop-data (>= 6.0),
gir1.2-caribou-1.0,
gir1.2-cinnamondesktop-3.0 (>= 6.0),
gir1.2-gdk-3.0,
gir1.2-gdkpixbuf-2.0,
gir1.2-gio-2.0,
gir1.2-gkbd-3.0,
gir1.2-glib-2.0,
gir1.2-gobject-2.0,
gir1.2-gtk-3.0,
gir1.2-pango-1.0,
gir1.2-xapp-1.0,
iso-flag-png,
libxdo3,
python3,
python3-gi,
python3-gi-cairo,
python3-setproctitle,
python3-xapp (>= 1.0.1),
python3-xapp,
python3-xlib,
x11-utils,
${misc:Depends},
${python3:Depends},
${shlibs:Depends},
Recommends: libpam-gnome-keyring
Breaks:
cinnamon-screensaver-pam-helper (<< 3.8),
cinnamon-screensaver-webkit-plugin (<< 3.9),
cinnamon-screensaver-x-plugin (<< 3.9),
libcscreensaver0 (<< ${source:Version})
Replaces:
cinnamon-screensaver-pam-helper (<< 3.8),
cinnamon-screensaver-webkit-plugin (<< 3.9),
cinnamon-screensaver-x-plugin (<< 3.9)
Breaks: libcscreensaver0 (<< ${source:Version})
Description: Cinnamon screen saver and locker
cinnamon-screensaver is a screen saver and locker that aims to have simple,
sane and secure defaults, and be well integrated with the Cinnamon desktop.
Expand Down
7 changes: 1 addition & 6 deletions debian/rules
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#!/usr/bin/make -f

export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

%:
dh $@ --with=python3
dh $@

override_dh_strip:
dh_strip --dbg-package=libcscreensaver-dbg
Expand All @@ -24,9 +23,5 @@ execute_after_dh_fixperms:
# just because there isn't one
override_dh_auto_test:

# --list-missing will be default in compat 12
override_dh_missing:
dh_missing --list-missing

override_dh_python3:
dh_python3 usr/share/cinnamon-screensaver

0 comments on commit 96e5395

Please sign in to comment.