Package: isdnutils
Version: 1:3.25+dfsg1-3.3
Severity: normal
Tags: patch pending
[Replace XX with correct value]
Dear maintainer,
I've prepared an NMU for isdnutils (versioned as 1:3.25+dfsg1-3.4) and
uploaded it to DELAYED/XX. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru isdnutils-3.25+dfsg1/debian/changelog
isdnutils-3.25+dfsg1/debian/changelog
--- isdnutils-3.25+dfsg1/debian/changelog 2014-04-25 22:31:01.000000000
+0200
+++ isdnutils-3.25+dfsg1/debian/changelog 2014-04-26 11:50:45.000000000
+0200
@@ -1,3 +1,17 @@
+isdnutils (1:3.25+dfsg1-3.4) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix "FTBFS after upgrade tcl-dev to 8.6" by applying patch from BTS
+ (Closes: #725000)
+ * Fix "postinst uses /usr/share/doc content (Policy 12.3)", applying
+ relevant sections from the patch found in BTS (Closes: #710359)
+ * debian/patches/vbox-configure-quoting.patch: fix wrong handling of paths
+ with embedded quotes; this confuses vbox's configure script something
+ fierce, and causes files to be missed from debian/tmp'/usr/share/doc/'
+ at install time.
+
+ -- Tobias Frost <t...@coldtobi.de> Sat, 26 Apr 2014 00:40:47 +0200
+
isdnutils (1:3.25+dfsg1-3.3) unstable; urgency=low
[ Andreas Beckmann ]
diff -Nru isdnutils-3.25+dfsg1/debian/ipppd.examples
isdnutils-3.25+dfsg1/debian/ipppd.examples
--- isdnutils-3.25+dfsg1/debian/ipppd.examples 2013-06-06 12:36:15.000000000
+0200
+++ isdnutils-3.25+dfsg1/debian/ipppd.examples 2014-04-26 11:46:20.000000000
+0200
@@ -1,3 +1,2 @@
-debian/ipppd.DEVICE
debian/auth-down
debian/auth-up
diff -Nru isdnutils-3.25+dfsg1/debian/ipppd.install.in
isdnutils-3.25+dfsg1/debian/ipppd.install.in
--- isdnutils-3.25+dfsg1/debian/ipppd.install.in 2013-06-06
12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/ipppd.install.in 2014-04-26
11:46:20.000000000 +0200
@@ -1,3 +1,4 @@
usr/sbin/ipppstats
usr/sbin/ipppd
debian/ioptions /etc/ppp/
+debian/ipppd.DEVICE /usr/share/isdn/default
diff -Nru isdnutils-3.25+dfsg1/debian/ipppd.postinst
isdnutils-3.25+dfsg1/debian/ipppd.postinst
--- isdnutils-3.25+dfsg1/debian/ipppd.postinst 2013-06-06 12:36:15.000000000
+0200
+++ isdnutils-3.25+dfsg1/debian/ipppd.postinst 2014-04-26 11:46:20.000000000
+0200
@@ -64,7 +64,7 @@
ucf --three-way --debconf-ok "$tempfile"
/etc/isdn/device.$IPPPX
ucfr ipppd /etc/isdn/device.$IPPPX
- gzip -dc /usr/share/doc/ipppd/examples/ipppd.DEVICE.gz >
"$tempfile"
+ cp /usr/share/isdn/default/ipppd.DEVICE "$tempfile"
perl -i -pe '$_ = "" if /^# REMOVE the/; $_ = "" if /^#
Warning! not configured yet!/; s,^name X.,name '"$ISPLOGIN"',;
s,^#ms-get-dns,ms-get-dns,;' "$tempfile"
ucf --three-way --debconf-ok "$tempfile" /etc/isdn/ipppd.$IPPPX
ucfr ipppd /etc/isdn/ipppd.$IPPPX
diff -Nru isdnutils-3.25+dfsg1/debian/isdnlog.examples
isdnutils-3.25+dfsg1/debian/isdnlog.examples
--- isdnutils-3.25+dfsg1/debian/isdnlog.examples 2013-06-06
12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/isdnlog.examples 2014-04-26
11:46:20.000000000 +0200
@@ -1,3 +1,6 @@
-isdnlog/samples/*
-debian/isdnlog.DEVICE
+isdnlog/samples/isdnlog.*
+isdnlog/samples/provider
+isdnlog/samples/reload
+isdnlog/samples/rtest.dat
+isdnlog/samples/stop
debian/callerid.conf
diff -Nru isdnutils-3.25+dfsg1/debian/isdnlog.install.in
isdnutils-3.25+dfsg1/debian/isdnlog.install.in
--- isdnutils-3.25+dfsg1/debian/isdnlog.install.in 2013-06-06
12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/isdnlog.install.in 2014-04-26
11:46:20.000000000 +0200
@@ -12,3 +12,7 @@
isdnlog/README /usr/share/doc/isdnlog/de
isdnlog/TODO /usr/share/doc/isdnlog/de
isdnlog/contrib/winpopup/winpopup /usr/share/doc/isdnlog/de
+debian/isdnlog.DEVICE /usr/share/isdn/default
+isdnlog/samples/isdn.conf /usr/share/isdn/default
+isdnlog/samples/isdn.conf.?? /usr/share/isdn/default
+isdnlog/samples/rate.conf* /usr/share/isdn/default
diff -Nru isdnutils-3.25+dfsg1/debian/isdnlog.postinst
isdnutils-3.25+dfsg1/debian/isdnlog.postinst
--- isdnutils-3.25+dfsg1/debian/isdnlog.postinst 2013-06-06
12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/isdnlog.postinst 2014-04-26
11:46:20.000000000 +0200
@@ -26,7 +26,7 @@
if [ "$country" = other ]; then
country=default
fi
- defdir=/usr/share/doc/isdnlog/examples/
+ defdir=/usr/share/isdn/default
conffile=/etc/isdn/isdn.conf
tempfile=$(mktemp -t isdnutils.XXXXXX)
trap 'rm -f "$tempfile"' EXIT
@@ -58,7 +58,7 @@
ucfr isdnlog /etc/isdn/$cfg
done
- sed '/REMOVE the next line/,/REMOVE the above/d' <
/usr/share/doc/isdnlog/examples/isdnlog.DEVICE > "$tempfile"
+ sed '/REMOVE the next line/,/REMOVE the above/d' <
/usr/share/isdn/default/isdnlog.DEVICE > "$tempfile"
ucf --three-way --debconf-ok "$tempfile" /etc/isdn/isdnlog.isdnctrl0
ucfr isdnlog /etc/isdn/isdnlog.isdnctrl0
if [ -x /etc/init.d/isdnutils-base ]; then
diff -Nru isdnutils-3.25+dfsg1/debian/isdnutils-base.cron.d
isdnutils-3.25+dfsg1/debian/isdnutils-base.cron.d
--- isdnutils-3.25+dfsg1/debian/isdnutils-base.cron.d 2013-06-06
12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/isdnutils-base.cron.d 1970-01-01
01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-# Change the line below for your local requirements and uncomment them.
-# Use "init q" to reread inittab.
-# look at the mgetty manpage for more information (mgetty isn't standard!)
-#
-#I0:2345:respawn:/sbin/mgetty -D -m '"" ATZ OK AT&Eyourmsnhere OK AT&B512 OK'
-s 38400 ttyI0
diff -Nru isdnutils-3.25+dfsg1/debian/isdnutils-base.maintscript
isdnutils-3.25+dfsg1/debian/isdnutils-base.maintscript
--- isdnutils-3.25+dfsg1/debian/isdnutils-base.maintscript 1970-01-01
01:00:00.000000000 +0100
+++ isdnutils-3.25+dfsg1/debian/isdnutils-base.maintscript 2014-04-26
11:46:20.000000000 +0200
@@ -0,0 +1 @@
+mv_conffile /etc/init.d/isdnutils /etc/init.d/isdnutils-base 1:3.25+dfsg1-6
diff -Nru isdnutils-3.25+dfsg1/debian/isdnvboxserver.postinst
isdnutils-3.25+dfsg1/debian/isdnvboxserver.postinst
--- isdnutils-3.25+dfsg1/debian/isdnvboxserver.postinst 2013-06-06
12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/isdnvboxserver.postinst 2014-04-26
11:46:20.000000000 +0200
@@ -124,7 +124,7 @@
# on initial installation it won't exist, and "old" name == new name
# so create it here if necessary
mkdir -p "$VBOX_SPOOL/incoming" "$VBOX_SPOOL/messages"
- cp /usr/share/doc/isdnvboxserver/examples/standard.tcl.example
"$VBOX_SPOOL/./standard.tcl"
+ cp /usr/share/isdnvboxserver/default/standard.tcl "$VBOX_SPOOL/."
fi
if chown -R "$VBOX_DUSER" "$VBOX_SPOOL"; then
: #OK
diff -Nru isdnutils-3.25+dfsg1/debian/patches/series
isdnutils-3.25+dfsg1/debian/patches/series
--- isdnutils-3.25+dfsg1/debian/patches/series 2014-04-25 23:18:55.000000000
+0200
+++ isdnutils-3.25+dfsg1/debian/patches/series 2014-04-26 11:47:54.000000000
+0200
@@ -6,3 +6,4 @@
ipppd-replace-gpl-code.patch
capiinfo-autotools.patch
tcl8.6.patch
+vbox-configure-quoting.patch
diff -Nru isdnutils-3.25+dfsg1/debian/patches/vbox-configure-quoting.patch
isdnutils-3.25+dfsg1/debian/patches/vbox-configure-quoting.patch
--- isdnutils-3.25+dfsg1/debian/patches/vbox-configure-quoting.patch
1970-01-01 01:00:00.000000000 +0100
+++ isdnutils-3.25+dfsg1/debian/patches/vbox-configure-quoting.patch
2014-04-26 11:46:20.000000000 +0200
@@ -0,0 +1,21 @@
+Description: fix wrong handling of paths with embedded quotes
+ This confuses vbox's configure script something fierce, and causes files to
+ be missed from debian/tmp'/usr/share/man/' at install time.
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+
+Index: trunk/vbox/configure.in
+===================================================================
+--- trunk.orig/vbox/configure.in
++++ trunk/vbox/configure.in
+@@ -26,6 +26,11 @@
+ AC_SUBST(VERSION)
+ AC_SUBST(VERDATE)
+
++CONFIG_BINDIR=`eval echo ${CONFIG_BINDIR:-"/usr/man"}`
++CONFIG_MANDIR=`eval echo ${CONFIG_MANDIR:-"/usr/man"}`
++CONFIG_SBINDIR=`eval echo ${CONFIG_SBINDIR:-"/sbin"}`
++VBOX_DOCDIR=`eval echo ${VBOX_DOCDIR:-"/usr/share/doc/vbox"}`
++
+ dnl #------------------------------------------------------------------------#
+ dnl # Checks for programs: #
+ dnl #------------------------------------------------------------------------#
diff -Nru isdnutils-3.25+dfsg1/debian/rules isdnutils-3.25+dfsg1/debian/rules
--- isdnutils-3.25+dfsg1/debian/rules 2013-06-06 12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/rules 2014-04-26 11:46:20.000000000 +0200
@@ -52,6 +52,8 @@
debian/tmp/usr/share/man/man5/vbox.5
install -m 0644 vbox/examples/vboxrc.example \
debian/isdnvboxclient/usr/share/doc/isdnvboxclient/examples/vboxrc
+ install -m 0644 vbox/examples/standard.tcl.example \
+ debian/isdnvboxserver/usr/share/isdnvboxserver/default/standard.tcl
# remove some unwanted stuff
set -e
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
