tags 527529 + patch
tags 530105 + patch
tags 530980 + patch
thanks
Dear maintainer,
I've prepared an NMU for isdnutils (versioned as 1:3.9.20060704-3.7) and
uploaded it to the archive.
Regards.
diff -u isdnutils-3.9.20060704/debian/control
isdnutils-3.9.20060704/debian/control
--- isdnutils-3.9.20060704/debian/control
+++ isdnutils-3.9.20060704/debian/control
@@ -2,14 +2,14 @@
Section: utils
Priority: extra
Maintainer: Paul Slootman <p...@debian.org>
-Uploaders: Paul Slootman <p...@debian.org>, Matthias Klose <d...@debian.org>
+Uploaders: Matthias Klose <d...@debian.org>
Standards-Version: 3.7.3
-Build-Depends: debhelper (>=4.1.16), bzip2, libncurses5-dev | libncurses-dev,
xutils | imake, tcl8.3-dev, linuxdoc-tools (>=0.9.20), groff, libtool,
libxaw7-dev, libreadline5-dev | libreadline-dev, libpcap0.8-dev, autotools-dev,
automake1.4, automake1.7, automake1.9, autoconf2.13, autoconf, libssl-dev,
psutils, lsb-release, po-debconf
+Build-Depends: debhelper (>=5), bzip2, libncurses5-dev | libncurses-dev,
xutils-dev | imake, tcl8.3-dev, linuxdoc-tools (>=0.9.20), groff, libtool,
libxaw7-dev, libreadline5-dev | libreadline-dev, libpcap0.8-dev, autotools-dev,
automake1.4, automake1.7, automake1.9, autoconf2.13, autoconf, libssl-dev,
psutils, lsb-release, po-debconf
Package: isdnutils
Priority: optional
Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel
powerpc ppc64 sparc s390
-Depends: isdnutils-base (= ${binary:Version}), ipppd, isdnlog,
isdnutils-xtools, isdnvboxserver, isdnvboxclient, openbsd-inetd |
inet-superserver
+Depends: isdnutils-base (= ${binary:Version}), ipppd, isdnlog,
isdnutils-xtools, isdnvboxserver, isdnvboxclient, openbsd-inetd |
inet-superserver, ${misc:Depends}
Suggests: isdnutils-doc, isdneurofile, pppdcapiplugin, capiutils
Conflicts: ipppd (<<1:3.1pre1b-23)
Description: Most important ISDN-related packages and utilities
@@ -49,7 +49,7 @@
Priority: optional
Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel
powerpc ppc64 sparc s390
Pre-Depends: debconf (>= 1.2.9) | debconf-2.0
-Depends: makedev (>= 2.3.1-77), ${shlibs:Depends}, lsb-base (>= 1.3-9ubuntu3)
+Depends: makedev (>= 2.3.1-77), ${shlibs:Depends}, lsb-base (>= 1.3-9ubuntu3),
${misc:Depends}
Suggests: ipppd, isdnlog, isdnutils-doc, isdnutils-xtools, isdnvboxserver,
isdnvboxclient
Replaces: isdnutils (<<1:3.1pre1b-23)
Description: ISDN utilities, the basic (minimal) set
@@ -68,7 +68,7 @@
Package: isdnutils-xtools
Architecture: alpha amd64 arm armeb armel armeb armel hppa i386 ia64 m68k mips
mipsel powerpc ppc64 sparc s390
Section: x11
-Depends: isdnutils-base (= ${binary:Version}), ${shlibs:Depends}
+Depends: isdnutils-base (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Replaces: isdnutils (<<1:3.1pre1b-0)
Description: ISDN utilities that use X
These are the graphical utilities for ISDN, xmonisdn and xisdnload.
@@ -94,7 +94,7 @@
Package: isdnlog
Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel
powerpc ppc64 sparc s390
-Depends: isdnutils-base (= ${binary:Version}), isdnlog-data (>=
${binary:Version}), debconf (>=1.2.9) | debconf-2.0, ${shlibs:Depends}
+Depends: isdnutils-base (= ${binary:Version}), isdnlog-data (>=
${binary:Version}), debconf (>=1.2.9) | debconf-2.0, ${shlibs:Depends},
${misc:Depends}
Replaces: isdnutils (<<1:3.1pre1b-0)
Description: ISDN connection logger
isdnlog logs all ISDN connections, and can calculate the cost of calls. If
@@ -104,6 +104,7 @@
Package: isdnlog-data
Architecture: all
+Depends: ${misc:Depends}
Recommends: isdnlog (>= ${source:Version})
Description: data for isdnlog users
All data related to call pricing, area codes, etc. in various countries.
@@ -112,6 +113,7 @@
Package: isdnutils-doc
Architecture: all
Section: doc
+Depends: ${misc:Depends}
Conflicts: isdnutils (<<1:3.1pre1b-1)
Suggests: isdnutils-base (= ${source:Version})
Description: Extensive documentation for isdnutils
@@ -121,7 +123,7 @@
Package: isdnvbox
Architecture: alpha amd64 arm armeb armel armeb armel hppa i386 ia64 m68k mips
mipsel powerpc ppc64 sparc s390
Conflicts: isdnutils (<<1:3.1pre1b-1)
-Depends: isdnvboxclient, isdnvboxserver
+Depends: isdnvboxclient, isdnvboxserver, ${misc:Depends}
Recommends: sox
Description: ISDN answering machine, client and server
Let your Debian system be your answering machine! Messages can be accessed
@@ -134,7 +136,7 @@
Package: isdnvboxclient
Architecture: alpha amd64 arm armeb armel armeb armel hppa i386 ia64 m68k mips
mipsel powerpc ppc64 sparc s390
Conflicts: isdnutils (<<1:3.1pre1b-1), isdnvbox (<<1:3.1pre1b-2)
-Depends: ${shlibs:Depends}, sox | nas-bin | alsa-utils
+Depends: ${shlibs:Depends}, sox | nas-bin | alsa-utils, ${misc:Depends}
Suggests: isdnvboxserver
Replaces: isdnutils (<<1:3.1pre1b-0)
Description: ISDN answering machine, client
@@ -149,7 +151,7 @@
Package: isdnvboxserver
Architecture: alpha amd64 arm armeb armel armeb armel hppa i386 ia64 m68k mips
mipsel powerpc ppc64 sparc s390
Conflicts: isdnutils (<<1:3.1pre1b-1),isdnvbox (<<1:3.1pre1b-2)
-Depends: isdnutils-base (= ${binary:Version}), debconf (>=1.2.9) |
debconf-2.0, ${shlibs:Depends}, openbsd-inetd | inet-superserver, makedev
+Depends: isdnutils-base (= ${binary:Version}), debconf (>=1.2.9) |
debconf-2.0, ${shlibs:Depends}, openbsd-inetd | inet-superserver, makedev,
${misc:Depends}
Suggests: isdnvboxclient
Replaces: isdnutils (<<1:3.1pre1b-0)
Description: ISDN answering machine, server
@@ -163,7 +165,7 @@
Package: capiutils
Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel
powerpc ppc64 sparc s390
-Depends: libcapi20-3 (= ${binary:Version}), ${shlibs:Depends}, lsb-base (>=
1.3-9ubuntu3), makedev
+Depends: libcapi20-3 (= ${binary:Version}), ${shlibs:Depends}, lsb-base (>=
1.3-9ubuntu3), makedev, ${misc:Depends}
Replaces: isdnactivecards (<< 1:3.6.2004-12-19-1)
Section: net
Description: Utilities for CAPI-capable ISDN cards
@@ -177,7 +179,7 @@
Package: libcapi20-3
Architecture: alpha amd64 arm armeb armel armeb armel hppa i386 ia64 m68k mips
mipsel powerpc ppc64 sparc s390
Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: isdnutils (<<1:3.1pre1b-0), libcapi20, libcapi20-2
Conflicts: libcapi20, libcapi20-2
Description: libraries for CAPI support
@@ -192,7 +194,7 @@
Package: libcapi20-dev
Architecture: alpha amd64 arm armeb armel armeb armel hppa i386 ia64 m68k mips
mipsel powerpc ppc64 sparc s390
Section: libdevel
-Depends: libcapi20-3 (= ${binary:Version}), ${shlibs:Depends}
+Depends: libcapi20-3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: isdnutils (<<1:3.1pre1b-0), libcapi20, libcapi20-2
Conflicts: libcapi20, libcapi20-2
Description: libraries for CAPI support
@@ -206,7 +208,7 @@
Package: pppdcapiplugin
Architecture: alpha amd64 arm armeb armel armeb armel hppa i386 ia64 m68k mips
mipsel powerpc ppc64 sparc s390
-Depends: ppp (>=2.3.11), libcapi20-3 (= ${binary:Version}), ${shlibs:Depends}
+Depends: ppp (>=2.3.11), libcapi20-3 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Section: net
Description: plugin for pppd to communicate with CAPI-capable ISDN cards
Some ISDN cards (notably the AVM passive cards, when a module from the AVM
@@ -217,7 +219,7 @@
Package: isdnactivecards
Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel
powerpc ppc64 sparc s390
-Depends: isdnutils-base (= ${binary:Version}), capiutils (>=
${binary:Version}), ${shlibs:Depends}
+Depends: isdnutils-base (= ${binary:Version}), capiutils (>=
${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: isdnutils (<<1:3.1pre1b-0)
Description: support utilities for active ISDN cards
If you have an active ISDN card, you will need things like firmware and the
@@ -229,7 +231,7 @@
Package: isdneurofile
Architecture: alpha amd64 arm armeb armel armeb armel hppa i386 ia64 m68k mips
mipsel powerpc ppc64 sparc s390
Section: comm
-Depends: isdnutils-base (= ${binary:Version}), ${shlibs:Depends}
+Depends: isdnutils-base (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Description: ISDN eurofile transfer tool
If you want to send / receive files over an ISDN line with the eurofile
system, you need this package. Not used much outside of Germany I
diff -u isdnutils-3.9.20060704/debian/changelog
isdnutils-3.9.20060704/debian/changelog
--- isdnutils-3.9.20060704/debian/changelog
+++ isdnutils-3.9.20060704/debian/changelog
@@ -1,3 +1,19 @@
+isdnutils (1:3.9.20060704-3.7) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add bashisms and isdneurofile-bashism to the list of patches to apply.
+ - Really closes: #530105, #530980.
+ * Bump compat level to five.
+ * debian/control:
+ + Fix FTBFS, build-depend on xutils-dev. Closes: #527529.
+ + Add missing dependency on misc:Depends.
+ + Bump versioned dependency on debhelper to match compat level.
+ + Remove Paul Slootman from uploaders, already in maintainer field.
+ * debian/copyright: refer to the GPL version 2 file.
+ * Don't ship var/run/isdnrate/, create it in init script.
+
+ -- Raphael Geissert <geiss...@debian.org> Sat, 04 Jul 2009 12:23:57 -0500
+
isdnutils (1:3.9.20060704-3.6) unstable; urgency=medium
* Non-maintainer upload.
diff -u isdnutils-3.9.20060704/debian/rules isdnutils-3.9.20060704/debian/rules
--- isdnutils-3.9.20060704/debian/rules
+++ isdnutils-3.9.20060704/debian/rules
@@ -395,6 +395,8 @@
toplevel-make \
capi20-msg2str-safety \
lsb-init-script \
+ bashisms \
+ isdneurofile-bashism
ifeq ($(distribution),Ubuntu)
debian_patches += no-imake
diff -u isdnutils-3.9.20060704/debian/copyright
isdnutils-3.9.20060704/debian/copyright
--- isdnutils-3.9.20060704/debian/copyright
+++ isdnutils-3.9.20060704/debian/copyright
@@ -7,7 +7,7 @@
GPL Copyrights:
- For the complete GPL version 2 text, see /usr/share/common-licenses/GPL .
+ For the complete GPL version 2 text, see /usr/share/common-licenses/GPL-2.
All changes for debian are done by Paul Slootman <p...@debian.org> or
derived from the work of other debian developers and users and licensed
diff -u isdnutils-3.9.20060704/debian/isdnlog.postrm
isdnutils-3.9.20060704/debian/isdnlog.postrm
--- isdnutils-3.9.20060704/debian/isdnlog.postrm
+++ isdnutils-3.9.20060704/debian/isdnlog.postrm
@@ -9,6 +9,8 @@
cd /etc/isdn
rm isdnlog.isdnctrl[02468] isdnrate.conf 2>/dev/null || true
cd /
+ # Use || true to survive from the error, just like dpkg would
+ [ ! -d /var/run/isdnrate/ ] || rmdir /var/run/isdnrate/ || true
fi
;;
diff -u isdnutils-3.9.20060704/debian/init.d.functions
isdnutils-3.9.20060704/debian/init.d.functions
--- isdnutils-3.9.20060704/debian/init.d.functions
+++ isdnutils-3.9.20060704/debian/init.d.functions
@@ -180,6 +180,7 @@
--quiet --exec /usr/sbin/isdnlog -- -D -f$optionfile $DEVISDNCTRL &
done
daemon=false
+ [ -d /var/run/isdnrate/ ] || mkdir /var/run/isdnrate/
socket=/var/run/isdnrate/socket
if [ -s /etc/isdn/isdnrate.conf ]; then
set +e
@@ -219,6 +220,7 @@
# stop daemon if it happens to be running, then start it if necessary
/usr/bin/isdnrate -CD3 2>/dev/null || true
daemon=false
+ [ -d /var/run/isdnrate/ ] || mkdir /var/run/isdnrate/
socket=/var/run/isdnrate/isdnrate
if [ -s /etc/isdn/isdnrate.conf ]; then
set +e
diff -u isdnutils-3.9.20060704/debian/compat
isdnutils-3.9.20060704/debian/compat
--- isdnutils-3.9.20060704/debian/compat
+++ isdnutils-3.9.20060704/debian/compat
@@ -1 +1 @@
-4
+5
diff -u isdnutils-3.9.20060704/debian/isdnlog.dirs
isdnutils-3.9.20060704/debian/isdnlog.dirs
--- isdnutils-3.9.20060704/debian/isdnlog.dirs
+++ isdnutils-3.9.20060704/debian/isdnlog.dirs
@@ -13 +12,0 @@
-var/run/isdnrate
diff -u isdnutils-3.9.20060704/debian/patches/bashisms.dpatch
isdnutils-3.9.20060704/debian/patches/bashisms.dpatch
--- isdnutils-3.9.20060704/debian/patches/bashisms.dpatch
+++ isdnutils-3.9.20060704/debian/patches/bashisms.dpatch
@@ -12,11 +12,11 @@
fi
case "$1" in
-patch)
- patch $pdir -f --no-backup-if-mismatch -p0 < $0
+ patch $pdir -f --no-backup-if-mismatch -p1 < $0
#cd ${dir}gcc && autoconf
;;
-unpatch)
- patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+ patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
#rm ${dir}gcc/configure
;;
*)
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
