Bug#362773: xautolock conflicts with x11-common

2006-04-16 Thread Steve Langasek
On Sun, Apr 16, 2006 at 11:12:17AM +0200, Roland Stigge wrote:
> Steve Langasek wrote:
> >> 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.

> Unfortunately, I can't see xutils-dev 1:1.0.2-2 uploaded to the archive
> yet (http://packages.qa.debian.org/x/xutils-dev.html) let alone it being
> available on a mirror.

> I will upload as soon as it is possible building against the archive / a
> mirror.

Yes, hopefully this will be the case after the next dinstall, but I'm not
the maintainer of xutils-dev and the package hasn't been uploaded yet so I
can't promise anything.

-- 
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/


signature.asc
Description: Digital signature


Processed: Re: Bug#362773: xautolock conflicts with x11-common

2006-04-16 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

> tag 362773 pending
Bug#362773: xautolock conflicts with x11-common
Tags were: patch
Tags added: pending

> thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#362773: xautolock conflicts with x11-common

2006-04-16 Thread Roland Stigge
tag 362773 pending
thanks

Hi Steve,

thanks for the patch!

Steve Langasek wrote:
>> 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.

Unfortunately, I can't see xutils-dev 1:1.0.2-2 uploaded to the archive
yet (http://packages.qa.debian.org/x/xutils-dev.html) let alone it being
available on a mirror.

I will upload as soon as it is possible building against the archive / a
mirror.

bye,
  Roland


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Processed: Re: Bug#362773: xautolock conflicts with x11-common

2006-04-15 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

> tags 362773 patch
Bug#362773: xautolock conflicts with x11-common
There were no tags set.
Tags added: patch

> thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#362773: xautolock conflicts with x11-common

2006-04-15 Thread Steve Langasek
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


Bug#362773: xautolock conflicts with x11-common

2006-04-15 Thread Vincent Bernat
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.

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16.4-zoro.11
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)

Versions of packages xautolock depends on:
ii  libc6 2.3.6-6GNU C Library: Shared libraries
ii  libx11-6  2:1.0.0-6  X11 client-side library
ii  libxext6  1:1.0.0-3  X11 miscellaneous extension librar
ii  libxss1   1:1.0.1-3  X11 Screen Saver extension library

Versions of packages xautolock recommends:
ii  xlockmore 1:5.21-1   Lock X11 display until password is

-- no debconf information


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]