Package: xbattbar Version: 1.4.2-3.1 Severity: grave Tags: patch Hi Thomas,
The xbattbar package is currently uninstallable in unstable, because it still installs to /usr/X11R6/bin which is being turned into a compatibility symlink for the X11R7 transition. Fortunately, since xbattbar is using imake the transition is fairly easy, but it does require a patch when rebuilding with the new imake due to some hard-coded references to /usr/X11R6. Please find the short patch for this attached. Thanks, -- 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 xbattbar-1.4.2/Imakefile xbattbar-1.4.2/Imakefile
--- xbattbar-1.4.2/Imakefile
+++ xbattbar-1.4.2/Imakefile
@@ -17,7 +17,6 @@
XCOMM Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
XCOMM
-BINDIR = /usr/X11R6/bin
MANDIR = /usr/share/man/man1
LOCAL_LIBRARIES = $(XLIB)
diff -u xbattbar-1.4.2/debian/menu xbattbar-1.4.2/debian/menu
--- xbattbar-1.4.2/debian/menu
+++ xbattbar-1.4.2/debian/menu
@@ -2 +2 @@
- title="Xbattbar" command="/usr/X11R6/bin/xbattbar"
+ title="Xbattbar" command="/usr/bin/xbattbar"
diff -u xbattbar-1.4.2/debian/changelog xbattbar-1.4.2/debian/changelog
--- xbattbar-1.4.2/debian/changelog
+++ xbattbar-1.4.2/debian/changelog
@@ -1,3 +1,12 @@
+xbattbar (1.4.2-3.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for RC bugfix.
+ * Build-depend on xutils-dev for the X11R7 transition, and adjust the
+ packaging to use the FHS paths.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Mon, 8 May 2006 03:22:53 -0700
+
xbattbar (1.4.2-3.1) unstable; urgency=low
* Non-maintainer upload.
diff -u xbattbar-1.4.2/debian/rules xbattbar-1.4.2/debian/rules
--- xbattbar-1.4.2/debian/rules
+++ xbattbar-1.4.2/debian/rules
@@ -28,8 +28,8 @@
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/xbattbar
- install -d -o0 -g0 $(CURDIR)/debian/xbattbar/usr/X11R6/man/man1/
- install -o0 -g0 -m644 xbattbar.man
$(CURDIR)/debian/xbattbar/usr/X11R6/man/man1/xbattbar.1x
+ install -d -o0 -g0 $(CURDIR)/debian/xbattbar/usr/share/man/man1/
+ install -o0 -g0 -m644 xbattbar.man
$(CURDIR)/debian/xbattbar/usr/share/man/man1/xbattbar.1x
binary-indep: build install
diff -u xbattbar-1.4.2/debian/control xbattbar-1.4.2/debian/control
--- xbattbar-1.4.2/debian/control
+++ xbattbar-1.4.2/debian/control
@@ -2,7 +2,7 @@
Section: x11
Priority: optional
Maintainer: Thomas Seyrat <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), xutils, libx11-dev
+Build-Depends: debhelper (>> 3.0.0), xutils-dev, libx11-dev
Standards-Version: 3.5.6.1
Package: xbattbar
signature.asc
Description: Digital signature
