> Author: dnusinow > Date: 2005-07-26 00:15:38 -0500 (Tue, 26 Jul 2005) > New Revision: 413
> Added: > trunk/debian/patches/general/022_disable_xmh.diff > Removed: > trunk/debian/xmh.install > trunk/debian/xmh.menu > Modified: > trunk/debian/TODO > trunk/debian/changelog > trunk/debian/control > trunk/debian/patches/series > Log: > - Drop xmh > - Add general/022_disable_xmh.diff to not build it Remains are still left in MANIFEST.* and xlibs-data.install. Fixing patch attached.
diff -Nru debian.orig/MANIFEST.alpha.in debian/MANIFEST.alpha.in --- debian.orig/MANIFEST.alpha.in 2005-07-13 12:31:02.000000000 +0800 +++ debian/MANIFEST.alpha.in 2005-07-26 15:45:45.000000000 +0800 @@ -43,7 +43,6 @@ etc/X11/app-defaults/Xman etc/X11/app-defaults/Xmessage etc/X11/app-defaults/Xmessage-color -etc/X11/app-defaults/Xmh etc/X11/app-defaults/Xvidtune etc/X11/cursors/core.theme etc/X11/cursors/handhelds.theme @@ -568,7 +567,6 @@ usr/X11R6/bin/xmag usr/X11R6/bin/xman usr/X11R6/bin/xmessage -usr/X11R6/bin/xmh usr/X11R6/bin/xmkmf usr/X11R6/bin/xmodmap usr/X11R6/bin/xmore @@ -815,8 +813,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/card.xbm @@ -1791,7 +1787,6 @@ usr/X11R6/man/man1/xmag.1x usr/X11R6/man/man1/xman.1x usr/X11R6/man/man1/xmessage.1x -usr/X11R6/man/man1/xmh.1x usr/X11R6/man/man1/xmkmf.1x usr/X11R6/man/man1/xmodmap.1x usr/X11R6/man/man1/xmore.1x diff -Nru debian.orig/MANIFEST.amd64.in debian/MANIFEST.amd64.in --- debian.orig/MANIFEST.amd64.in 2005-07-11 02:26:56.000000000 +0800 +++ debian/MANIFEST.amd64.in 2005-07-26 15:45:45.000000000 +0800 @@ -43,7 +43,6 @@ etc/X11/app-defaults/Xman etc/X11/app-defaults/Xmessage etc/X11/app-defaults/Xmessage-color -etc/X11/app-defaults/Xmh etc/X11/app-defaults/Xvidtune etc/X11/cursors/core.theme etc/X11/cursors/handhelds.theme @@ -568,7 +567,6 @@ usr/X11R6/bin/xmag usr/X11R6/bin/xman usr/X11R6/bin/xmessage -usr/X11R6/bin/xmh usr/X11R6/bin/xmkmf usr/X11R6/bin/xmodmap usr/X11R6/bin/xmore @@ -815,8 +813,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/card.xbm @@ -1806,7 +1802,6 @@ usr/X11R6/man/man1/xmag.1x usr/X11R6/man/man1/xman.1x usr/X11R6/man/man1/xmessage.1x -usr/X11R6/man/man1/xmh.1x usr/X11R6/man/man1/xmkmf.1x usr/X11R6/man/man1/xmodmap.1x usr/X11R6/man/man1/xmore.1x diff -Nru debian.orig/MANIFEST.arm.in debian/MANIFEST.arm.in --- debian.orig/MANIFEST.arm.in 2005-07-17 09:45:16.000000000 +0800 +++ debian/MANIFEST.arm.in 2005-07-26 15:45:45.000000000 +0800 @@ -43,7 +43,6 @@ etc/X11/app-defaults/Xman etc/X11/app-defaults/Xmessage etc/X11/app-defaults/Xmessage-color -etc/X11/app-defaults/Xmh etc/X11/app-defaults/Xvidtune etc/X11/cursors/core.theme etc/X11/cursors/handhelds.theme @@ -567,7 +566,6 @@ usr/X11R6/bin/xmag usr/X11R6/bin/xman usr/X11R6/bin/xmessage -usr/X11R6/bin/xmh usr/X11R6/bin/xmkmf usr/X11R6/bin/xmodmap usr/X11R6/bin/xmore @@ -814,8 +812,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/card.xbm @@ -1777,7 +1773,6 @@ usr/X11R6/man/man1/xmag.1x usr/X11R6/man/man1/xman.1x usr/X11R6/man/man1/xmessage.1x -usr/X11R6/man/man1/xmh.1x usr/X11R6/man/man1/xmkmf.1x usr/X11R6/man/man1/xmodmap.1x usr/X11R6/man/man1/xmore.1x diff -Nru debian.orig/MANIFEST.hppa.in debian/MANIFEST.hppa.in --- debian.orig/MANIFEST.hppa.in 2005-07-11 02:26:56.000000000 +0800 +++ debian/MANIFEST.hppa.in 2005-07-26 15:45:45.000000000 +0800 @@ -43,7 +43,6 @@ etc/X11/app-defaults/Xman etc/X11/app-defaults/Xmessage etc/X11/app-defaults/Xmessage-color -etc/X11/app-defaults/Xmh etc/X11/app-defaults/Xvidtune etc/X11/cursors/core.theme etc/X11/cursors/handhelds.theme @@ -567,7 +566,6 @@ usr/X11R6/bin/xmag usr/X11R6/bin/xman usr/X11R6/bin/xmessage -usr/X11R6/bin/xmh usr/X11R6/bin/xmkmf usr/X11R6/bin/xmodmap usr/X11R6/bin/xmore @@ -814,8 +812,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/card.xbm @@ -1698,7 +1694,6 @@ usr/X11R6/man/man1/xmag.1x usr/X11R6/man/man1/xman.1x usr/X11R6/man/man1/xmessage.1x -usr/X11R6/man/man1/xmh.1x usr/X11R6/man/man1/xmkmf.1x usr/X11R6/man/man1/xmodmap.1x usr/X11R6/man/man1/xmore.1x diff -Nru debian.orig/MANIFEST.hurd-i386.in debian/MANIFEST.hurd-i386.in --- debian.orig/MANIFEST.hurd-i386.in 2005-07-11 02:26:56.000000000 +0800 +++ debian/MANIFEST.hurd-i386.in 2005-07-26 15:45:45.000000000 +0800 @@ -40,7 +40,6 @@ etc/X11/app-defaults/Xman etc/X11/app-defaults/Xmessage etc/X11/app-defaults/Xmessage-color -etc/X11/app-defaults/Xmh etc/X11/app-defaults/Xvidtune etc/X11/cursors/core.theme etc/X11/cursors/handhelds.theme @@ -548,7 +547,6 @@ usr/X11R6/bin/xmag usr/X11R6/bin/xman usr/X11R6/bin/xmessage -usr/X11R6/bin/xmh usr/X11R6/bin/xmkmf usr/X11R6/bin/xmodmap usr/X11R6/bin/xon @@ -783,8 +781,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/card.xbm @@ -1756,7 +1752,6 @@ usr/X11R6/man/man1/xmag.1x usr/X11R6/man/man1/xman.1x usr/X11R6/man/man1/xmessage.1x -usr/X11R6/man/man1/xmh.1x usr/X11R6/man/man1/xmkmf.1x usr/X11R6/man/man1/xmodmap.1x usr/X11R6/man/man1/xon.1x diff -Nru debian.orig/MANIFEST.i386.in debian/MANIFEST.i386.in --- debian.orig/MANIFEST.i386.in 2005-07-11 02:26:56.000000000 +0800 +++ debian/MANIFEST.i386.in 2005-07-26 15:45:45.000000000 +0800 @@ -43,7 +43,6 @@ etc/X11/app-defaults/Xman etc/X11/app-defaults/Xmessage etc/X11/app-defaults/Xmessage-color -etc/X11/app-defaults/Xmh etc/X11/app-defaults/Xvidtune etc/X11/cursors/core.theme etc/X11/cursors/handhelds.theme @@ -568,7 +567,6 @@ usr/X11R6/bin/xmag usr/X11R6/bin/xman usr/X11R6/bin/xmessage -usr/X11R6/bin/xmh usr/X11R6/bin/xmkmf usr/X11R6/bin/xmodmap usr/X11R6/bin/xmore @@ -815,8 +813,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/card.xbm @@ -1815,7 +1811,6 @@ usr/X11R6/man/man1/xmag.1x usr/X11R6/man/man1/xman.1x usr/X11R6/man/man1/xmessage.1x -usr/X11R6/man/man1/xmh.1x usr/X11R6/man/man1/xmkmf.1x usr/X11R6/man/man1/xmodmap.1x usr/X11R6/man/man1/xmore.1x diff -Nru debian.orig/MANIFEST.ia64.in debian/MANIFEST.ia64.in --- debian.orig/MANIFEST.ia64.in 2005-07-11 02:26:56.000000000 +0800 +++ debian/MANIFEST.ia64.in 2005-07-26 15:45:45.000000000 +0800 @@ -43,7 +43,6 @@ etc/X11/app-defaults/Xman etc/X11/app-defaults/Xmessage etc/X11/app-defaults/Xmessage-color -etc/X11/app-defaults/Xmh etc/X11/app-defaults/Xvidtune etc/X11/cursors/core.theme etc/X11/cursors/handhelds.theme @@ -568,7 +567,6 @@ usr/X11R6/bin/xmag usr/X11R6/bin/xman usr/X11R6/bin/xmessage -usr/X11R6/bin/xmh usr/X11R6/bin/xmkmf usr/X11R6/bin/xmodmap usr/X11R6/bin/xmore @@ -815,8 +813,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/card.xbm @@ -1808,7 +1804,6 @@ usr/X11R6/man/man1/xmag.1x usr/X11R6/man/man1/xman.1x usr/X11R6/man/man1/xmessage.1x -usr/X11R6/man/man1/xmh.1x usr/X11R6/man/man1/xmkmf.1x usr/X11R6/man/man1/xmodmap.1x usr/X11R6/man/man1/xmore.1x diff -Nru debian.orig/MANIFEST.m68k.in debian/MANIFEST.m68k.in --- debian.orig/MANIFEST.m68k.in 2005-07-17 04:04:13.000000000 +0800 +++ debian/MANIFEST.m68k.in 2005-07-26 15:45:45.000000000 +0800 @@ -43,7 +43,6 @@ etc/X11/app-defaults/Xman etc/X11/app-defaults/Xmessage etc/X11/app-defaults/Xmessage-color -etc/X11/app-defaults/Xmh etc/X11/app-defaults/Xvidtune etc/X11/cursors/core.theme etc/X11/cursors/handhelds.theme @@ -566,7 +565,6 @@ usr/X11R6/bin/xmag usr/X11R6/bin/xman usr/X11R6/bin/xmessage -usr/X11R6/bin/xmh usr/X11R6/bin/xmkmf usr/X11R6/bin/xmodmap usr/X11R6/bin/xmore @@ -813,8 +811,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/card.xbm @@ -1777,7 +1773,6 @@ usr/X11R6/man/man1/xmag.1x usr/X11R6/man/man1/xman.1x usr/X11R6/man/man1/xmessage.1x -usr/X11R6/man/man1/xmh.1x usr/X11R6/man/man1/xmkmf.1x usr/X11R6/man/man1/xmodmap.1x usr/X11R6/man/man1/xmore.1x diff -Nru debian.orig/MANIFEST.mipsel.in debian/MANIFEST.mipsel.in --- debian.orig/MANIFEST.mipsel.in 2005-07-16 02:48:56.000000000 +0800 +++ debian/MANIFEST.mipsel.in 2005-07-26 15:45:45.000000000 +0800 @@ -43,7 +43,6 @@ etc/X11/app-defaults/Xman etc/X11/app-defaults/Xmessage etc/X11/app-defaults/Xmessage-color -etc/X11/app-defaults/Xmh etc/X11/app-defaults/Xvidtune etc/X11/cursors/core.theme etc/X11/cursors/handhelds.theme @@ -567,7 +566,6 @@ usr/X11R6/bin/xmag usr/X11R6/bin/xman usr/X11R6/bin/xmessage -usr/X11R6/bin/xmh usr/X11R6/bin/xmkmf usr/X11R6/bin/xmodmap usr/X11R6/bin/xmore @@ -814,8 +812,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/card.xbm @@ -1698,7 +1694,6 @@ usr/X11R6/man/man1/xmag.1x usr/X11R6/man/man1/xman.1x usr/X11R6/man/man1/xmessage.1x -usr/X11R6/man/man1/xmh.1x usr/X11R6/man/man1/xmkmf.1x usr/X11R6/man/man1/xmodmap.1x usr/X11R6/man/man1/xmore.1x diff -Nru debian.orig/MANIFEST.mips.in debian/MANIFEST.mips.in --- debian.orig/MANIFEST.mips.in 2005-07-19 00:13:31.000000000 +0800 +++ debian/MANIFEST.mips.in 2005-07-26 15:45:46.000000000 +0800 @@ -43,7 +43,6 @@ etc/X11/app-defaults/Xman etc/X11/app-defaults/Xmessage etc/X11/app-defaults/Xmessage-color -etc/X11/app-defaults/Xmh etc/X11/app-defaults/Xvidtune etc/X11/cursors/core.theme etc/X11/cursors/handhelds.theme @@ -567,7 +566,6 @@ usr/X11R6/bin/xmag usr/X11R6/bin/xman usr/X11R6/bin/xmessage -usr/X11R6/bin/xmh usr/X11R6/bin/xmkmf usr/X11R6/bin/xmodmap usr/X11R6/bin/xmore @@ -814,8 +812,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/card.xbm @@ -1698,7 +1694,6 @@ usr/X11R6/man/man1/xmag.1x usr/X11R6/man/man1/xman.1x usr/X11R6/man/man1/xmessage.1x -usr/X11R6/man/man1/xmh.1x usr/X11R6/man/man1/xmkmf.1x usr/X11R6/man/man1/xmodmap.1x usr/X11R6/man/man1/xmore.1x diff -Nru debian.orig/MANIFEST.powerpc.in debian/MANIFEST.powerpc.in --- debian.orig/MANIFEST.powerpc.in 2005-07-11 02:26:56.000000000 +0800 +++ debian/MANIFEST.powerpc.in 2005-07-26 15:45:46.000000000 +0800 @@ -43,7 +43,6 @@ etc/X11/app-defaults/Xman etc/X11/app-defaults/Xmessage etc/X11/app-defaults/Xmessage-color -etc/X11/app-defaults/Xmh etc/X11/app-defaults/Xvidtune etc/X11/cursors/core.theme etc/X11/cursors/handhelds.theme @@ -567,7 +566,6 @@ usr/X11R6/bin/xmag usr/X11R6/bin/xman usr/X11R6/bin/xmessage -usr/X11R6/bin/xmh usr/X11R6/bin/xmkmf usr/X11R6/bin/xmodmap usr/X11R6/bin/xmore @@ -814,8 +812,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/card.xbm @@ -1788,7 +1784,6 @@ usr/X11R6/man/man1/xmag.1x usr/X11R6/man/man1/xman.1x usr/X11R6/man/man1/xmessage.1x -usr/X11R6/man/man1/xmh.1x usr/X11R6/man/man1/xmkmf.1x usr/X11R6/man/man1/xmodmap.1x usr/X11R6/man/man1/xmore.1x diff -Nru debian.orig/MANIFEST.s390.in debian/MANIFEST.s390.in --- debian.orig/MANIFEST.s390.in 2005-07-13 11:39:00.000000000 +0800 +++ debian/MANIFEST.s390.in 2005-07-26 15:45:46.000000000 +0800 @@ -42,7 +42,6 @@ etc/X11/app-defaults/Xman etc/X11/app-defaults/Xmessage etc/X11/app-defaults/Xmessage-color -etc/X11/app-defaults/Xmh etc/X11/app-defaults/Xvidtune etc/X11/fs/config etc/X11/fs/xfs.options @@ -553,7 +552,6 @@ usr/X11R6/bin/xmag usr/X11R6/bin/xman usr/X11R6/bin/xmessage -usr/X11R6/bin/xmh usr/X11R6/bin/xmkmf usr/X11R6/bin/xmodmap usr/X11R6/bin/xmore @@ -798,8 +796,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/cntr_ptr @@ -1615,7 +1611,6 @@ usr/X11R6/man/man1/xmag.1x usr/X11R6/man/man1/xman.1x usr/X11R6/man/man1/xmessage.1x -usr/X11R6/man/man1/xmh.1x usr/X11R6/man/man1/xmkmf.1x usr/X11R6/man/man1/xmodmap.1x usr/X11R6/man/man1/xmore.1x diff -Nru debian.orig/MANIFEST.sparc.in debian/MANIFEST.sparc.in --- debian.orig/MANIFEST.sparc.in 2005-07-16 02:48:56.000000000 +0800 +++ debian/MANIFEST.sparc.in 2005-07-26 15:45:46.000000000 +0800 @@ -43,7 +43,6 @@ etc/X11/app-defaults/Xman etc/X11/app-defaults/Xmessage etc/X11/app-defaults/Xmessage-color -etc/X11/app-defaults/Xmh etc/X11/app-defaults/Xvidtune etc/X11/cursors/core.theme etc/X11/cursors/handhelds.theme @@ -567,7 +566,6 @@ usr/X11R6/bin/xmag usr/X11R6/bin/xman usr/X11R6/bin/xmessage -usr/X11R6/bin/xmh usr/X11R6/bin/xmkmf usr/X11R6/bin/xmodmap usr/X11R6/bin/xmore @@ -814,8 +812,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/card.xbm @@ -1806,7 +1802,6 @@ usr/X11R6/man/man1/xmag.1x usr/X11R6/man/man1/xman.1x usr/X11R6/man/man1/xmessage.1x -usr/X11R6/man/man1/xmh.1x usr/X11R6/man/man1/xmkmf.1x usr/X11R6/man/man1/xmodmap.1x usr/X11R6/man/man1/xmore.1x diff -Nru debian.orig/xlibs-data.install debian/xlibs-data.install --- debian.orig/xlibs-data.install 2005-05-11 10:30:31.000000000 +0800 +++ debian/xlibs-data.install 2005-07-26 15:40:11.000000000 +0800 @@ -18,8 +18,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/card.xbm diff -Nru debian.orig/xlibs-data.install.s390 debian/xlibs-data.install.s390 --- debian.orig/xlibs-data.install.s390 2005-05-11 10:30:31.000000000 +0800 +++ debian/xlibs-data.install.s390 2005-07-26 15:40:18.000000000 +0800 @@ -14,8 +14,6 @@ usr/X11R6/include/X11/bitmaps/Term usr/X11R6/include/X11/bitmaps/Up usr/X11R6/include/X11/bitmaps/black -usr/X11R6/include/X11/bitmaps/black6 -usr/X11R6/include/X11/bitmaps/box6 usr/X11R6/include/X11/bitmaps/boxes usr/X11R6/include/X11/bitmaps/calculator usr/X11R6/include/X11/bitmaps/cntr_ptr