Package: pixmap
Version: 2.6pl4-14.1
Severity: grave
Tags: patch
Hi Paul,
The pixmap 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 pixmap 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/bin and
some questionable header includes. 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 pixmap-2.6pl4/Imakefile pixmap-2.6pl4/Imakefile
--- pixmap-2.6pl4/Imakefile
+++ pixmap-2.6pl4/Imakefile
@@ -25,7 +25,7 @@
#endif
XCOMM Where you have rgb.txt
-RGBTXT = $(LIBDIR)/rgb.txt
+RGBTXT = $(CONFDIR)/rgb.txt
XCOMM LUCS extra variable for where bitmaps go
PIXMAPDIR = $(LIBDIR)/Pixmap
diff -u pixmap-2.6pl4/debian/control pixmap-2.6pl4/debian/control
--- pixmap-2.6pl4/debian/control
+++ pixmap-2.6pl4/debian/control
@@ -3,10 +3,11 @@
Priority: optional
Maintainer: Paul Slootman <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends: libx11-dev, libxext-dev, libxmu-dev, libxt-dev, x-dev,
xlibs-data, xutils, libxaw7-dev
+Build-Depends: libx11-dev, libxext-dev, libxmu-dev, libxt-dev, x-dev,
xlibs-data, xutils-dev, libxaw7-dev
Package: pixmap
Depends: ${shlibs:Depends}
+Pre-Depends: x11-common (>= 1:7.0.0)
Architecture: any
Description: A pixmap editor
Pixmap is a tool for creating or editing rectangular images made up of colored
diff -u pixmap-2.6pl4/debian/rules pixmap-2.6pl4/debian/rules
--- pixmap-2.6pl4/debian/rules
+++ pixmap-2.6pl4/debian/rules
@@ -46,15 +46,15 @@
chmod g-s debian/tmp
install -d -g root -m 755 -o root \
debian/tmp/DEBIAN \
- debian/tmp/usr/X11R6/bin \
- debian/tmp/usr/X11R6/lib/X11 \
+ debian/tmp/usr/bin \
+ debian/tmp/usr/lib/X11 \
+ debian/tmp/usr/lib/X11/Pixmap \
debian/tmp/usr/share/doc/$(p) \
debian/tmp/usr/share/menu \
- debian/tmp/usr/X11R6/man/man1 \
- debian/tmp/usr/X11R6/lib/X11/Pixmap \
+ debian/tmp/usr/share/man/man1 \
debian/tmp/etc/X11/app-defaults
strip pixmap
- install -g root -m 755 -o root -s pixmap debian/tmp/usr/X11R6/bin/pixmap
+ install -g root -m 755 -o root -s pixmap debian/tmp/usr/bin/pixmap
install -g root -m 644 -o root Pixmap.ad \
debian/tmp/etc/X11/app-defaults/Pixmap
install -g root -m 644 -o root Pixmap-color \
@@ -62,11 +62,11 @@
for file in Down Excl FlipHoriz FlipVert Fold Left Right RotateLeft \
RotateRight Stipple Term Up; do \
install -g root -m 644 -o root $$file \
- debian/tmp/usr/X11R6/lib/X11/Pixmap/$$file; \
+ debian/tmp/usr/lib/X11/Pixmap/$$file; \
done
install -g root -m 644 -o root pixmap.man \
- debian/tmp/usr/X11R6/man/man1/pixmap.1x
- -gzip -f -9 debian/tmp/usr/X11R6/man/man1/pixmap.1x
+ debian/tmp/usr/share/man/man1/pixmap.1x
+ -gzip -f -9 debian/tmp/usr/share/man/man1/pixmap.1x
install -g root -m 644 -o root debian/menu \
debian/tmp/usr/share/menu/$(p)
install -g root -m 644 -o root debian/changelog \
diff -u pixmap-2.6pl4/debian/changelog pixmap-2.6pl4/debian/changelog
--- pixmap-2.6pl4/debian/changelog
+++ pixmap-2.6pl4/debian/changelog
@@ -1,3 +1,18 @@
+pixmap (2.6pl4-14.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for RC bugfix.
+ * Xorg7 migration:
+ - Build-depend on xutils-dev for FHS-compliant xmkmf.
+ - Pre-depend on x11-common (>= 1:7.0.0) to get /usr/lib/X11 as a
+ directory instead of a symlink.
+ - Fix Pixmap.h to include <X11/xpm.h> instead of the broken "xpm.h".
+ - Fix up all paths under debian/ to use the FHS paths instead of
+ /usr/X11R6
+ - Look for rgb.txt in $(CONFDIR) instead of $(LIBDIR)
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Fri, 28 Apr 2006 12:48:36 -0700
+
pixmap (2.6pl4-14.1) unstable; urgency=high
* Non-maintainer upload.
diff -u pixmap-2.6pl4/debian/menu pixmap-2.6pl4/debian/menu
--- pixmap-2.6pl4/debian/menu
+++ pixmap-2.6pl4/debian/menu
@@ -6 +6 @@
- command="/usr/X11R6/bin/pixmap"
+ command="/usr/bin/pixmap"
only in patch2:
unchanged:
--- pixmap-2.6pl4.orig/Pixmap.h
+++ pixmap-2.6pl4/Pixmap.h
@@ -69,7 +69,7 @@
#include <X11/Xmu/Converters.h>
#include <X11/Xos.h>
#include <X11/Xfuncproto.h>
-#include "xpm.h"
+#include <X11/xpm.h>
/* Resources:
