Steve Langasek wrote:
Yes, a fixed libxp-dev that installs to /usr/lib,/usr/include is waiting in
the NEW queue.
Now that that's gone in, here's a new patch.
/usr/man isn't the right directory, this should be /usr/share/man on an
FHS-compliant system. But these lines seem to be commented out anyway...
Turns out it needed --mandir=/usr/share/man and adjustments to the
.files entries to get the manpages right.
Kris Jurka
Common subdirectories: orig-om/debian/libmotif-dev and
openmotif-2.2.3/debian/libmotif-dev
diff -uN orig-om/debian/libmotif-dev.files
openmotif-2.2.3/debian/libmotif-dev.files
--- orig-om/debian/libmotif-dev.files 2006-05-05 15:19:52.000000000 -0700
+++ openmotif-2.2.3/debian/libmotif-dev.files 2006-05-05 15:35:35.000000000
-0700
@@ -1,11 +1,11 @@
-/usr/X11R6/lib/libMrm.a
-/usr/X11R6/lib/libUil.a
-/usr/X11R6/lib/libXm.a
-/usr/X11R6/lib/lib*.so
-/usr/X11R6/include/Xm
-/usr/X11R6/include/Mrm
-/usr/X11R6/include/uil
-/usr/X11R6/bin/uil
-/usr/X11R6/man/man1/uil*
-/usr/X11R6/man/man3
-/usr/X11R6/man/man5
+/usr/lib/libMrm.a
+/usr/lib/libUil.a
+/usr/lib/libXm.a
+/usr/lib/lib*.so
+/usr/include/Xm
+/usr/include/Mrm
+/usr/include/uil
+/usr/bin/uil
+/usr/share/man/man1/uil*
+/usr/share/man/man3
+/usr/share/man/man5
Common subdirectories: orig-om/debian/libmotif3 and
openmotif-2.2.3/debian/libmotif3
diff -uN orig-om/debian/libmotif3.files openmotif-2.2.3/debian/libmotif3.files
--- orig-om/debian/libmotif3.files 2006-05-05 15:19:52.000000000 -0700
+++ openmotif-2.2.3/debian/libmotif3.files 2006-05-05 15:20:47.000000000
-0700
@@ -1,3 +1,3 @@
-/usr/X11R6/lib/lib*.so.*
-/usr/X11R6/lib/X11/bindings
-/usr/X11R6/include/X11/bitmaps
+/usr/lib/lib*.so.*
+/usr/lib/X11/bindings
+/usr/include/X11/bitmaps
Common subdirectories: orig-om/debian/motif-clients and
openmotif-2.2.3/debian/motif-clients
diff -uN orig-om/debian/motif-clients.files
openmotif-2.2.3/debian/motif-clients.files
--- orig-om/debian/motif-clients.files 2006-05-05 15:19:52.000000000 -0700
+++ openmotif-2.2.3/debian/motif-clients.files 2006-05-05 15:35:45.000000000
-0700
@@ -1,7 +1,7 @@
/etc/X11/mwm
-/usr/X11R6/bin/mwm
-/usr/X11R6/bin/xmbind
-/usr/X11R6/man/man1/mwm*
-/usr/X11R6/man/man1/xmbind*
-/usr/X11R6/man/man4
-/usr/X11R6/lib/X11/system.mwmrc
+/usr/bin/mwm
+/usr/bin/xmbind
+/usr/share/man/man1/mwm*
+/usr/share/man/man1/xmbind*
+/usr/share/man/man4
+/usr/lib/X11/system.mwmrc
diff -uN orig-om/debian/rules openmotif-2.2.3/debian/rules
--- orig-om/debian/rules 2006-05-05 15:19:52.000000000 -0700
+++ openmotif-2.2.3/debian/rules 2006-05-05 15:45:48.000000000 -0700
@@ -37,8 +37,8 @@
(cd $(WORK)/$(DIR); set -ex; \
CFLAGS="-g -O2 -fno-strict-aliasing" \
./configure \
- --prefix=/usr/X11R6 \
- --mandir=/usr/X11R6/man; \
+ --prefix=/usr \
+ --mandir=/usr/share/man; \
make)
# sh $(HERE)/debian/fix-libtool $(WORK); \
# make; \
@@ -64,16 +64,14 @@
cd $(WORK)/$(DIR)/$$dir; \
make DESTDIR=$(DEST) install; \
done
-# cp -a $(WORK)/$(DIR)/doc/man $(DEST)/usr/X11R6/man
-# rm -f $(DEST)/usr/X11R6/man/man*/Makefile*
# fixup some minor stuff / take care about menus
mkdir -p debian/tmp/etc/X11/mwm
- mkdir -p debian/tmp/usr/X11R6/lib/X11
+ mkdir -p debian/tmp/usr/lib/X11
# rm -f debian/tmp/etc/X11/system.mwmrc
- rm -f debian/tmp/usr/X11R6/lib/X11/system.mwmrc
- ln -s /etc/X11/mwm/system.mwmrc
debian/tmp/usr/X11R6/lib/X11/system.mwmrc
- cat conf/xmbind.add >>
debian/tmp/usr/X11R6/lib/X11/bindings/xmbind.alias
+ rm -f debian/tmp/usr/lib/X11/system.mwmrc
+ ln -s /etc/X11/mwm/system.mwmrc debian/tmp/usr/lib/X11/system.mwmrc
+ cat conf/xmbind.add >> debian/tmp/usr/lib/X11/bindings/xmbind.alias
# splitup packages
dh_movefiles
@@ -89,7 +87,7 @@
# dh_installdocs -p motif-doc dist/[CLR]* \
# work/motif-doc-ps/*
# dh_installmanpages
- dh_installwm -p motif-clients /usr/X11R6/bin/mwm
+ dh_installwm -p motif-clients /usr/bin/mwm
dh_installmenu
dh_installchangelogs
dh_link
Common subdirectories: orig-om/debian/tmp and openmotif-2.2.3/debian/tmp
diff -uN orig-om/patches/workaround-_XGetpwnam-API-breakage.patch
openmotif-2.2.3/patches/workaround-_XGetpwnam-API-breakage.patch
--- orig-om/patches/workaround-_XGetpwnam-API-breakage.patch 2006-05-05
15:19:52.000000000 -0700
+++ openmotif-2.2.3/patches/workaround-_XGetpwnam-API-breakage.patch
1969-12-31 16:00:00.000000000 -0800
@@ -1,42 +0,0 @@
---- openMotif-2.2.3/lib/Xm/Xmos.c.orig 2003-08-19 20:38:24.000000000 +0200
-+++ openMotif-2.2.3/lib/Xm/Xmos.c 2004-04-21 11:19:18.000000000 +0200
-@@ -272,7 +272,7 @@
- }
- *destPtr = '\0';
-
-- pwd_value = _XGetpwnam(nameBuf, pwd_buf);
-+ pwd_value = _XGetpwnam(nameBuf, pwd_buf, &pwd_value);
- if (pwd_value != NULL)
- {
- userDirLen = strlen(pwd_value->pw_dir);
-@@ -1030,11 +1030,11 @@
- if ((ptr = (char *)getenv("HOME")) == NULL)
- {
- if ((ptr = (char *)getenv(USER_VAR)) != NULL)
-- pwd_value = _XGetpwnam(ptr, pwd_buf);
-+ pwd_value = _XGetpwnam(ptr, pwd_buf, &pwd_value);
- else
- {
- uid = getuid();
-- pwd_value = _XGetpwuid(uid, pwd_buf);
-+ pwd_value = _XGetpwuid(uid, pwd_buf, &pwd_value);
- }
-
- if (pwd_value != NULL)
---- openMotif-2.2.3/clients/uil/UilDB.c.orig 2004-04-21 11:20:07.000000000
+0200
-+++ openMotif-2.2.3/clients/uil/UilDB.c 2004-04-21 11:15:45.000000000
+0200
-@@ -911,12 +911,12 @@
- {
- if((ptr = (char *)getenv(USER_VAR)) != NULL)
- {
-- pwd_value = _XGetpwnam(ptr, pwd_buf);
-+ pwd_value = _XGetpwnam(ptr, pwd_buf, &pwd_value);
- }
- else
- {
- uid = getuid();
-- pwd_value = _XGetpwuid(uid, pwd_buf);
-+ pwd_value = _XGetpwuid(uid, pwd_buf, &pwd_value);
- }
- if (pwd_value != NULL)
- {
