X Strike Force X.Org X11 SVN commit: r413 - in trunk/debian: . patches patches/general
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
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-07-26 04:40:39 UTC (rev 412)
+++ trunk/debian/TODO 2005-07-26 05:15:38 UTC (rev 413)
@@ -39,8 +39,6 @@
* Decide whether to build liboldX or not.
-* Drop xmh
-
* Finalize all library build/versioning/arrangement decisions as much as
possible before uploading to unstable, so we don't wreak havoc on the entire
world via dpkg-shlibdeps.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-26 04:40:39 UTC (rev 412)
+++ trunk/debian/changelog 2005-07-26 05:15:38 UTC (rev 413)
@@ -13,6 +13,8 @@
translators!
- Edit various Debian files for XFree86 -> X.Org branding changes
- Remove general/033_no_html.diff
+ - Drop xmh
+ - Add general/022_disable_xmh.diff to not build it
Changes by Eugene Konev:
- Do not impose selinux on the whole world out there: move selinux
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-07-26 04:40:39 UTC (rev 412)
+++ trunk/debian/control 2005-07-26 05:15:38 UTC (rev 413)
@@ -2480,20 +2480,6 @@
See the xlibs-static-dev package for a description of the specific libraries
available in this package.
-Package: xmh
-Priority: extra
-Section: mail
-Architecture: any
-Depends: nmh | mh, xlibs-data, ${shlibs:Depends}, ${misc:Depends}
-Replaces: xbase (<< 3.3.2.3a-2)
-Description: X interface to the MH mail system
- xmh provides a graphical user interface to the MH (Message Handler) mail
- system. xmh is a very old X client and is not exactly a "living" piece of
- software. MH users will probably prefer the exmh package, which serves the
- same function and continues to be actively developed.
- .
- The xmh program uses bitmap images provided by the xlibs-data package.
-
Package: xnest
Architecture: any
Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends}
Added: trunk/debian/patches/general/022_disable_xmh.diff
===================================================================
--- trunk/debian/patches/general/022_disable_xmh.diff 2005-07-26 04:40:39 UTC (rev 412)
+++ trunk/debian/patches/general/022_disable_xmh.diff 2005-07-26 05:15:38 UTC (rev 413)
@@ -0,0 +1,13 @@
+Index: trunk/xc/programs/Imakefile
+===================================================================
+--- trunk.orig/xc/programs/Imakefile 2005-05-08 23:29:21.000000000 -0400
++++ trunk/xc/programs/Imakefile 2005-07-26 01:10:55.000000000 -0400
+@@ -139,7 +139,7 @@
+ $(XF86DGASRCDIR) xedit xev xeyes xfd xfontsel $(XFSSRCDIR) xfsinfo \
+ $(XFINDPROXYSRCDIR) $(XFWPSRCDIR) $(XGAMMASRCDIR) xgc $(XHOSTSRCDIR) \
+ $(XINITSRCDIR) $(XKBSRCDIRS) xkill $(XLOADDIR) xlogo xlsatoms \
+- xlsclients xlsfonts xmag xman xmessage xmh xmodmap $(XMORE) xprop \
++ xlsclients xlsfonts xmag xman xmessage xmodmap $(XMORE) xprop \
+ xrdb xrefresh $(XRXSRCDIR) xset \
+ xsetroot $(XSMSRCDIR) xstdcmap $(XINPUTCLIENTDIRS) \
+ $(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2005-07-26 04:40:39 UTC (rev 412)
+++ trunk/debian/patches/series 2005-07-26 05:15:38 UTC (rev 413)
@@ -31,6 +31,7 @@
general/019_iso8859-15_Compose_fix.diff -p0
general/020_add_sigusr2_signal_handler.diff -p0
general/021_riscpc_ioport_fix.diff -p0
+general/022_disable_xmh.diff
general/023_specs_doc_fixes.diff -p0
general/024_ati_r128_and_radeon_enable_build_without_vgahw.diff -p0
general/024d_radeon_fix_gcc4_build.diff -p0
Deleted: trunk/debian/xmh.install
===================================================================
--- trunk/debian/xmh.install 2005-07-26 04:40:39 UTC (rev 412)
+++ trunk/debian/xmh.install 2005-07-26 05:15:38 UTC (rev 413)
@@ -1,3 +0,0 @@
-etc/X11/app-defaults/Xmh
-usr/X11R6/bin/xmh
-usr/X11R6/man/man1/xmh.1x
Deleted: trunk/debian/xmh.menu
===================================================================
--- trunk/debian/xmh.menu 2005-07-26 04:40:39 UTC (rev 412)
+++ trunk/debian/xmh.menu 2005-07-26 05:15:38 UTC (rev 413)
@@ -1,9 +0,0 @@
-# $Id$
-
-?package(xmh):\
- needs="x11"\
- section="Apps/Net"\
- hints="Mail"\
- longtitle="Xmh: X interface to MH mail system"\
- title="Xmh"\
- command="xmh"
Reply to: