diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rwxr-xr-x | debian/rules | 1 | ||||
| -rw-r--r-- | debian/sane-utils.links | 1 | ||||
| -rw-r--r-- | debian/sane-utils.manpages | 1 | ||||
| -rw-r--r-- | debian/sane-utils.preinst | 21 |
6 files changed, 33 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index c0b6e1e..e977760 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,14 @@ sane-backends (1.1.1-3) UNRELEASED; urgency=medium - Don't remove group scanner (Closes: #1005737). * debian/control: - Add Recommends: sane-airscan to libsane1 (Closes: 1005817). + * Move man page sane-umax_pp.5 back to libsane-common (Closes: #1005736): + - debian/rules: + - Remove delete manpage vom libsane-common. + - New debian/sane-utils.preinst to remove man page and sysmlink. + - debian/sane-utils.link: + - Remove create link from sane-umax_pp.5 + - debian/control: + - Add new Breaks and Replace. -- Jörg Frings-Fürst <debian@jff.email> Mon, 14 Feb 2022 21:28:17 +0100 diff --git a/debian/control b/debian/control index f6277ff..a7b9e87 100644 --- a/debian/control +++ b/debian/control @@ -43,8 +43,7 @@ Depends: ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} -Breaks: libsane-common (<<1.0.27-1~) -Replaces: libsane-common (<<1.0.27-1~) +Breaks: libsane-common (<<1.1.1-3~) Suggests: avahi-daemon, unpaper Description: API library for scanners -- utilities SANE stands for "Scanner Access Now Easy" and is an application @@ -67,7 +66,8 @@ Multi-Arch: foreign Pre-Depends: dpkg (>= 1.15.7.2) Depends: ${misc:Depends} -Breaks: sane-utils (<<1.0.27-1~) +Breaks: sane-utils (<<1.1.1-3~) +Replaces: sane-utils (<<1.1.1-3~) Description: API library for scanners -- documentation and support files SANE stands for "Scanner Access Now Easy" and is an application programming interface (API) that provides standardized access to any @@ -97,7 +97,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: - sane-airscan + sane-airscan, sane-utils (>= ${binary:Version}), ipp-usb Suggests: avahi-daemon, hplip diff --git a/debian/rules b/debian/rules index d0e1664..ef8e976 100755 --- a/debian/rules +++ b/debian/rules @@ -106,7 +106,6 @@ override_dh_installman-indep: $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/sane-find-scanner.1 $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/scanimage.1 $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/sane-config.1 - $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man5/sane-umax_pp.5 $(RM) -r $(CURDIR)/debian/libsane-common/usr/share/man/man8/ $(RM) -r $(CURDIR)/debian/libsane-common/usr/share/man/man1/ # remove manpages for not build libs diff --git a/debian/sane-utils.links b/debian/sane-utils.links index dacfe5d..50ffd0e 100644 --- a/debian/sane-utils.links +++ b/debian/sane-utils.links @@ -1,2 +1 @@ /dev/null /lib/systemd/system/saned.service -/usr/share/man/man5/sane-umax_pp.5 /usr/share/man/man5/umax_pp.5 diff --git a/debian/sane-utils.manpages b/debian/sane-utils.manpages index 6a2c010..357020f 100644 --- a/debian/sane-utils.manpages +++ b/debian/sane-utils.manpages @@ -1,3 +1,2 @@ usr/share/man/man8/*.8 usr/share/man/man1/*.1 -/usr/share/man/man5/sane-umax_pp.5 diff --git a/debian/sane-utils.preinst b/debian/sane-utils.preinst new file mode 100644 index 0000000..1a7f24b --- /dev/null +++ b/debian/sane-utils.preinst @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +MANPAGE=/usr/share/man/man5/sane-umax_pp.5.gz +MANLINK=/usr/share/man/man5/umax_pp.5.gz + + +if [ -f "$MANLINK" ] && [ -L "$MANLINK" ]; then + # Remove old directory and files that are now provided by xsane-common + rm -rf "$MANLINK" +fi + + +if [ -f "$MANPAGE" ]; then + # Remove old directory and files that are now provided by xsane-common + rm -rf "$MANPAGE" +fi + + +#DEBHELPER# |