[Pkg-jed-commit] r124 - trunk/packages/jed/debian/patches

[Guenter Milde]

Author: milde-guest
Date: 2005-11-03 10:36:01 +0000 (Thu, 03 Nov 2005)
New Revision: 124

Modified:
   trunk/packages/jed/debian/patches/00list
   trunk/packages/jed/debian/patches/50_jed-manpage.dpatch
Log:
Removed dpatches that are now included upstream


Modified: trunk/packages/jed/debian/patches/00list
===================================================================
--- trunk/packages/jed/debian/patches/00list	2005-11-03 10:05:53 UTC (rev 123)
+++ trunk/packages/jed/debian/patches/00list	2005-11-03 10:36:01 UTC (rev 124)
@@ -1,8 +1,6 @@
 40_freetype-include.dpatch
 50_README.dpatch
-50_abbrev_fix.dpatch
 50_enable-xrenderfont.dpatch
 50_jed-manpage.dpatch
 50_popups.sl.dpatch
-50_pymode_indent.dpatch
 60_gpm-mouse-support.dpatch

Modified: trunk/packages/jed/debian/patches/50_jed-manpage.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_jed-manpage.dpatch	2005-11-03 10:05:53 UTC (rev 123)
+++ trunk/packages/jed/debian/patches/50_jed-manpage.dpatch	2005-11-03 10:36:01 UTC (rev 124)
@@ -1,7 +1,6 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 50_jed-manpage.dpatch by Rafael Laboissiere <rafael at debian.org>
 ##
-## DP: Explain better the behavior of option -g (#223794)
 ## DP: Explain option -a <joerg at alea.gnuu.de>
 ## DP: Discribe user config files, if jed-extra is installed (#210274)
 
@@ -9,32 +8,12 @@
 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.orig/doc/manual/jed.1	2005-04-15 19:42:29.026844968 +0200
 +++ 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
++.I ~/.jedrc or ~/.jed/jed.rc
 +.RS
 +If the Debian package jed-extra is installed, the user configuration can
 +also be in one of these files. (See