Control: tags -1 patch
On Sun, 22 Oct 2023 21:49:50 +0200 Bastian Germann <[email protected]> wrote:
This can be done now because all reverse dependencies have moved away from it
or only have it as an alternative.
Please find a debdiff solving this attached.
diff -Nru bsdmainutils-12.1.8/debian/bsdmainutils.postinst
bsdmainutils-12.1.8+nmu1/debian/bsdmainutils.postinst
--- bsdmainutils-12.1.8/debian/bsdmainutils.postinst 2020-07-20
14:13:06.000000000 +0000
+++ bsdmainutils-12.1.8+nmu1/debian/bsdmainutils.postinst 1970-01-01
00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-mvverbose=-v
-
-# from dpkg-maintscript-helper, modified
-ensure_package_owns_file() {
- local PACKAGE="$1"
- local FILE="$2"
-
- dpkg-query -L "$PACKAGE" | grep -F -q -x "$FILE"
-}
-
-# from dpkg-maintscript-helper, modified
-finish_mv_conffile() {
- local CONFFILE="$1"
- local NEWCONFFILE="$2"
- local PACKAGE="$3"
-
- rm $mvverbose -f "$CONFFILE.dpkg-remove"
-
- [ -e "$CONFFILE.dpkg-backup" ] || return 0
- ensure_package_owns_file "$PACKAGE" "$NEWCONFFILE" || return 0
-
- echo "Preserving user changes to $NEWCONFFILE (now owned by
$PACKAGE)..."
- if [ -e "$NEWCONFFILE" ]; then
- mv $mvverbose -f "$NEWCONFFILE" "$NEWCONFFILE.dpkg-new"
- fi
- mv $mvverbose -f "$CONFFILE.dpkg-backup" "$NEWCONFFILE"
-}
-
-if [ "$1" = configure ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt
12.1.6; then
- finish_mv_conffile /etc/default/bsdmainutils /etc/default/calendar
calendar
- finish_mv_conffile /etc/cron-daily/bsdmainutils
/etc/cron.daily/calendar calendar
-fi
-
-#DEBHELPER#
-
diff -Nru bsdmainutils-12.1.8/debian/bsdmainutils.postrm
bsdmainutils-12.1.8+nmu1/debian/bsdmainutils.postrm
--- bsdmainutils-12.1.8/debian/bsdmainutils.postrm 2020-07-20
14:13:06.000000000 +0000
+++ bsdmainutils-12.1.8+nmu1/debian/bsdmainutils.postrm 1970-01-01
00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -e
-
-mvverbose=-v
-
-# from dpkg-maintscript-helper, modified
-ensure_package_owns_file() {
- local PACKAGE="$1"
- local FILE="$2"
-
- dpkg-query -L "$PACKAGE" | grep -F -q -x "$FILE"
-}
-
-# from dpkg-maintscript-helper
-abort_rm_conffile() {
- local CONFFILE="$1"
- local PACKAGE="$2"
-
- ensure_package_owns_file "$PACKAGE" "$CONFFILE" || return 0
-
- if [ -e "$CONFFILE.dpkg-remove" ]; then
- echo "Reinstalling $CONFFILE that was moved away"
- mv $mvverbose "$CONFFILE.dpkg-remove" "$CONFFILE"
- fi
- if [ -e "$CONFFILE.dpkg-backup" ]; then
- echo "Reinstalling $CONFFILE that was backupped"
- mv $mvverbose "$CONFFILE.dpkg-backup" "$CONFFILE"
- fi
-}
-
-if [ "$1" = abort-upgrade ] && dpkg --compare-versions "$2" lt 12.1.6; then
- abort_rm_conffile /etc/default/bsdmainutils
- abort_rm_conffile /etc/cron.daily/bsdmainutils
-fi
-
-#DEBHELPER#
-
diff -Nru bsdmainutils-12.1.8/debian/bsdmainutils.preinst
bsdmainutils-12.1.8+nmu1/debian/bsdmainutils.preinst
--- bsdmainutils-12.1.8/debian/bsdmainutils.preinst 2023-02-20
09:19:03.000000000 +0000
+++ bsdmainutils-12.1.8+nmu1/debian/bsdmainutils.preinst 1970-01-01
00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-set -e
-
-mvverbose=-v
-
-# from dpkg-maintscript-helper, modified
-ensure_package_owns_file() {
- local PACKAGE="$1"
- local FILE="$2"
-
- dpkg-query -L "$PACKAGE" | grep -F -q -x "$FILE"
-}
-
-# from dpkg-maintscript-helper
-prepare_rm_conffile() {
- local CONFFILE="$1"
- local PACKAGE="$2"
-
- [ -e "$CONFFILE" ] || return 0
- ensure_package_owns_file "$PACKAGE" "$CONFFILE" || return 0
-
- local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
- local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PACKAGE | \
- sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
- if [ "$md5sum" != "$old_md5sum" ]; then
- mv $mvverbose -f "$CONFFILE" "$CONFFILE.dpkg-backup"
- else
- mv $mvverbose -f "$CONFFILE" "$CONFFILE.dpkg-remove"
- fi
-}
-
-if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 12.1.6; then
- prepare_rm_conffile /etc/default/bsdmainutils bsdmainutils
- prepare_rm_conffile /etc/cron.daily/bsdmainutils bsdmainutils
-fi
-
-if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 12.1.7+nmu3~; then
- update-alternatives --remove from /usr/bin/bsd-from
-fi
-
-#DEBHELPER#
-
diff -Nru bsdmainutils-12.1.8/debian/changelog
bsdmainutils-12.1.8+nmu1/debian/changelog
--- bsdmainutils-12.1.8/debian/changelog 2023-02-20 09:19:03.000000000
+0000
+++ bsdmainutils-12.1.8+nmu1/debian/changelog 2024-11-24 13:34:46.000000000
+0000
@@ -1,3 +1,10 @@
+bsdmainutils (12.1.8+nmu1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop transitional package bsdmainutils. (Closes: #1038224)
+
+ -- Bastian Germann <[email protected]> Sun, 24 Nov 2024 13:34:46 +0000
+
bsdmainutils (12.1.8) unstable; urgency=medium
* Drop root privileges before opening calendar files. (Closes: #998206)
diff -Nru bsdmainutils-12.1.8/debian/control
bsdmainutils-12.1.8+nmu1/debian/control
--- bsdmainutils-12.1.8/debian/control 2023-02-20 09:19:03.000000000 +0000
+++ bsdmainutils-12.1.8+nmu1/debian/control 2024-11-24 13:32:47.000000000
+0000
@@ -9,16 +9,6 @@
Vcs-Git: https://salsa.debian.org/meskes/bsdmainutils.git
Rules-Requires-Root: no
-Package: bsdmainutils
-Architecture: all
-Multi-Arch: foreign
-Section: oldlibs
-Depends: ${misc:Depends}, bsdutils (>= 3.0-0), debianutils (>= 1.8),
- bsdextrautils (>= 2.35.2-7), ncal
-Suggests: calendar, whois, vacation, mailutils
-Description: Transitional package for more utilities from FreeBSD
- This is a transitional package, it can be safely removed.
-
Package: ncal
Architecture: any
Multi-Arch: foreign
