X Strike Force X.Org X11 SVN commit: r1244 - branches/modular/app/twm-X11R7.0-1.0.1/debian
Author: dnusinow
Date: 2006-02-19 23:35:07 -0500 (Sun, 19 Feb 2006)
New Revision: 1244
Modified:
branches/modular/app/twm-X11R7.0-1.0.1/debian/rules
branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.examples
branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.install
branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.links
branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.postinst.in
branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.postrm.in
branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.preinst.in
branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.prerm.in
Log:
All sorts of fixes to properly build the package.
Modified: branches/modular/app/twm-X11R7.0-1.0.1/debian/rules
===================================================================
--- branches/modular/app/twm-X11R7.0-1.0.1/debian/rules 2006-02-20 04:01:49 UTC (rev 1243)
+++ branches/modular/app/twm-X11R7.0-1.0.1/debian/rules 2006-02-20 04:35:07 UTC (rev 1244)
@@ -69,7 +69,8 @@
dh_installdirs
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
- install -m 644 $(DEBTREEDIR)/etc/X11/twm/system.twmrc $(DEBTREEDIR)/etc/X11/twm/system.twmrc-menu
+ install -d debian/tmp/etc/X11/twm
+ install -m 644 src/system.twmrc debian/tmp/etc/X11/twm/system.twmrc-menu
# Build architecture-dependent files here.
binary-arch: build install
@@ -79,6 +80,7 @@
dh_installdocs
dh_install --sourcedir=debian/tmp
dh_installchangelogs
+ dh_installexamples
dh_link
dh_strip --dbg-package=$(PACKAGE)
dh_compress
Modified: branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.examples
===================================================================
--- branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.examples 2006-02-20 04:01:49 UTC (rev 1243)
+++ branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.examples 2006-02-20 04:35:07 UTC (rev 1244)
@@ -1,3 +1,3 @@
-build-tree/xc/programs/twm/sample-twmrc/jim.twmrc
-build-tree/xc/programs/twm/sample-twmrc/keith.twmrc
-build-tree/xc/programs/twm/sample-twmrc/lemke.twmrc
+sample-twmrc/jim.twmrc
+sample-twmrc/keith.twmrc
+sample-twmrc/lemke.twmrc
Modified: branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.install
===================================================================
--- branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.install 2006-02-20 04:01:49 UTC (rev 1243)
+++ branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.install 2006-02-20 04:35:07 UTC (rev 1244)
@@ -1,3 +1,3 @@
etc/X11/twm/system.twmrc-menu
-usr/X11R6/bin/twm
-usr/X11R6/man/man1/twm.1x
+usr/bin/twm
+usr/share/man/man1/twm.1x
Modified: branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.links
===================================================================
--- branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.links 2006-02-20 04:01:49 UTC (rev 1243)
+++ branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.links 2006-02-20 04:35:07 UTC (rev 1244)
@@ -1 +1 @@
-etc/X11/twm usr/X11R6/lib/X11/twm
+etc/X11/twm usr/lib/X11/twm
Modified: branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.postinst.in
===================================================================
--- branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.postinst.in 2006-02-20 04:01:49 UTC (rev 1243)
+++ branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.postinst.in 2006-02-20 04:35:07 UTC (rev 1244)
@@ -14,7 +14,7 @@
#INCLUDE_SHELL_LIB#
-check_symlinks_and_bomb /usr/X11R6/lib/X11/twm
+check_symlinks_and_bomb /usr/lib/X11/twm
# now safe to remove old twm dir
if [ -e /usr/X11R6/lib/X11/twm.moved-by-preinst ] \
@@ -28,8 +28,8 @@
update-alternatives --remove x-window-manager /usr/bin/X11/twm
update-alternatives --install /usr/bin/x-window-manager x-window-manager \
- /usr/X11R6/bin/twm 40 --slave /usr/share/man/man1/x-window-manager.1.gz \
- x-window-manager.1.gz /usr/X11R6/man/man1/twm.1x.gz
+ /usr/bin/twm 40 --slave /usr/share/man/man1/x-window-manager.1.gz \
+ x-window-manager.1.gz /usr/share/man/man1/twm.1x.gz
exit 0
Modified: branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.postrm.in
===================================================================
--- branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.postrm.in 2006-02-20 04:01:49 UTC (rev 1243)
+++ branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.postrm.in 2006-02-20 04:35:07 UTC (rev 1244)
@@ -16,8 +16,8 @@
if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
if [ -d /usr/X11R6/lib/X11/twm.moved-by-preinst ] \
- && [ -L /usr/X11R6/lib/X11/twm ]; then
- rm /usr/X11R6/lib/X11/twm
+ && [ -L /usr/lib/X11/twm ]; then
+ rm /usr/lib/X11/twm
mv /usr/X11R6/lib/X11/twm.moved-by-preinst /usr/X11R6/lib/X11/twm
fi
fi
Modified: branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.preinst.in
===================================================================
--- branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.preinst.in 2006-02-20 04:01:49 UTC (rev 1243)
+++ branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.preinst.in 2006-02-20 04:35:07 UTC (rev 1244)
@@ -20,7 +20,7 @@
observe "removing obsolete /usr/X11R6/lib/X11/twm directory"
mv /usr/X11R6/lib/X11/twm /usr/X11R6/lib/X11/twm.moved-by-preinst
fi
- check_symlinks_and_warn /usr/X11R6/lib/X11/twm
+ check_symlinks_and_warn /usr/lib/X11/twm
fi
#DEBHELPER#
Modified: branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.prerm.in
===================================================================
--- branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.prerm.in 2006-02-20 04:01:49 UTC (rev 1243)
+++ branches/modular/app/twm-X11R7.0-1.0.1/debian/twm.prerm.in 2006-02-20 04:35:07 UTC (rev 1244)
@@ -17,7 +17,7 @@
#DEBHELPER#
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
- update-alternatives --remove x-window-manager /usr/X11R6/bin/twm
+ update-alternatives --remove x-window-manager /usr/bin/twm
fi
exit 0
Reply to: