tags 362773 patch thanks On Sat, Apr 15, 2006 at 02:51:33PM +0200, Vincent Bernat wrote: > Package: xautolock > Version: 1:2.1-6 > Severity: grave > Justification: renders package unusable
> Because xautolock install binaries in /usr/X11R6/bin, it now conflicts > with x11-common and therefore is uninstallable. See #362524 and > #362200. This should be fixable with a simple binNMU against the next version of xutils-dev, but the xautolock package also installs manpages by hand to /usr/X11R6/man which should also be fixed. The attached patch should take care of both issues. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -u xautolock-2.1/debian/control xautolock-2.1/debian/control
--- xautolock-2.1/debian/control
+++ xautolock-2.1/debian/control
@@ -2,7 +2,7 @@
Section: x11
Priority: optional
Maintainer: Roland Stigge <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), xutils, dpatch, libx11-dev, libxss-dev,
x-dev
+Build-Depends: debhelper (>> 4.0.0), xutils-dev (>= 1:1.0.2-2), dpatch,
libx11-dev, libxss-dev, x-dev
Standards-Version: 3.6.2
Package: xautolock
diff -u xautolock-2.1/debian/rules xautolock-2.1/debian/rules
--- xautolock-2.1/debian/rules
+++ xautolock-2.1/debian/rules
@@ -55,7 +55,7 @@
dh_clean -k
dh_installdirs
install -D -m 644 xautolock.man \
- debian/xautolock/usr/X11R6/man/man1/xautolock.1
+ debian/xautolock/usr/share/man/man1/xautolock.1
# Add here commands to install the package into debian/xautolock.
$(MAKE) install DESTDIR=$(CURDIR)/debian/xautolock
diff -u xautolock-2.1/debian/changelog xautolock-2.1/debian/changelog
--- xautolock-2.1/debian/changelog
+++ xautolock-2.1/debian/changelog
@@ -1,3 +1,13 @@
+xautolock (1:2.1-6.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for RC bugfix.
+ * Build against xutils-dev (>= 1:1.0.2-2) to get the X11R7 paths, and
+ fix debian/rules to install to /usr/share/man instead of
+ /usr/X11R6/man. Closes: #362773.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Sat, 15 Apr 2006 20:37:50 -0700
+
xautolock (1:2.1-6) unstable; urgency=low
* Changed from xlibs-dev build dependency to new individual X.org
signature.asc
Description: Digital signature
