Dear maintainer,

I've prepared an NMU for isdnutils (versioned as 1:3.25+dfsg1-3.4). The diff
is attached to this message.

Changes compared to last nmudiff ((sent to this bugs):
-> Document closure of #75000
-> revert slipped-in part of patch removing the isdnutils-base.cron.d file
(though this file is a bug as well, see #698785)
-> Tigthening B-D on ppp-dev 2.4.6


Regards.
diff -Nru isdnutils-3.25+dfsg1/debian/changelog 
isdnutils-3.25+dfsg1/debian/changelog
--- isdnutils-3.25+dfsg1/debian/changelog       2013-06-06 12:36:15.000000000 
+0200
+++ isdnutils-3.25+dfsg1/debian/changelog       2014-04-30 19:13:12.000000000 
+0200
@@ -1,3 +1,21 @@
+isdnutils (1:3.25+dfsg1-3.4) unstable; urgency=medium
+
+  * Non-maintainer upload. (Closes: #745881)
+  * 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.
+  * pppdcapiplugin need to depend on ppp 2.4.6 (Closes: #745624)
+  * Also tighening the B-Ds to allow only ppp-dev 2.4.6
+  * Do no longer build libcapi20 and libcapi20-dev as they are now in a
+    separate package. The required changes in the build system are in
+    use-packaged-libcapi20.patch. (Closes: #746353)
+  * Update B-D to tcl-dev to version 8.6 (Closes: #725000)
+
+ -- Tobias Frost <t...@coldtobi.de>  Wed, 30 Apr 2014 19:12:39 +0200
+
 isdnutils (1:3.25+dfsg1-3.3) unstable; urgency=low
 
   [ Andreas Beckmann ]
diff -Nru isdnutils-3.25+dfsg1/debian/control 
isdnutils-3.25+dfsg1/debian/control
--- isdnutils-3.25+dfsg1/debian/control 2013-06-06 12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/control 2014-04-30 18:57:16.000000000 +0200
@@ -6,10 +6,10 @@
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 9), bzip2, libncurses5-dev | libncurses-dev,
- xutils-dev | imake, tcl-dev, linuxdoc-tools (>=0.9.20), groff, libtool,
+ xutils-dev | imake, tcl8.6-dev, linuxdoc-tools (>=0.9.20), groff, libtool,
  libxaw7-dev, libreadline-dev, libpcap0.8-dev, autotools-dev,
- automake, autoconf, libssl-dev, psutils,
- lsb-release, po-debconf, ppp-dev
+ automake, autoconf, libssl-dev, psutils, libcapi20-dev (>=1:3.27),
+ lsb-release, po-debconf, ppp-dev (>=2.4.6), ppp-dev (<<2.4.7)
 Homepage: http://www.isdn4linux.de
 Vcs-Git: git://git.debian.org/git/collab-maint/isdnutils.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/isdnutils.git
@@ -116,7 +116,7 @@
 
 Package: capiutils
 Architecture: linux-any
-Depends: libcapi20-3 (= ${binary:Version}), ${shlibs:Depends},
+Depends: ${shlibs:Depends},
  lsb-base (>= 1.3-9ubuntu3), makedev, ${misc:Depends}
 Section: net
 Description: ISDN utilities - tools for CAPI-capable cards
@@ -125,34 +125,9 @@
  The package contains utilities to initialize and get information about
  these cards.
 
-Package: libcapi20-3
-Architecture: linux-any
-Section: libs
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: isdnutils-doc
-Description: ISDN utilities - CAPI support libraries
- Handle requests from CAPI-driven applications such as fax systems via active
- and passive ISDN cards.
- .
- This package will be installed automatically if needed.
-
-Package: libcapi20-dev
-Architecture: linux-any
-Section: libdevel
-Multi-Arch: same
-Depends: libcapi20-3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Breaks:   isdnutils-base (<< 1:3.22+dfsg1-4)
-Replaces: libcapi20-3 (<< 1:3.9.20060704+dfsg.3-4),
- isdnutils-base (<< 1:3.22+dfsg1-4)
-Suggests: isdnutils-doc
-Description: ISDN utilities - CAPI development libraries
- This package provides files needed for development of CAPI-aware software.
-
 Package: pppdcapiplugin
 Architecture: linux-any
-Depends: ppp (>= 2.4.4), ppp (<< 2.4.6), libcapi20-3 (= ${binary:Version}),
+Depends: ppp (>= 2.4.6), ppp (<< 2.4.7),
  ${shlibs:Depends}, ${misc:Depends}
 Section: net
 Description: ISDN utilities - pppd plug-in for CAPI support
diff -Nru isdnutils-3.25+dfsg1/debian/dotconfig 
isdnutils-3.25+dfsg1/debian/dotconfig
--- isdnutils-3.25+dfsg1/debian/dotconfig       2013-06-06 12:36:15.000000000 
+0200
+++ isdnutils-3.25+dfsg1/debian/dotconfig       2014-04-25 23:25:10.000000000 
+0200
@@ -103,7 +103,7 @@
 VBOX_PIDDIR='/var/run'
 VBOX_LOCKDIR='/var/lock'
 VBOX_DOCDIR='/usr/share/doc/isdnvboxserver'
-VBOX_TCL='tcl8.3'
+VBOX_TCL='tcl8.6'
 # VBOX_SUSPEND_ID is not set
 CONFIG_IPPPD=y
 
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.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/libcapi20-3.dirs 
isdnutils-3.25+dfsg1/debian/libcapi20-3.dirs
--- isdnutils-3.25+dfsg1/debian/libcapi20-3.dirs        2013-06-06 
12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/libcapi20-3.dirs        1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/doc/libcapi20-3
diff -Nru isdnutils-3.25+dfsg1/debian/libcapi20-3.install.in 
isdnutils-3.25+dfsg1/debian/libcapi20-3.install.in
--- isdnutils-3.25+dfsg1/debian/libcapi20-3.install.in  2013-06-06 
12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/libcapi20-3.install.in  1970-01-01 
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH@/libcapi20.so.* usr/lib/@DEB_HOST_MULTIARCH@/
-usr/lib/@DEB_HOST_MULTIARCH@/capi/*.so*     usr/lib/@DEB_HOST_MULTIARCH@/capi/
diff -Nru isdnutils-3.25+dfsg1/debian/libcapi20-3.README.Debian 
isdnutils-3.25+dfsg1/debian/libcapi20-3.README.Debian
--- isdnutils-3.25+dfsg1/debian/libcapi20-3.README.Debian       2013-06-06 
12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/libcapi20-3.README.Debian       1970-01-01 
01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-It may become necessary to debug libcapi20. Debian builds the package without
-debug information for performance reasons.  Below patch will compile the
-library with debug information.
-
-diff --git a/capi20/capi20.c b/capi20/capi20.c
-index ab8c1c6..81b5c5c 100644
---- a/capi20/capi20.c
-+++ b/capi20/capi20.c
-@@ -61,7 +61,7 @@ static int tracelevel;
- static char *tracefile;
-
- /** debug level, for debugging purpose */
--static int nDebugLevel = 0;
-+static int nDebugLevel = 0xFFFF;
-
- /**
-  * \brief CapiDebug output functions
diff -Nru isdnutils-3.25+dfsg1/debian/libcapi20-3.shlibs 
isdnutils-3.25+dfsg1/debian/libcapi20-3.shlibs
--- isdnutils-3.25+dfsg1/debian/libcapi20-3.shlibs      2013-06-06 
12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/libcapi20-3.shlibs      1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-libcapi20 3 libcapi20-3
diff -Nru isdnutils-3.25+dfsg1/debian/libcapi20-dev.dirs 
isdnutils-3.25+dfsg1/debian/libcapi20-dev.dirs
--- isdnutils-3.25+dfsg1/debian/libcapi20-dev.dirs      2013-06-06 
12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/libcapi20-dev.dirs      1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib
diff -Nru isdnutils-3.25+dfsg1/debian/libcapi20-dev.install.in 
isdnutils-3.25+dfsg1/debian/libcapi20-dev.install.in
--- isdnutils-3.25+dfsg1/debian/libcapi20-dev.install.in        2013-06-06 
12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/libcapi20-dev.install.in        1970-01-01 
01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-usr/include/*.h
-usr/lib/@DEB_HOST_MULTIARCH@/libcapi20*.a        usr/lib/@DEB_HOST_MULTIARCH@/
-usr/lib/@DEB_HOST_MULTIARCH@/libcapi20*.so       usr/lib/@DEB_HOST_MULTIARCH@/
-usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/capi20.pc 
usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/
diff -Nru isdnutils-3.25+dfsg1/debian/libcapi20-dev.links 
isdnutils-3.25+dfsg1/debian/libcapi20-dev.links
--- isdnutils-3.25+dfsg1/debian/libcapi20-dev.links     2013-06-06 
12:36:15.000000000 +0200
+++ isdnutils-3.25+dfsg1/debian/libcapi20-dev.links     1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/doc/libcapi20-3 usr/share/doc/libcapi20-dev
diff -Nru isdnutils-3.25+dfsg1/debian/patches/series 
isdnutils-3.25+dfsg1/debian/patches/series
--- isdnutils-3.25+dfsg1/debian/patches/series  2013-06-06 12:36:15.000000000 
+0200
+++ isdnutils-3.25+dfsg1/debian/patches/series  2014-04-29 21:42:09.000000000 
+0200
@@ -5,3 +5,6 @@
 libtool.patch
 ipppd-replace-gpl-code.patch
 capiinfo-autotools.patch
+tcl8.6.patch
+vbox-configure-quoting.patch
+use-packaged-libcapi20.patch
diff -Nru isdnutils-3.25+dfsg1/debian/patches/tcl8.6.patch 
isdnutils-3.25+dfsg1/debian/patches/tcl8.6.patch
--- isdnutils-3.25+dfsg1/debian/patches/tcl8.6.patch    1970-01-01 
01:00:00.000000000 +0100
+++ isdnutils-3.25+dfsg1/debian/patches/tcl8.6.patch    2014-04-25 
23:17:54.000000000 +0200
@@ -0,0 +1,21 @@
+--- a/vbox/src/script.c
++++ b/vbox/src/script.c
+@@ -19,6 +19,8 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#define USE_INTERP_RESULT
++#define USE_INTERP_ERRORLINE
+ #include <tcl.h>
+ #include <unistd.h>
+ #include <string.h>
+--- a/vbox3/vboxgetty/tclscript.c
++++ b/vbox3/vboxgetty/tclscript.c
+@@ -8,6 +8,7 @@
+ #  include "../config.h"
+ #endif
+ 
++#define USE_INTERP_ERRORLINE
+ #include <tcl.h>
+ #include <string.h>
+ #include <unistd.h>
diff -Nru isdnutils-3.25+dfsg1/debian/patches/use-packaged-libcapi20.patch 
isdnutils-3.25+dfsg1/debian/patches/use-packaged-libcapi20.patch
--- isdnutils-3.25+dfsg1/debian/patches/use-packaged-libcapi20.patch    
1970-01-01 01:00:00.000000000 +0100
+++ isdnutils-3.25+dfsg1/debian/patches/use-packaged-libcapi20.patch    
2014-04-30 07:19:17.000000000 +0200
@@ -0,0 +1,66 @@
+Description: licapi20-3 is now in a seperate package
+ To use the pakaged version of the library, the buildsystem needs some patching
+ to avoid that it picks up the in-tree copy, namely removing include paths and
+ library linker paths
+Author: Tobias Frost <t...@coldtobi.de>
+Forwarded: not-needed, Debian specific
+Last-Update: 2014-04-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/capifax/Makefile.am
++++ b/capifax/Makefile.am
+@@ -7,9 +7,9 @@
+ MAINTAINERCLEANFILES    = configure aclocal.m4 Makefile.in config.h.in \
+                         stamp-h.in
+ 
+-INCLUDES = -I../capi20 $(all_includes)
++INCLUDES = $(all_includes)
+ CFLAGS = -Wall -O2
+-LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
++LDFLAGS = $(all_libraries)
+ LDADD = -lcapi20
+ 
+ bin_PROGRAMS = capifax capifaxrcvd
+--- a/capiinfo/Makefile.am
++++ b/capiinfo/Makefile.am
+@@ -7,9 +7,9 @@
+ MAINTAINERCLEANFILES    = configure aclocal.m4 Makefile.in config.h.in \
+                         stamp-h.in comperr
+ 
+-INCLUDES = -I../capi20 $(all_includes)
++INCLUDES = $(all_includes)
+ CFLAGS = -Wall -O2
+-LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
++LDFLAGS = $(all_libraries)
+ LDADD = -lcapi20
+ 
+ bin_PROGRAMS = capiinfo
+--- a/rcapid/Makefile.am
++++ b/rcapid/Makefile.am
+@@ -7,9 +7,9 @@
+ MAINTAINERCLEANFILES    = configure aclocal.m4 Makefile.in config.h.in \
+                         stamp-h.in comperr
+ 
+-INCLUDES = -I../capi20 $(all_includes)
++INCLUDES = $(all_includes)
+ CFLAGS = -Wall -O2
+-LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
++LDFLAGS = $(all_libraries)
+ LDADD = -lcapi20
+ 
+ sbin_PROGRAMS = rcapid
+--- a/Makefile
++++ b/Makefile
+@@ -53,10 +53,10 @@
+ endif
+ 
+ ifeq ($(CONFIG_RCAPID),y)
+-      SUBDIRS := $(SUBDIRS) capi20 capiinfo
++      SUBDIRS := $(SUBDIRS) capiinfo
+ else
+       ifeq ($(CONFIG_AVMCAPICTRL),y)
+-              SUBDIRS := $(SUBDIRS) capi20 capiinfo
++              SUBDIRS := $(SUBDIRS) capiinfo
+       endif
+ endif
+ 
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-29 22:50:52.000000000 +0200
@@ -7,12 +7,12 @@
 override_dh_auto_build:
        dh_testdir
        : # update autotools files
-       for d in capi20 isdnlog/client vbox3; do \
+       for d in isdnlog/client vbox3; do \
          cp -p /usr/share/misc/config.* $$d/; \
        done
 
        @set -e; \
-       for d in capi20 capifax capiinfo capiinit rcapid vbox eicon ipppd; do \
+       for d in capifax capiinfo capiinit rcapid vbox eicon ipppd; do \
          echo "Regenerating autotools files in $$d ..."; \
          cd $$d; \
          echo "  autoreconf"; autoreconf -if; \
@@ -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
@@ -80,10 +82,3 @@
 override_dh_installexamples:
        dh_installexamples -X.in
 
-override_dh_link:
-       # replace the directory with a link to libcapi20-3 docs later
-       rm -Rf debian/libcapi20-dev/usr/share/doc/libcapi20-dev
-       dh_link
-
-override_dh_shlibdeps:
-       dh_shlibdeps -L libcapi20-3 -l 
debian/libcapi20-3/usr/lib/$(DEB_HOST_MULTIARCH)


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to