[Pkg-jed-commit] r36 - in trunk/packages/jed/debian: . init.d patches
Jörg Sommer
jo-guest@costa.debian.org
Sat, 30 Apr 2005 20:43:44 +0000
Author: jo-guest
Date: 2005-04-30 20:43:43 +0000 (Sat, 30 Apr 2005)
New Revision: 36
Added:
trunk/packages/jed/debian/patches/50_jed-manpage.dpatch
Removed:
trunk/packages/jed/debian/patches/50_jed-manpage-option-g.dpatch
Modified:
trunk/packages/jed/debian/changelog
trunk/packages/jed/debian/init.d/00debian.sl
trunk/packages/jed/debian/jed-common.dirs
trunk/packages/jed/debian/patches/00list
trunk/packages/jed/debian/rules
Log:
* corrected headline of 00debian.sl to show the right filename (#...)
* changed creation of examples directory for jed-common to by
dh_installdirs instead of by hand
* moved jed.conf for upstream to /u/s/d/jed-common/examples (#287781)
* renamed patch 50_jed-manpage-option-g to 50_jed-manpage
* added a note on ~/.jed/lib and others to manpage (#210274)
Modified: trunk/packages/jed/debian/changelog
===================================================================
--- trunk/packages/jed/debian/changelog 2005-04-28 19:44:49 UTC (rev 35)
+++ trunk/packages/jed/debian/changelog 2005-04-30 20:43:43 UTC (rev 36)
@@ -19,6 +19,14 @@
/usr/share/jed/compile with the approprite arguments.
* debian/jed-sl.*: Removed files
+ +++ Changes by Jörg Sommer
+
+ * changed headline of 00debian.sl to name the correct file name
+ (Closes: ...)
+ * moved /u/s/j/l/jed.conf to /u/s/d/jed-common/examples (Closes: 287781)
+ * discribed the handling of ~/.jed/, if jed-extra is installed
+ (Closes: 210274)
+
--
jed (0.99.16.pre.0.99.17.84-1) experimental; urgency=low
Modified: trunk/packages/jed/debian/init.d/00debian.sl
===================================================================
--- trunk/packages/jed/debian/init.d/00debian.sl 2005-04-28 19:44:49 UTC (rev 35)
+++ trunk/packages/jed/debian/init.d/00debian.sl 2005-04-30 20:43:43 UTC (rev 36)
@@ -1,4 +1,4 @@
-% File: 00site.sl -*- SLang -*-
+% File: 00debian.sl -*- SLang -*-
% You can add further slang customisation here to be done by JED at startup.
% Please read /usr/share/doc/jed-common/README.Debian-startup for more
% information on this mechanism.
Modified: trunk/packages/jed/debian/jed-common.dirs
===================================================================
--- trunk/packages/jed/debian/jed-common.dirs 2005-04-28 19:44:49 UTC (rev 35)
+++ trunk/packages/jed/debian/jed-common.dirs 2005-04-30 20:43:43 UTC (rev 36)
@@ -1,6 +1,7 @@
etc
etc/jed-init.d
usr/share/doc/jed-common
+usr/share/doc/jed-common/examples
usr/share/info
usr/share/man/man8
usr/share/jed/lib
Modified: trunk/packages/jed/debian/patches/00list
===================================================================
--- trunk/packages/jed/debian/patches/00list 2005-04-28 19:44:49 UTC (rev 35)
+++ trunk/packages/jed/debian/patches/00list 2005-04-30 20:43:43 UTC (rev 36)
@@ -1,6 +1,6 @@
40_freetype-include
50_slangfun-txt.dpatch
-50_jed-manpage-option-g
+50_jed-manpage
50_enable-xrenderfont
50_emacs-bindings
50_paste-mode-sl
Deleted: trunk/packages/jed/debian/patches/50_jed-manpage-option-g.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_jed-manpage-option-g.dpatch 2005-04-28 19:44:49 UTC (rev 35)
+++ trunk/packages/jed/debian/patches/50_jed-manpage-option-g.dpatch 2005-04-30 20:43:43 UTC (rev 36)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_jed-manpage-option-g.dpatch by Rafael Laboissiere <rafael@debian.org>
-##
-## DP: Explain better the behavior of option -g
-
-@DPATCH@
-diff -urNad jed-B0.99-17.56/doc/manual/jed.1 /tmp/dpep.I28qj8/jed-B0.99-17.56/doc/manual/jed.1
---- jed-B0.99-17.56/doc/manual/jed.1 2005-04-15 19:42:29.026844968 +0200
-+++ /tmp/dpep.I28qj8/jed-B0.99-17.56/doc/manual/jed.1 2005-04-15 19:49:03.842364856 +0200
-@@ -41,11 +41,18 @@
- .I .jedrc
- file.
- .RE
-+.I -a 'file'
-+.RS
-+load
-+.I file
-+as user configuration file instead of .jedrc.
-+.RE
- .I -g 'n'
- .RS
- goto line
- .I n
--in buffer
-+in buffer (notice that in order to this option to take effect, if must
-+appear after the file name in the command line, like 'jed file -g 3')
- .RE
- .I -l 'file'
- .RS
Copied: trunk/packages/jed/debian/patches/50_jed-manpage.dpatch (from rev 35, trunk/packages/jed/debian/patches/50_jed-manpage-option-g.dpatch)
===================================================================
--- trunk/packages/jed/debian/patches/50_jed-manpage-option-g.dpatch 2005-04-28 19:44:49 UTC (rev 35)
+++ trunk/packages/jed/debian/patches/50_jed-manpage.dpatch 2005-04-30 20:43:43 UTC (rev 36)
@@ -0,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_jed-manpage.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## DP: Explain better the behavior of option -g (#223794)
+## DP: Explain option -a <joerg@alea.gnuu.de>
+## DP: Discribe user config files, if jed-extra is installed (#210274)
+
+@DPATCH@
+diff -urNad jed-B0.99-17.56/doc/manual/jed.1 /tmp/dpep.I28qj8/jed-B0.99-17.56/doc/manual/jed.1
+--- jed-B0.99-17.56/doc/manual/jed.1 2005-04-15 19:42:29.026844968 +0200
++++ /tmp/dpep.I28qj8/jed-B0.99-17.56/doc/manual/jed.1 2005-04-15 19:49:03.842364856 +0200
+@@ -41,11 +41,18 @@
+ .I .jedrc
+ file.
+ .RE
++.I -a 'file'
++.RS
++load
++.I file
++as user configuration file instead of .jedrc.
++.RE
+ .I -g 'n'
+ .RS
+ goto line
+ .I n
+-in buffer
++in buffer (notice that in order to this option to take effect, if must
++appear after the file name in the command line, like 'jed file -g 3')
+ .RE
+ .I -l 'file'
+ .RS
+@@ -407,6 +414,22 @@
+ .I ~/.jedrc
+ .RS
+ Per user configuration file.
++.RE
++.I ~/.jed/.jedrc ~/.jed/lib/jed.rc
++.RS
++If the Debian package jed-extra is installed, the user configuration can
++also be in one of these files. (See
++.I /etc/jed-init.d/05home-lib.sl
++)
++.RE
++.I ~/.jed/lib/
++.RS
++If the Debian package jed-extra is installed, this directory is searched
++for .sl files like
++.I /usr/share/jed/lib/
++. (See
++.I /etc/jed-init.d/05home-lib.sl
++)
+ .SH AUTHOR
+ .I "John E. Davis" <davis@space.mit.edu>
+ .RS
Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules 2005-04-28 19:44:49 UTC (rev 35)
+++ trunk/packages/jed/debian/rules 2005-04-30 20:43:43 UTC (rev 36)
@@ -65,6 +65,8 @@
@echo --- JED-COMMON ---
@echo
cp -r lib $(jed-common)/usr/share/jed/
+ mv $(jed-common)/usr/share/jed/lib/jed.conf \
+ $(jed-common)/usr/share/doc/jed-common/examples
# install docs
cp -r doc/* $(jed-common)/usr/share/doc/jed-common
mv $(jed-common)/usr/share/doc/jed-common/README \