[emacs21-non-dfsg commit] 8a2291c1d3ca6ada40d0bfec2ea97483941cc5eb
Jérôme Marant
jerome at marant.org
Wed Oct 11 09:44:00 UTC 2006
commit 8a2291c1d3ca6ada40d0bfec2ea97483941cc5eb
Author: Jérôme Marant <jerome at marant.org>
Date: Wed Oct 11 11:44:00 2006 +0200
Add more manuals to non-free, because Cover and Back texts are
considered as invariant sections as well
diff --git a/patches/adjust-man-makefile.diff b/patches/adjust-man-makefile.diff
index 409289a..bba7071 100644
--- a/patches/adjust-man-makefile.diff
+++ b/patches/adjust-man-makefile.diff
@@ -7,8 +7,8 @@
Index: non-main/man/Makefile.in
===================================================================
---- non-main.orig/man/Makefile.in 2006-07-29 15:47:30.000000000 -0700
-+++ non-main/man/Makefile.in 2006-07-29 15:53:12.000000000 -0700
+--- non-main.orig/man/Makefile.in 2006-10-11 09:46:35.233932706 +0200
++++ non-main/man/Makefile.in 2006-10-11 09:55:30.816602405 +0200
@@ -20,10 +20,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
@@ -21,118 +21,40 @@ Index: non-main/man/Makefile.in
srcdir=@srcdir@
# Tell make where to find source files; this is needed for the makefiles.
-@@ -32,21 +29,16 @@
-
+@@ -33,16 +30,16 @@
# The makeinfo program is part of the Texinfo distribution.
MAKEINFO = makeinfo
--INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
+ INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
- ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
-- ../info/info ../info/message ../info/mh-e ../info/reftex \
-- ../info/sc ../info/vip ../info/viper ../info/widget \
++ ../info/ediff ../info/forms ../info/gnus \
+ ../info/info ../info/message ../info/mh-e ../info/reftex \
+ ../info/sc ../info/vip ../info/viper ../info/widget \
- ../info/efaq ../info/ada-mode ../info/autotype \
-- ../info/idlwave ../info/eudc ../info/ebrowse ../info/pcl-cvs \
-- ../info/woman ../info/emacs-mime ../info/eshell \
-+INFO_TARGETS = ../info/emacs ../info/ccmode \
-+ ../info/widget \
+ ../info/ada-mode ../info/autotype \
-+ ../info/pcl-cvs \
+ ../info/idlwave ../info/eudc ../info/ebrowse ../info/pcl-cvs \
+ ../info/woman ../info/emacs-mime ../info/eshell \
../info/speedbar
-DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi \
-- ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.dvi \
++DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi \
+ ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.dvi \
- reftex.dvi sc.dvi vip.dvi viper.dvi widget.dvi faq.dvi \
-- ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \
-- pcl-cvs.dvi woman.dvi emacs-mime.dvi eshell.dvi \
-+DVI_TARGETS = emacs.dvi cc-mode.dvi \
-+ widget.dvi \
-+ ada-mode.dvi autotype.dvi \
-+ pcl-cvs.dvi \
++ reftex.dvi sc.dvi vip.dvi viper.dvi widget.dvi \
+ ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \
+ pcl-cvs.dvi woman.dvi emacs-mime.dvi eshell.dvi \
speedbar.dvi
--INFOSOURCES = info.texi
-
- # The following rule does not work with all versions of `make'.
- .SUFFIXES: .texi .dvi
-@@ -113,12 +105,6 @@
- # the @setfilename directive in info.texi, which is required for
- # the Texinfo distribution.
+@@ -150,11 +147,6 @@
+ cl.dvi: cl.texi
+ $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
--../info/info: ${INFOSOURCES}
-- cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@
--
--info.dvi: ${INFOSOURCES}
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
--
- ../info/emacs: ${EMACSSOURCES}
- cd $(srcdir); $(MAKEINFO) emacs.texi
-
-@@ -140,79 +126,11 @@
- pcl-cvs.dvi: pcl-cvs.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
-
--../info/eshell: eshell.texi
-- cd $(srcdir); $(MAKEINFO) eshell.texi
--eshell.dvi: eshell.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
--
--../info/cl: cl.texi
-- cd $(srcdir); $(MAKEINFO) cl.texi
--cl.dvi: cl.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
--
-../info/dired-x: dired-x.texi
- cd $(srcdir); $(MAKEINFO) dired-x.texi
-dired-x.dvi: dired-x.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
-
--../info/ediff: ediff.texi
-- cd $(srcdir); $(MAKEINFO) ediff.texi
--ediff.dvi: ediff.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
--
--../info/forms: forms.texi
-- cd $(srcdir); $(MAKEINFO) forms.texi
--forms.dvi: forms.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
--
--../info/gnus: gnus.texi
-- cd $(srcdir); $(MAKEINFO) gnus.texi
--gnus.dvi: gnus.texi
-- sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
-- $(ENVADD) $(TEXI2DVI) gnustmp.texi
-- cp gnustmp.dvi $*.dvi
-- rm gnustmp.*
--
--../info/message: message.texi
-- cd $(srcdir); $(MAKEINFO) message.texi
--message.dvi: message.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
--
--../info/mh-e: mh-e.texi
-- cd $(srcdir); $(MAKEINFO) mh-e.texi
--mh-e.dvi: mh-e.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
--
--../info/reftex: reftex.texi
-- cd $(srcdir); $(MAKEINFO) reftex.texi
--reftex.dvi: reftex.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
--
--../info/sc: sc.texi
-- cd $(srcdir); $(MAKEINFO) sc.texi
--sc.dvi: sc.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
--
--../info/vip: vip.texi
-- cd $(srcdir); $(MAKEINFO) vip.texi
--vip.dvi: vip.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
--
--../info/viper: viper.texi
-- cd $(srcdir); $(MAKEINFO) viper.texi
--viper.dvi: viper.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
--
- ../info/widget: widget.texi
- cd $(srcdir); $(MAKEINFO) widget.texi
+ ../info/ediff: ediff.texi
+ cd $(srcdir); $(MAKEINFO) ediff.texi
+ ediff.dvi: ediff.texi
+@@ -208,11 +200,6 @@
widget.dvi: widget.texi
$(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
@@ -144,42 +66,3 @@ Index: non-main/man/Makefile.in
../etc/GNU: gnu1.texi gnu.texi
cd $(srcdir) && makeinfo --no-headers -o ../etc/GNU gnu1.texi
-@@ -221,38 +139,11 @@
- autotype.dvi: autotype.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
-
--# This is produced with --no-split to avoid making files whose
--# names clash on DOS 8+3 filesystems
--../info/idlwave: idlwave.texi
-- cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi
--idlwave.dvi: idlwave.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
--
--../info/eudc: eudc.texi
-- cd $(srcdir); $(MAKEINFO) eudc.texi
--eudc.dvi: eudc.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
--
--../info/ebrowse: ebrowse.texi
-- cd $(srcdir); $(MAKEINFO) ebrowse.texi
--ebrowse.dvi: ebrowse.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
--
--../info/woman: woman.texi
-- cd $(srcdir); $(MAKEINFO) woman.texi
--woman.dvi: woman.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
--
- ../info/speedbar: speedbar.texi
- cd $(srcdir); $(MAKEINFO) speedbar.texi
- speedbar.dvi: speedbar.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
-
--../info/emacs-mime: emacs-mime.texi
-- cd $(srcdir); $(MAKEINFO) emacs-mime.texi
--emacs-mime.dvi: emacs-mime.texi
-- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
--
- mostlyclean:
- rm -f *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
-
diff --git a/rules b/rules
index 0f90b01..f67ae46 100755
--- a/rules
+++ b/rules
@@ -132,13 +132,30 @@ target := $(DEB_HOST_GNU_TYPE)
# Info files that are going to show up in the main dir.
main_dir_info_files := \
- ada-mode \
- autotype \
- ccmode \
+ info \
emacs \
+ cl \
+ ediff \
pcl-cvs \
speedbar \
- widget
+ ada-mode \
+ ccmode \
+ ebrowse \
+ idlwave \
+ gnus \
+ message \
+ mh-e \
+ emacs-mime \
+ sc \
+ autotype \
+ eshell \
+ eudc \
+ forms \
+ reftex \
+ widget \
+ woman \
+ viper \
+ vip
# These files must always exist, i.e. can't ever be cleaned.
persistent_autogen_files := debian/control debian/copyright
More information about the pkg-emacs-commits
mailing list