Package: oss-preserve
Version: 1.1-2
Severity: normal
Tags: patch
Hi,
Attached is the diff for my oss-preserve 1.1-2.1 NMU.
--
ยท''`. Policy is your friend. Trust the Policy.
: :' : Love the Policy. Obey the Policy. -- Lars Wirzenius
`. `' Proudly running unstable Debian GNU/Linux
`- www.amayita.com www.malapecora.com www.chicasduras.com
diff -u oss-preserve-1.1/debian/changelog oss-preserve-1.1/debian/changelog
--- oss-preserve-1.1/debian/changelog
+++ oss-preserve-1.1/debian/changelog
@@ -1,3 +1,13 @@
+oss-preserve (1.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Get rid of the /usr/doc link in postinst (Closes: #359539).
+ * This bug does not apply (Closes: #367726).
+ * Applied patch by Robert Millan <[EMAIL PROTECTED]>, so that it doesn't
+ FTBFS on GNU/kFreeBSD (Closes: #322206).
+
+ -- Amaya Rodrigo Sastre <[EMAIL PROTECTED]> Mon, 17 Jul 2006 17:21:26 +0200
+
oss-preserve (1.1-2) unstable; urgency=low
* Add "Conflicts: aumix" to resolve interaction problems.
@@ -35,3 +44,0 @@
-Local variables:
-mode: debian-changelog
-End:
diff -u oss-preserve-1.1/debian/postinst oss-preserve-1.1/debian/postinst
--- oss-preserve-1.1/debian/postinst
+++ oss-preserve-1.1/debian/postinst
@@ -42,7 +42,12 @@
# `abort-remove' or `abort-deconfigure'.
case "$1" in
- configure|abort-upgrade|abort-remove|abort-deconfigure)
+ configure)
+ if [ -d /usr/doc -a -h /usr/doc/oss-preserve -a -d
/usr/share/doc/oss-preserve ]; then
+ rm -f /usr/doc/oss-preserve
+ fi
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
only in patch2:
unchanged:
--- oss-preserve-1.1.orig/ossctl.c
+++ oss-preserve-1.1/ossctl.c
@@ -28,7 +28,7 @@
#include <glib.h>
#include <errno.h>
-#include <linux/soundcard.h>
+#include <sys/soundcard.h>
#include <sys/ioctl.h>
#include <sys/types.h>
