Skip to content

Commit 96e5395

Browse files
authored
Debian packaging improvement (#459)
* 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
1 parent 0ad273f commit 96e5395

File tree

4 files changed

+18
-27
lines changed

4 files changed

+18
-27
lines changed

debian/cinnamon-screensaver-pam-helper.install

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/compat

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/control

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,52 @@ Section: x11
33
Priority: optional
44
Maintainer: Linux Mint <[email protected]>
55
Build-Depends:
6-
debhelper (>= 11.1~),
7-
dh-python,
8-
gnome-pkg-tools (>= 0.10),
6+
debhelper-compat (= 13),
7+
dh-sequence-python3,
8+
gnome-pkg-tools,
99
gobject-introspection,
10-
intltool (>= 0.40.0),
10+
intltool,
1111
libdbus-1-dev,
1212
libgirepository1.0-dev,
13-
libglib2.0-dev (>= 2.37.3),
14-
libgtk-3-dev (>= 3.22),
13+
libglib2.0-dev,
14+
libgtk-3-dev,
1515
libpam0g-dev,
1616
libxdo-dev,
1717
libxext-dev,
18-
meson (>= 0.40.0),
18+
meson,
1919
python3,
2020
Standards-Version: 3.9.6
2121

2222
Package: cinnamon-screensaver
2323
Architecture: any
2424
Pre-Depends: ${misc:Pre-Depends}
2525
Depends:
26-
cinnamon-desktop-data (>= 3.5),
27-
gir1.2-cinnamondesktop-3.0 (>= 4.8),
26+
cinnamon-desktop-data (>= 6.0),
27+
gir1.2-caribou-1.0,
28+
gir1.2-cinnamondesktop-3.0 (>= 6.0),
29+
gir1.2-gdk-3.0,
30+
gir1.2-gdkpixbuf-2.0,
31+
gir1.2-gio-2.0,
2832
gir1.2-gkbd-3.0,
2933
gir1.2-glib-2.0,
34+
gir1.2-gobject-2.0,
3035
gir1.2-gtk-3.0,
36+
gir1.2-pango-1.0,
3137
gir1.2-xapp-1.0,
3238
iso-flag-png,
3339
libxdo3,
3440
python3,
3541
python3-gi,
3642
python3-gi-cairo,
3743
python3-setproctitle,
38-
python3-xapp (>= 1.0.1),
44+
python3-xapp,
3945
python3-xlib,
4046
x11-utils,
4147
${misc:Depends},
4248
${python3:Depends},
4349
${shlibs:Depends},
4450
Recommends: libpam-gnome-keyring
45-
Breaks:
46-
cinnamon-screensaver-pam-helper (<< 3.8),
47-
cinnamon-screensaver-webkit-plugin (<< 3.9),
48-
cinnamon-screensaver-x-plugin (<< 3.9),
49-
libcscreensaver0 (<< ${source:Version})
50-
Replaces:
51-
cinnamon-screensaver-pam-helper (<< 3.8),
52-
cinnamon-screensaver-webkit-plugin (<< 3.9),
53-
cinnamon-screensaver-x-plugin (<< 3.9)
51+
Breaks: libcscreensaver0 (<< ${source:Version})
5452
Description: Cinnamon screen saver and locker
5553
cinnamon-screensaver is a screen saver and locker that aims to have simple,
5654
sane and secure defaults, and be well integrated with the Cinnamon desktop.

debian/rules

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/usr/bin/make -f
22

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

65
%:
7-
dh $@ --with=python3
6+
dh $@
87

98
override_dh_strip:
109
dh_strip --dbg-package=libcscreensaver-dbg
@@ -24,9 +23,5 @@ execute_after_dh_fixperms:
2423
# just because there isn't one
2524
override_dh_auto_test:
2625

27-
# --list-missing will be default in compat 12
28-
override_dh_missing:
29-
dh_missing --list-missing
30-
3126
override_dh_python3:
3227
dh_python3 usr/share/cinnamon-screensaver

0 commit comments

Comments
 (0)