Attached is the patch for a 0-day NMU fixing these bugs that I wll
upload shortly.
--
Blars Blarson [EMAIL PROTECTED]
http://www.blars.org/blars.html
With Microsoft, failure is not an option. It is a standard feature.
diff -ruN ../src2/xview-3.2p1.4/Build-LinuxXView.bash
xview-3.2p1.4/Build-LinuxXView.bash
--- ../src2/xview-3.2p1.4/Build-LinuxXView.bash 2006-05-16 16:00:37.000000000
-0700
+++ xview-3.2p1.4/Build-LinuxXView.bash 2006-05-15 11:36:18.000000000 -0700
@@ -18,7 +18,7 @@
# Set the directories that will be used for installation
[ -z "$OPENWINHOME" ] && OPENWINHOME=/usr/openwin
-[ -z "$X11DIR" ] && X11DIR=/usr/X11R6
+[ -z "$X11DIR" ] && X11DIR=/usr
OWDEST=$DESTDIR$OPENWINHOME
X11DEST=$DESTDIR$X11DIR/lib/X11/config
@@ -27,8 +27,8 @@
# BUILDPREFIX can be used to compile with shared libraries not installed in
# the standard locations
if [ -n "$BUILDPREFIX" ]; then
- IMAKE_EXTRA_INCLUDES="-I$BUILDPREFIX/usr/X11R6/include
-I$BUILDPREFIX/usr/include -I$BUILDPREFIX/include/X11"
- IMAKE_EXTRA_LOCAL_LDFLAGS="-L$BUILDPREFIX/usr/X11R6/lib
-L$BUILDPREFIX/usr/lib -L$BUILDPREFIX/lib"
+ IMAKE_EXTRA_INCLUDES="-I$BUILDPREFIX/usr/include -I$BUILDPREFIX/include/X11"
+ IMAKE_EXTRA_LOCAL_LDFLAGS="-L$BUILDPREFIX/usr/lib -L$BUILDPREFIX/lib"
fi
cat > imake.append <<EOF
@@ -44,7 +44,7 @@
EOF
IMAKEAPPEND="`pwd`/imake.append"
-IMAKEINCLUDE="-I`pwd`/config -I$BUILDPREFIX/usr/X11R6/lib/X11/config
-I$BUILDPREFIX/lib/X11/config -I/usr/X11R6/lib/X11/config"
+IMAKEINCLUDE="-I`pwd`/config -I$BUILDPREFIX/usr/lib/X11/config
-I/usr/lib/X11/config"
# Make sure our wrappers are in the path
if [ -z "$XVIEW_SETUP" ]; then
diff -ruN ../src2/xview-3.2p1.4/debian/changelog xview-3.2p1.4/debian/changelog
--- ../src2/xview-3.2p1.4/debian/changelog 2006-05-16 16:00:37.000000000
-0700
+++ xview-3.2p1.4/debian/changelog 2006-05-16 12:57:42.000000000 -0700
@@ -1,3 +1,11 @@
+xview (3.2p1.4-21.1) unstable; urgency=low
+
+ * 0-day NMU
+ * stop installing into /usr/X11R6 (Closes: #364029, #365778)
+ * build-depend on xbitmaps
+
+ -- Blars Blarson <[EMAIL PROTECTED]> Tue, 16 May 2006 09:06:45 -0700
+
xview (3.2p1.4-21) unstable; urgency=low
* Added libxt-dev and libxpm-dev to Build-Depends. Closes: #346866
diff -ruN ../src2/xview-3.2p1.4/debian/control xview-3.2p1.4/debian/control
--- ../src2/xview-3.2p1.4/debian/control 2006-05-16 16:00:37.000000000
-0700
+++ xview-3.2p1.4/debian/control 2006-05-16 12:57:07.000000000 -0700
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Martin Buck <[EMAIL PROTECTED]>
Standards-Version: 3.0.1
-Build-Depends: debhelper (>= 5), bison, flex, ed, libncurses5-dev |
libncurses-dev, xutils, libx11-dev, libxt-dev, libxpm-dev, x-dev
+Build-Depends: debhelper (>= 5), bison, flex, ed, libncurses5-dev |
libncurses-dev, xutils, libx11-dev, libxt-dev, libxpm-dev, x-dev, xbitmaps
Package: xviewg
Architecture: alpha arm hppa i386 m68k mips mipsel powerpc s390 sparc
diff -ruN ../src2/xview-3.2p1.4/debian/olvwm-x-window-manager
xview-3.2p1.4/debian/olvwm-x-window-manager
--- ../src2/xview-3.2p1.4/debian/olvwm-x-window-manager 2006-05-16
16:00:37.000000000 -0700
+++ xview-3.2p1.4/debian/olvwm-x-window-manager 2006-05-16 11:23:37.000000000
-0700
@@ -5,4 +5,4 @@
# So we let x-window-manager point to this wrapper and then exec olvwm with
# its real name.
-exec /usr/X11R6/bin/olvwm "$@"
+exec /usr/bin/olvwm "$@"
diff -ruN ../src2/xview-3.2p1.4/debian/olvwm.dirs
xview-3.2p1.4/debian/olvwm.dirs
--- ../src2/xview-3.2p1.4/debian/olvwm.dirs 2006-05-16 16:00:37.000000000
-0700
+++ xview-3.2p1.4/debian/olvwm.dirs 2006-05-15 16:20:28.000000000 -0700
@@ -1,8 +1,9 @@
etc/X11/olvwm
etc/menu-methods
usr/lib/menu
-usr/X11R6/bin
-usr/X11R6/lib/help
-usr/X11R6/man/man1
-usr/X11R6/man/man5
+usr/bin
+usr/lib/help
+usr/share/man
+usr/share/man/man1
+usr/share/man/man5
usr/share/doc/olvwm
diff -ruN ../src2/xview-3.2p1.4/debian/olvwm.menu
xview-3.2p1.4/debian/olvwm.menu
--- ../src2/xview-3.2p1.4/debian/olvwm.menu 2006-05-16 16:00:37.000000000
-0700
+++ xview-3.2p1.4/debian/olvwm.menu 2006-05-13 10:12:23.000000000 -0700
@@ -1,6 +1,6 @@
?package(olvwm):needs="wm" section="WindowManagers" \
title="Olvwm"\
- command="/usr/X11R6/bin/olvwm"\
+ command="/usr/bin/olvwm"\
longtitle="OpenLook virtual window manager"\
description="Olvwm: extended version of olwm, the original\
OpenLook window manager, enhanced for handling of virtual desktops."
diff -ruN ../src2/xview-3.2p1.4/debian/olwm-x-window-manager
xview-3.2p1.4/debian/olwm-x-window-manager
--- ../src2/xview-3.2p1.4/debian/olwm-x-window-manager 2006-05-16
16:00:37.000000000 -0700
+++ xview-3.2p1.4/debian/olwm-x-window-manager 2006-05-13 10:13:40.000000000
-0700
@@ -5,4 +5,4 @@
# So we let x-window-manager point to this wrapper and then exec olwm with
# its real name.
-exec /usr/X11R6/bin/olwm "$@"
+exec /usr/bin/olwm "$@"
diff -ruN ../src2/xview-3.2p1.4/debian/olwm.dirs xview-3.2p1.4/debian/olwm.dirs
--- ../src2/xview-3.2p1.4/debian/olwm.dirs 2006-05-16 16:00:37.000000000
-0700
+++ xview-3.2p1.4/debian/olwm.dirs 2006-05-13 10:14:30.000000000 -0700
@@ -1,7 +1,7 @@
etc/X11/olwm
etc/menu-methods
usr/lib/menu
-usr/X11R6/bin
-usr/X11R6/lib/help
-usr/X11R6/man/man1
+usr/bin
+usr/lib/help
+usr/share/man/man1
usr/share/doc/olwm
diff -ruN ../src2/xview-3.2p1.4/debian/olwm.menu xview-3.2p1.4/debian/olwm.menu
--- ../src2/xview-3.2p1.4/debian/olwm.menu 2006-05-16 16:00:37.000000000
-0700
+++ xview-3.2p1.4/debian/olwm.menu 2006-05-13 10:14:39.000000000 -0700
@@ -1,5 +1,5 @@
?package(olwm):needs="wm" section="WindowManagers" \
title="Olwm"\
- command="/usr/X11R6/bin/olwm"\
+ command="/usr/bin/olwm"\
longtitle="OpenLook window manager"\
description="Olwm: Traditional OpenLook window manager"
diff -ruN ../src2/xview-3.2p1.4/debian/olwm.postinst
xview-3.2p1.4/debian/olwm.postinst
--- ../src2/xview-3.2p1.4/debian/olwm.postinst 2006-05-16 16:00:37.000000000
-0700
+++ xview-3.2p1.4/debian/olwm.postinst 2006-05-13 10:15:31.000000000 -0700
@@ -9,5 +9,5 @@
update-alternatives --remove x-window-manager /usr/bin/X11/olwm > /dev/null
2>&1 || true
# ...and install new one that now points to the wrapper
update-alternatives --install /usr/bin/x-window-manager x-window-manager
/usr/bin/X11/olwm-x-window-manager 44 \
- --slave /usr/share/man/man1/x-window-manager.1.gz x-window-manager.1.gz
/usr/X11R6/man/man1/olwm.1.gz
+ --slave /usr/share/man/man1/x-window-manager.1.gz x-window-manager.1.gz
/usr/share/man/man1/olwm.1.gz
fi
diff -ruN ../src2/xview-3.2p1.4/debian/rules xview-3.2p1.4/debian/rules
--- ../src2/xview-3.2p1.4/debian/rules 2006-05-16 16:00:37.000000000 -0700
+++ xview-3.2p1.4/debian/rules 2006-05-16 13:19:35.000000000 -0700
@@ -5,7 +5,7 @@
define clean
-rm -f build-clean build-other build-stamp install-stamp
- OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash clean
+ OPENWINHOME=/usr bash Build-LinuxXView.bash clean
dh_clean
-rm -fr $(instdir)
-rm -f debian/copyright
@@ -23,17 +23,17 @@
build-other:
dh_testdir
- OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash libs
- OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash clients
- OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash contrib
- OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash olvwm
+ OPENWINHOME=/usr bash Build-LinuxXView.bash libs
+ OPENWINHOME=/usr bash Build-LinuxXView.bash clients
+ OPENWINHOME=/usr bash Build-LinuxXView.bash contrib
+ OPENWINHOME=/usr bash Build-LinuxXView.bash olvwm
touch build-other
clean:
dh_testdir
dh_testroot
$(clean)
-
+
install: install-stamp
install-stamp: install-clean install-other install-pkg-other
@@ -49,13 +49,13 @@
dh_testdir
dh_testroot
-rm -fr $(instdir)
- DESTDIR="`pwd`/$(instdir)" OPENWINHOME=/usr/X11R6 bash
Build-LinuxXView.bash instlibs
- mv $(instdir)/usr/X11R6/lib/help/clock.info
$(instdir)/usr/X11R6/lib/help/clock.info.keep
- DESTDIR="`pwd`/$(instdir)" OPENWINHOME=/usr/X11R6 bash
Build-LinuxXView.bash instclients
- DESTDIR="`pwd`/$(instdir)" OPENWINHOME=/usr/X11R6 bash
Build-LinuxXView.bash instcontrib
- DESTDIR="`pwd`/$(instdir)" OPENWINHOME=/usr/X11R6 bash
Build-LinuxXView.bash instolvwm
- mv $(instdir)/usr/X11R6/lib/help/clock.info.keep
$(instdir)/usr/X11R6/lib/help/clock.info
- sh debian/fixinfo $(instdir)/usr/X11R6/lib/help/*.info
+ DESTDIR="`pwd`/$(instdir)" OPENWINHOME=/usr bash Build-LinuxXView.bash
instlibs
+ mv $(instdir)/usr/lib/help/clock.info
$(instdir)/usr/lib/help/clock.info.keep
+ DESTDIR="`pwd`/$(instdir)" OPENWINHOME=/usr bash Build-LinuxXView.bash
instclients
+ DESTDIR="`pwd`/$(instdir)" OPENWINHOME=/usr bash Build-LinuxXView.bash
instcontrib
+ DESTDIR="`pwd`/$(instdir)" OPENWINHOME=/usr bash Build-LinuxXView.bash
instolvwm
+ mv $(instdir)/usr/lib/help/clock.info.keep
$(instdir)/usr/lib/help/clock.info
+ sh debian/fixinfo $(instdir)/usr/lib/help/*.info
# Shuffle files around from single install hierarchy into package
subdirectories
install-pkg-other: build-stamp
@@ -65,78 +65,78 @@
dh_installdirs
# xviewg
set -e && for file in text_extras_menu textswrc ttyswrc; do \
- mv $(instdir)/usr/X11R6/lib/.$$file
debian/xviewg/etc/X11/xview/$$file; \
- mv $(instdir)/usr/X11R6/lib/$$file debian/xviewg/usr/X11R6/lib; \
- ln -s /etc/X11/xview/$$file debian/xviewg/usr/X11R6/lib/.$$file; \
- done
- mv $(instdir)/usr/X11R6/lib/lib*.so.*.*.*
$(instdir)/usr/X11R6/lib/lib*.so.? debian/xviewg/usr/X11R6/lib
- mv $(instdir)/usr/X11R6/include/bitmaps/*
debian/xviewg/usr/X11R6/include/bitmaps
- mv $(instdir)/usr/X11R6/include/images/*
debian/xviewg/usr/X11R6/include/images
+ mv $(instdir)/usr/lib/.$$file debian/xviewg/etc/X11/xview/$$file; \
+ mv $(instdir)/usr/lib/$$file debian/xviewg/usr/lib; \
+ ln -s /etc/X11/xview/$$file debian/xviewg/usr/lib/.$$file; \
+ done
+ mv $(instdir)/usr/lib/lib*.so.*.*.* $(instdir)/usr/lib/lib*.so.?
debian/xviewg/usr/lib
+ mv $(instdir)/usr/include/bitmaps/* debian/xviewg/usr/include/bitmaps
+ mv $(instdir)/usr/include/images/* debian/xviewg/usr/include/images
set -e && for prog in capitalize insert_brackets remove_brackets
shift_lines; do \
- cp contrib/misc/$$prog debian/xviewg/usr/X11R6/bin; \
- chmod +x debian/xviewg/usr/X11R6/bin/$$prog; \
- cp contrib/misc/$$prog.1 debian/xviewg/usr/X11R6/man/man1; \
+ cp contrib/misc/$$prog debian/xviewg/usr/bin; \
+ chmod +x debian/xviewg/usr/bin/$$prog; \
+ cp contrib/misc/$$prog.1 debian/xviewg/usr/share/man/man1; \
done
set -e && for info in textsw ttysw xview; do \
- mv $(instdir)/usr/X11R6/lib/help/$$info.info
debian/xviewg/usr/X11R6/lib/help; \
+ mv $(instdir)/usr/lib/help/$$info.info debian/xviewg/usr/lib/help; \
done
- mv $(instdir)/usr/X11R6/man/man1/xview.1x
debian/xviewg/usr/X11R6/man/man7/xview.7
- ln -s X11R6 debian/xviewg/usr/openwin
- mv $(instdir)/usr/X11R6/share/doc/xview/whats_new.ps
debian/xviewg/usr/share/doc/xviewg
- cat debian/xview-info.head
$(instdir)/usr/X11R6/share/doc/xview/xview-info \
+ mv $(instdir)/usr/man/man1/xview.1x
debian/xviewg/usr/share/man/man7/xview.7
+ ln -s . debian/xviewg/usr/openwin
+ mv $(instdir)/usr/share/doc/xview/whats_new.ps
debian/xviewg/usr/share/doc/xviewg
+ cat debian/xview-info.head $(instdir)/usr/share/doc/xview/xview-info \
> debian/xviewg/usr/share/doc/xviewg/xview-info
# xviewg-dev
- mv $(instdir)/usr/X11R6/lib/lib*.a $(instdir)/usr/X11R6/lib/lib*.so
debian/xviewg-dev/usr/X11R6/lib
+ mv $(instdir)/usr/lib/lib*.a $(instdir)/usr/lib/lib*.so
debian/xviewg-dev/usr/lib
set -e && for file in xgettext msgfmt; do \
- mv $(instdir)/usr/X11R6/bin/$$file
debian/xviewg-dev/usr/X11R6/bin/xview_$$file; \
- mv $(instdir)/usr/X11R6/man/man1/$$file.1
debian/xviewg-dev/usr/X11R6/man/man1/xview_$$file.1; \
+ mv $(instdir)/usr/bin/$$file debian/xviewg-dev/usr/bin/xview_$$file; \
+ mv $(instdir)/usr/man/man1/$$file.1
debian/xviewg-dev/usr/share/man/man1/xview_$$file.1; \
done
set -e && for dir in olgx pixrect xview_private olgx_private xview; do \
- mv $(instdir)/usr/X11R6/include/$$dir/*
debian/xviewg-dev/usr/X11R6/include/$$dir; \
+ mv $(instdir)/usr/include/$$dir/*
debian/xviewg-dev/usr/include/$$dir; \
done
- mv $(instdir)/usr/X11R6/lib/X11/config/*
debian/xviewg-dev/usr/X11R6/lib/X11/config
- mv $(instdir)/usr/X11R6/share/doc/xview/*api*
debian/xviewg-dev/usr/share/doc/xviewg
+ mv $(instdir)/usr/lib/X11/config/* debian/xviewg-dev/usr/lib/X11/config
+ mv $(instdir)/usr/share/doc/xview/*api*
debian/xviewg-dev/usr/share/doc/xviewg
# xview-clients
set -e && for file in clock cmdtool shelltool props textedit; do \
- mv $(instdir)/usr/X11R6/bin/$$file
debian/xview-clients/usr/X11R6/bin; \
- mv $(instdir)/usr/X11R6/man/man1/$$file.1x
debian/xview-clients/usr/X11R6/man/man1/$$file.1; \
+ mv $(instdir)/usr/bin/$$file debian/xview-clients/usr/bin; \
+ mv $(instdir)/usr/man/man1/$$file.1x
debian/xview-clients/usr/share/man/man1/$$file.1; \
done
- cp contrib/misc/owplaces debian/xview-clients/usr/X11R6/bin
+ cp contrib/misc/owplaces debian/xview-clients/usr/bin
set -e && for file in clock.info props.info textedit.info; do \
- mv $(instdir)/usr/X11R6/lib/help/$$file
debian/xview-clients/usr/X11R6/lib/help/$$file; \
+ mv $(instdir)/usr/lib/help/$$file
debian/xview-clients/usr/lib/help/$$file; \
done
- cp contrib/misc/props-locale.C
debian/xview-clients/usr/X11R6/share/locale/C/props/C
- cp contrib/misc/props-locale.basic_setting
debian/xview-clients/usr/X11R6/share/locale/C/props/basic_setting
+ cp contrib/misc/props-locale.C
debian/xview-clients/usr/share/locale/C/props/C
+ cp contrib/misc/props-locale.basic_setting
debian/xview-clients/usr/share/locale/C/props/basic_setting
# xview-examples
- mv $(instdir)/usr/X11R6/share/src/xview/examples/bin/*
debian/xview-examples/usr/lib/xview/examples
- rmdir $(instdir)/usr/X11R6/share/src/xview/examples/bin
+ mv $(instdir)/usr/share/src/xview/examples/bin/*
debian/xview-examples/usr/lib/xview/examples
+ rmdir $(instdir)/usr/share/src/xview/examples/bin
chmod +x debian/xview-examples/usr/lib/xview/examples/*
- mv $(instdir)/usr/X11R6/share/src/xview/examples/*
debian/xview-examples/usr/share/doc/xviewg/examples
+ mv $(instdir)/usr/share/src/xview/examples/*
debian/xview-examples/usr/share/doc/xviewg/examples
ln -s ../../../../lib/xview/examples
debian/xview-examples/usr/share/doc/xviewg/examples/bin
# olvwm
- mv $(instdir)/usr/X11R6/bin/olvwm debian/olvwm/usr/X11R6/bin
- mv $(instdir)/usr/X11R6/man/man1/olvwm.1x
debian/olvwm/usr/X11R6/man/man1/olvwm.1
- mv $(instdir)/usr/X11R6/man/man1/olvwmrc.1x
debian/olvwm/usr/X11R6/man/man5/olvwmrc.5
- sed -e 's/TH olwm 1/TH olwm 1olvwm/' <
$(instdir)/usr/X11R6/man/man1/olwm.1x >
debian/olvwm/usr/X11R6/man/man1/olwm.1olvwm
- mv $(instdir)/usr/X11R6/lib/help/olvwm.info
debian/olvwm/usr/X11R6/lib/help
- cp debian/olvwm-x-window-manager debian/olvwm/usr/X11R6/bin
- chmod +x debian/olvwm/usr/X11R6/bin/olvwm-x-window-manager
+ mv $(instdir)/usr/bin/olvwm debian/olvwm/usr/bin
+ mv $(instdir)/usr/man/man1/olvwm.1x
debian/olvwm/usr/share/man/man1/olvwm.1
+ mv $(instdir)/usr/man/man1/olvwmrc.1x
debian/olvwm/usr/share/man/man5/olvwmrc.5
+ sed -e 's/TH olwm 1/TH olwm 1olvwm/' < $(instdir)/usr/man/man1/olwm.1x
> debian/olvwm/usr/share/man/man1/olwm.1olvwm
+ mv $(instdir)/usr/lib/help/olvwm.info debian/olvwm/usr/lib/help
+ cp debian/olvwm-x-window-manager debian/olvwm/usr/bin
+ chmod +x debian/olvwm/usr/bin/olvwm-x-window-manager
cp debian/olvwm.openwin-menu debian/olvwm/etc/X11/olvwm/openwin-menu
cp debian/olvwm.changelog.old
debian/olvwm/usr/share/doc/olvwm/changelog.Debian-old
cp debian/olvwm.README debian/olvwm/usr/share/doc/olvwm/README.debian
# olwm
- mv $(instdir)/usr/X11R6/bin/olwm* debian/olwm/usr/X11R6/bin
+ mv $(instdir)/usr/bin/olwm* debian/olwm/usr/bin
set -e && for file in olwm olwmslave; do \
- mv $(instdir)/usr/X11R6/man/man1/$$file.1x
debian/olwm/usr/X11R6/man/man1/$$file.1; \
+ mv $(instdir)/usr/man/man1/$$file.1x
debian/olwm/usr/share/man/man1/$$file.1; \
done
set -e && for file in olwm.info workspace.info; do \
- mv $(instdir)/usr/X11R6/lib/help/$$file
debian/olwm/usr/X11R6/lib/help/$$file; \
+ mv $(instdir)/usr/lib/help/$$file debian/olwm/usr/lib/help/$$file; \
done
- cp debian/olwm-x-window-manager debian/olwm/usr/X11R6/bin
- chmod +x debian/olwm/usr/X11R6/bin/olwm-x-window-manager
+ cp debian/olwm-x-window-manager debian/olwm/usr/bin
+ chmod +x debian/olwm/usr/bin/olwm-x-window-manager
cp debian/olwm.openwin-menu debian/olwm/etc/X11/olwm/openwin-menu
- mv $(instdir)/usr/X11R6/lib/openwin-menu
debian/olwm/etc/X11/olwm/openwin-menu.orig
- mv $(instdir)/usr/X11R6/lib/openwin-menu-programs
debian/olwm/etc/X11/olwm
+ mv $(instdir)/usr/lib/openwin-menu
debian/olwm/etc/X11/olwm/openwin-menu.orig
+ mv $(instdir)/usr/lib/openwin-menu-programs debian/olwm/etc/X11/olwm
cp debian/olwm.README debian/olwm/usr/share/doc/olwm/README.debian
binary: binary-indep binary-arch
@@ -160,7 +160,7 @@
dh_fixperms
dh_installdeb
install -m 644 debian/shlibs.local debian/xviewg/DEBIAN/shlibs
- dh_shlibdeps -ldebian/xviewg/usr/X11R6/lib
+ dh_shlibdeps -ldebian/xviewg/usr/lib
# Prevent xviewg from depending on itself (this happens most likely because
libxview
# needs libolgx and nobody notices that it's in the same package)
sh debian/fixdeps xviewg debian/xviewg.substvars
diff -ruN ../src2/xview-3.2p1.4/debian/xview-clients.dirs
xview-3.2p1.4/debian/xview-clients.dirs
--- ../src2/xview-3.2p1.4/debian/xview-clients.dirs 2006-05-16
16:00:37.000000000 -0700
+++ xview-3.2p1.4/debian/xview-clients.dirs 2006-05-15 16:35:35.000000000
-0700
@@ -1,5 +1,6 @@
-usr/X11R6/share/locale/C/props
-usr/X11R6/bin
-usr/X11R6/lib/help
-usr/X11R6/man/man1
+usr/share/locale/C/props
+usr/bin
+usr/lib/help
+usr/share/man
+usr/share/man/man1
usr/lib/menu
diff -ruN ../src2/xview-3.2p1.4/debian/xview-clients.menu
xview-3.2p1.4/debian/xview-clients.menu
--- ../src2/xview-3.2p1.4/debian/xview-clients.menu 2006-05-16
16:00:37.000000000 -0700
+++ xview-3.2p1.4/debian/xview-clients.menu 2006-05-13 10:25:49.000000000
-0700
@@ -1,4 +1,4 @@
-?package(xview-clients):needs="X11" section="Apps/Editors" title="Textedit"
command="/usr/X11R6/bin/textedit"
-?package(xview-clients):needs="X11" section="XShells" title="Command Tool"
command="/usr/X11R6/bin/cmdtool"
-?package(xview-clients):needs="X11" section="XShells" title="Shell Tool"
command="/usr/X11R6/bin/shelltool"
-?package(xview-clients):needs="X11" section="Screen" title="Property Editor"
command="/usr/X11R6/bin/props"
+?package(xview-clients):needs="X11" section="Apps/Editors" title="Textedit"
command="/usr/bin/textedit"
+?package(xview-clients):needs="X11" section="XShells" title="Command Tool"
command="/usr/bin/cmdtool"
+?package(xview-clients):needs="X11" section="XShells" title="Shell Tool"
command="/usr/bin/shelltool"
+?package(xview-clients):needs="X11" section="Screen" title="Property Editor"
command="/usr/bin/props"
diff -ruN ../src2/xview-3.2p1.4/debian/xview-examples.dirs
xview-3.2p1.4/debian/xview-examples.dirs
--- ../src2/xview-3.2p1.4/debian/xview-examples.dirs 2006-05-16
16:00:37.000000000 -0700
+++ xview-3.2p1.4/debian/xview-examples.dirs 2006-05-15 16:36:23.000000000
-0700
@@ -1,2 +1,3 @@
usr/lib/xview/examples
+usr/share/doc/xviewg
usr/share/doc/xviewg/examples
diff -ruN ../src2/xview-3.2p1.4/debian/xviewg-dev.dirs
xview-3.2p1.4/debian/xviewg-dev.dirs
--- ../src2/xview-3.2p1.4/debian/xviewg-dev.dirs 2006-05-16
16:00:37.000000000 -0700
+++ xview-3.2p1.4/debian/xviewg-dev.dirs 2006-05-15 16:36:54.000000000
-0700
@@ -1,9 +1,10 @@
-usr/X11R6/include/olgx
-usr/X11R6/include/olgx_private
-usr/X11R6/include/xview
-usr/X11R6/include/xview_private
-usr/X11R6/include/pixrect
-usr/X11R6/lib/X11/config
-usr/X11R6/bin
-usr/X11R6/man/man1
+usr/include/olgx
+usr/include/olgx_private
+usr/include/xview
+usr/include/xview_private
+usr/include/pixrect
+usr/lib/X11/config
+usr/bin
+usr/share/man
+usr/share/man/man1
usr/share/doc/xviewg
diff -ruN ../src2/xview-3.2p1.4/debian/xviewg.dirs
xview-3.2p1.4/debian/xviewg.dirs
--- ../src2/xview-3.2p1.4/debian/xviewg.dirs 2006-05-16 16:00:37.000000000
-0700
+++ xview-3.2p1.4/debian/xviewg.dirs 2006-05-15 16:50:52.000000000 -0700
@@ -1,8 +1,9 @@
etc/X11/xview
-usr/X11R6/lib/help
-usr/X11R6/include/bitmaps
-usr/X11R6/include/images
-usr/X11R6/man/man1
-usr/X11R6/man/man7
-usr/X11R6/bin
+usr/lib/help
+usr/include/bitmaps
+usr/include/images
+usr/share/man
+usr/share/man/man1
+usr/share/man/man7
+usr/bin
usr/share/doc/xviewg
diff -ruN ../src2/xview-3.2p1.4/make xview-3.2p1.4/make
--- ../src2/xview-3.2p1.4/make 1997-06-15 17:03:45.000000000 -0700
+++ xview-3.2p1.4/make 1969-12-31 16:00:00.000000000 -0800
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "make-wrapper: running pmake $* in directory `pwd`"
-exec pmake "$@"
