On Thu, Apr 20, 2006 at 04:04:55PM -0700, Steve Langasek wrote: > On Thu, Apr 20, 2006 at 08:00:35PM +0200, Reinhold Schoeb wrote: > > Package: isdnutils-xtools > > Version: 1:3.8.2005-12-06-4 > > Severity: grave > > Justification: renders package unusable > > > After the last xorg-Update this package was removed by apt-get and now > > fails to install. > > Here is my log : > > > Die folgenden Pakete haben nichterfüllte Abhängigkeiten: > > isdnutils-xtools: Hängt ab: libice6 soll aber nicht installiert werden > > This is because x11-common conflicts with this version of isdnutils-xtools, > because it installs binaries in /usr/X11R6/bin and /usr/X11R6/bin is going > away with Xorg 7. > > It was actually reasonably appropriate before for isdnutils-xtools to > install to /usr/X11R6, because the package does build-depend on xutils; > unfortunately, the debian packaging manually moves the binaries from > /usr/bin to /usr/X11R6/bin, so a binNMU isn't sufficient to fix this > problem...
I'm preparing a NMU in delayed/2 for that. patch is attached. -- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
diff -u isdnutils-3.8.2005-12-06/debian/changelog
isdnutils-3.8.2005-12-06/debian/changelog
--- isdnutils-3.8.2005-12-06/debian/changelog
+++ isdnutils-3.8.2005-12-06/debian/changelog
@@ -1,3 +1,11 @@
+isdnutils (1:3.8.2005-12-06-4.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Install files to /usr/bin instead of /usr/X11R6/bin. Closes: #363938.
+ * Urgency set to high due to RC Bug fix.
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Thu, 25 May 2006 23:35:07 +0200
+
isdnutils (1:3.8.2005-12-06-4) unstable; urgency=low
* capi20: Regenerate Makefile.in. Closes: #318808.
diff -u isdnutils-3.8.2005-12-06/debian/isdnutils-xtools.files
isdnutils-3.8.2005-12-06/debian/isdnutils-xtools.files
--- isdnutils-3.8.2005-12-06/debian/isdnutils-xtools.files
+++ isdnutils-3.8.2005-12-06/debian/isdnutils-xtools.files
@@ -1,2 +1 @@
-usr/X11R6
etc/X11/app-defaults/XISDNLoad
diff -u isdnutils-3.8.2005-12-06/debian/finish-install-first.sh
isdnutils-3.8.2005-12-06/debian/finish-install-first.sh
--- isdnutils-3.8.2005-12-06/debian/finish-install-first.sh
+++ isdnutils-3.8.2005-12-06/debian/finish-install-first.sh
@@ -7,8 +7,8 @@
rm -f debian/tmp/etc/isdn/eftusers
ln -s ../ftpusers debian/isdneurofile/etc/isdn/eftusers
install -m 0444 Mini-FAQ/isdn-faq.*
debian/isdnutils-doc/usr/share/doc/isdnutils-doc/Mini-FAQ/
- mv debian/tmp/usr/share/man/man1/xisdnload.1*
debian/isdnutils-xtools/usr/X11R6/man/man1/
- mv debian/tmp/usr/bin/x*
debian/isdnutils-xtools/usr/X11R6/bin/
+ mv debian/tmp/usr/share/man/man1/xisdnload.1*
debian/isdnutils-xtools/usr/man/man1/
+ mv debian/tmp/usr/bin/x*
debian/isdnutils-xtools/usr/bin/
cp xmonisdn/README
debian/isdnutils-xtools/usr/share/doc/isdnutils-xtools/README.xmonisdn
# move some extra stuff from upstream source into debian tree
cp ipppd/NOTES.IPPPD ipppd/README* debian/README.MPPP
debian/ipppd/usr/share/doc/ipppd/
@@ -90,3 +90,3 @@
fi
- # in the old situation, the app-defaults are under usr/X11R6
+ # in the old situation, the app-defaults are under usr/
# which is moved out to the package anyway, so no need to add it to
.files
diff -u isdnutils-3.8.2005-12-06/debian/isdnutils-xtools.dirs
isdnutils-3.8.2005-12-06/debian/isdnutils-xtools.dirs
--- isdnutils-3.8.2005-12-06/debian/isdnutils-xtools.dirs
+++ isdnutils-3.8.2005-12-06/debian/isdnutils-xtools.dirs
@@ -1,5 +1,4 @@
etc/isdn
-usr/X11R6/bin
-usr/X11R6/man/man1
+usr/man/man1
usr/lib/menu
usr/share/doc/isdnutils-xtools
diff -u isdnutils-3.8.2005-12-06/debian/isdnutils-xtools.menu
isdnutils-3.8.2005-12-06/debian/isdnutils-xtools.menu
--- isdnutils-3.8.2005-12-06/debian/isdnutils-xtools.menu
+++ isdnutils-3.8.2005-12-06/debian/isdnutils-xtools.menu
@@ -2,10 +2,10 @@
section="Apps/Net"\
title="X11 ISDN Monitor"\
- command="/usr/X11R6/bin/xmonisdn"\
+ command="/usr/bin/xmonisdn"\
description="xmonisdn is an xbiff-like display of the state of the ISDN
line."
?package(isdnutils-xtools):needs="X11"\
section="Apps/Net"\
title="X11 ISDN Load"\
- command="/usr/X11R6/bin/xisdnload"\
+ command="/usr/bin/xisdnload"\
description="xisdnload shows a graphical display of the throughput, and the\
background colour tells you whether there is a connection."
signature.asc
Description: Digital signature
