X Strike Force X.Org X11 SVN commit: r408 - in trunk/debian: . patches patches/general
Author: dnusinow
Date: 2005-07-25 23:15:44 -0500 (Mon, 25 Jul 2005)
New Revision: 408
Removed:
trunk/debian/patches/general/033_no_html.diff
Modified:
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/series
Log:
- Remove 033_no_html.diff in preparation to restore HTML documentation.
If anyone who already knows how to start building the HTML docs again could
let me know, I'd really appreciate it so I don't have to go scouring for
the info for days on end.
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-07-24 05:03:23 UTC (rev 407)
+++ trunk/debian/TODO 2005-07-26 04:15:44 UTC (rev 408)
@@ -20,7 +20,6 @@
* Ship the HTML docs in xspecs again. Debian Policy section 12.4 says that we
should ship HTML documentation if possible.
- + Kill 033_no_html.diff
* Review infrastructure of new packages:
+ libdmx1, libdmx1-dbg, libdmx-dev
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-24 05:03:23 UTC (rev 407)
+++ trunk/debian/changelog 2005-07-26 04:15:44 UTC (rev 408)
@@ -12,6 +12,7 @@
- Remove mention of speedo from templates.pot and update. Sorry
translators!
- Edit various Debian files for XFree86 -> X.Org branding changes
+ - Remove general/033_no_html.diff
Changes by Eugene Konev:
- Do not impose selinux on the whole world out there: move selinux
Deleted: trunk/debian/patches/general/033_no_html.diff
===================================================================
--- trunk/debian/patches/general/033_no_html.diff 2005-07-24 05:03:23 UTC (rev 407)
+++ trunk/debian/patches/general/033_no_html.diff 2005-07-26 04:15:44 UTC (rev 408)
@@ -1,33 +0,0 @@
-$Id$
-
-Don't install specindex.html and Xprint_FAQ.html, since we don't ship html
-documentation.
-
-Original patch by Branden Robinson.
-Modified by Fabio M. Di Nitto.
-
-diff -ruN xc-old/doc/hardcopy/XPRINT/Imakefile xc/doc/hardcopy/XPRINT/Imakefile
---- xc-old/doc/hardcopy/XPRINT/Imakefile 2004-07-19 21:07:32.000000000 +0000
-+++ xc/doc/hardcopy/XPRINT/Imakefile 2004-10-19 13:41:47.793986184 +0000
-@@ -1,6 +1,10 @@
- XCOMM $Xorg: Imakefile,v 1.1 2004/07/19 19:41:53 gisburn Exp $
-
- InstallHardcopyDoc(dtprint_fspec,dtprint_fspec.PS.gz)
-+
-+#if !BuildHtmlManPages
-+NOHTML = YES
-+#endif
- InstallDoc(Xprint_FAQ,Xprint_FAQ.html Xprint_FAQ.txt)
-
- #ifdef HasDocBookTools
-diff -ruN xc-old/doc/specs/Imakefile xc/doc/specs/Imakefile
---- xc-old/doc/specs/Imakefile 2004-04-23 18:42:15.000000000 +0000
-+++ xc/doc/specs/Imakefile 2004-10-19 13:24:23.531738176 +0000
-@@ -21,5 +21,6 @@
- MakeSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
-
-+#if BuildHtmlManPages
- InstallDoc(specindex,specindex.html)
--
-+#endif
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2005-07-24 05:03:23 UTC (rev 407)
+++ trunk/debian/patches/series 2005-07-26 04:15:44 UTC (rev 408)
@@ -39,7 +39,6 @@
general/028_loader_speed_hack.diff -p0
general/029_only_open_proc_bus_pci_devices_once.diff -p0
general/030_libvgahw_gcc4_volatile_fix.diff -p0
-general/033_no_html.diff -p0
general/035_tdfx_disable_dri_on_16mb_with_highres.diff -p0
general/040_extend_netmouse_support.diff -p0
general/041_make_xcursor_icondir_configurable.diff -p0
Reply to: