[Pkg-jed-commit] r59 - in trunk/packages/jed/debian: . init.d
patches
Jörg Sommer
jo-guest at costa.debian.org
Sun Sep 11 20:30:44 UTC 2005
Author: jo-guest
Date: 2005-09-11 20:30:34 +0000 (Sun, 11 Sep 2005)
New Revision: 59
Added:
trunk/packages/jed/debian/init.d/05jed-common.sl
trunk/packages/jed/debian/patches/40_site.sl-startup.dpatch
trunk/packages/jed/debian/patches/50_README.dpatch
Removed:
trunk/packages/jed/debian/init.d/jed.conf
Modified:
trunk/packages/jed/debian/changelog
trunk/packages/jed/debian/control
trunk/packages/jed/debian/jed-common.copyright
trunk/packages/jed/debian/jed-common.dirs
trunk/packages/jed/debian/jed.postinst
trunk/packages/jed/debian/jed.prerm
trunk/packages/jed/debian/patches/00list
trunk/packages/jed/debian/rules
trunk/packages/jed/debian/xjed.postinst
trunk/packages/jed/debian/xjed.prerm
Log:
jed
* (x)jed.prerm:
+ don't remove the compiled files, because this leads to problems, if
both packages are installed and one is removed. The removed one
steals the other package the compiled files. Its not the task of
(x)jed package to clean up.
* copyright:
+ extended by the last part of jed-src/README
+ removed the year from the copyright not, we don't want update it
everytime
+ updated the post address of the FSF
* added 50_README.dpatch to correct the path for html documents in README
* added 40_site.sl-startup.dpatch to make the startup go the Debian way,
i.e. the files in /etc/jed.d/ get evaluated by jed, the
Default_Jedrc_Startup_File is set to NULL, which was done in jed.conf
before.
* (x)jed.postinst:
+ rewrote message showing up before precompiling
* xjed.(prerm,postinst):
+ added xjed to alternatives editor to make the xjed package can be a
replacement of jed package. (Annotation: This is policy conform,
because xjed can also run in console mode like jed.)
* jed.conf / 05jed-common.sl:
+ renamed jed.conf to 05jed-common.sl, because it is now installed in
/etc/jed.d/ to not pollute /etc (Policy 10.7.2)
+ removed the things now done in site.sl
+ added a function "register_libdir()", which *appends* a library dir
to the corresponding variables. I think appending is better to make
Jed behaves the same way before and after adding a new libdir (iow a
new package is installed).
+ it is also checked for ~/.jed and it is *prependened* in the
variables if it exist
* rules
+ we can't compress any files in /u/s/d/j/txt/, because jed does not
support this (Menu->Help->Browse Docs misses files)
+ removed README, because it contains no interesting infos; renamed
README.doc to README
+ jed-common compile script need to be made executable, because the
x-flag is dropped from the file by dpkg-source, i.e. it is not
shipped with the source package
+ now do not install jed.conf anymore and install the *.sl files in
/etc/jed.d/
* control:
+ updated Standards-Version
+ removed perl-base from Build-Depends because lintian had complained
+ removed whitespaces from the end of line in the description
+ added debconf | debconf-2.0 to Depends of jed-common; lintian complained
* changelog:
+ added a space in front of the line of the entry from the "14 Feb
2000", because lintian had complained
+ removed trailing whitespaces from the current entry
+ updated package version to 99.17.111
+ a little bit extended
Modified: trunk/packages/jed/debian/changelog
===================================================================
--- trunk/packages/jed/debian/changelog 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/changelog 2005-09-11 20:30:34 UTC (rev 59)
@@ -1,21 +1,20 @@
-jed (0.99.16.pre.0.99.17.95-1) experimental; urgency=low
+jed (0.99.16.pre.0.99.17.111-1) experimental; urgency=low
- NOT YET RELEASED!
-
+ * New upstream release
+
+++ Changes by Rafael Laboissiere
- * New upstream release
* Starting with this release, the *.slc files are generated at install
time and not at build time as before. This means that the *.sl files
are included in jed-common and the jed-sl package is dropped.
* Also, we have now a new scheme for byte-compiling all files in jed
add-on package each time the jed-common package is upgraded.
- * debian/control:
+ * debian/control:
- Removed entry for jed-sl package
- jed-common Conflicts with and Replaces jed-sl
* debian/rules: Dropped stuff related to jed-sl
* debian/compile: New script to compile/remove he *.slc files.
- * debian/jed-common.postinst, debian/jed-common.prerm: Run
+ * debian/jed-common.postinst, debian/jed-common.prerm: Run
/usr/share/jed/compile/jed-common with the approprite arguments.
* debian/jed-sl.*: Removed files
@@ -26,7 +25,7 @@
* 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)
- * changed build strategy of installing files in packages, The old way
+ * changed build strategy of installing files in packages. The old way
(copying the files from the source tree) had some problems. Files they
are excluded by upstream installation were installed (jed.conf,
vms_shell.com). Now, upstream Makefile installes in debian/tmp and
@@ -37,8 +36,14 @@
+ removed jed-common dependency on slang
+ added xjed to recommends of jed-common
+ changed description of jed-common
+ + updated Standards-Version field; no points of the policy update
+ affected this package
+ + removed perl-base from Build-Depends because it is an essential
+ package
+ + added debconf-2.0 as dependency for jed-common (needed by the user
+ dialog for compiling sl-files or removing 00site.sl)
* rewrote rules to make more use of debhelper
- * moved /u/s/j/lib/jed.rc to examples and disabled searching for in
+ * moved /u/s/j/lib/jed.rc to examples and disabled searching for it in
00debian.sl by setting Default_Jedrc_Startup_File = NULL
(Closes: 219448)
* removed 50_emacs-bindings.dpatch, because jed.rc is out of the way
@@ -48,10 +53,11 @@
* if 00site.sl and 99defaults.sl exist and were changed the user is
asked if they should get removed; otherwise they are droped silently
(Closes: 266981)
-
+ * added a space at the begin of line in changlog file for the entry of
+ the "14 Feb 2000"; lintian did complain
+
+++ Changes by Guenter Milde
-
-
+
* moved the basic debian configuration stuff to jed.conf and removed
00debian.sl
* removed the setup of paste mode now superseded by the `paste' function
@@ -59,7 +65,7 @@
* removed indent_buffer() and indent_region_or_line() from the basic
configuration. (These functions are now in txtutils.sl in jed-extra.)
- --
+ --
jed (0.99.16.pre.0.99.17.84-1) experimental; urgency=low
@@ -373,7 +379,7 @@
* For some reasons jed crashes when moving the mouse on console
terminals. Recompiling helped. Closes: #58041
--- Christian Hammers <ch at debian.org> Mon, 14 Feb 2000 16:11:56 +0100
+ -- Christian Hammers <ch at debian.org> Mon, 14 Feb 2000 16:11:56 +0100
jed (0.99.9-11) frozen unstable; urgency=low
Modified: trunk/packages/jed/debian/control
===================================================================
--- trunk/packages/jed/debian/control 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/control 2005-09-11 20:30:34 UTC (rev 59)
@@ -2,8 +2,8 @@
Section: editors
Priority: optional
Maintainer: Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>
-Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4), hevea, libgpmg1-dev (>= 1.17.8-18) [!hurd-i386], perl-base, libslang2-dev, libxft-dev, libxt-dev, x-dev, dpatch
+Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 4), hevea, libgpmg1-dev (>= 1.17.8-18) [!hurd-i386], libslang2-dev, libxft-dev, libxt-dev, x-dev, dpatch
Package: jed
Architecture: any
@@ -12,12 +12,12 @@
Description: editor for programmers (textmode version)
Jed offers:
Extensible in a language resembling C. Completely customizable.
- Capable of read GNU info files from within JED's info browser.
+ Capable of read GNU info files from within JED's info browser.
A variety of programming modes (syntax highlighting and more) are
available including Basic, C, C++, DCL, FORTRAN, HTML, IDL, Java,
NROFF, Pascal, Perl, PostScript, Python, SH, TeX.
- Folding support.
- Edit TeX files with AUC-TeX style editing (BiBTeX support too).
+ Folding support.
+ Edit TeX files with AUC-TeX style editing (BiBTeX support too).
Rectangular cut/paste; regular expressions; incremental searches; search
replace across multiple files; multiple windows; multiple buffers;
shell modes; directory editor (dired); mail; rmail; ispell; and
@@ -50,6 +50,7 @@
Replaces: jedslc, jedsl, jedsl-src, jed (<< 0.99.10-2), jed-sl
Conflicts: jedslc, jedsl, jedsl-src, jed (<< 0.99.10-2), jed-sl
Recommends: jed | xjed
+Depends: debconf | debconf-2.0
Description: S-Lang runtime files for jed and xjed
This package provides the S-Lang runtime files that are needed by both
jed and xjed.
Copied: trunk/packages/jed/debian/init.d/05jed-common.sl (from rev 58, trunk/packages/jed/debian/init.d/jed.conf)
===================================================================
--- trunk/packages/jed/debian/init.d/jed.conf 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/init.d/05jed-common.sl 2005-09-11 20:30:34 UTC (rev 59)
@@ -0,0 +1,90 @@
+% debian jed.conf -*- slang -*-
+
+% make delete key delete the character under the cursor
+% (section 10.8 of the Debian Policy)
+#ifdef XWINDOWS
+x_set_keysym (0xFFFF, 0, "\e[3~");
+#endif
+setkey ("delete_char_cmd", "\e[3~");
+
+% Fallback emulation if the user has no ~/.jedrc config file.
+%
+% Possible values are "brief", "cua", "emacs", "edt", "ide", "jed",
+% "wordstar", and (with jed-extra) "vi".
+%_Jed_Default_Emulation = "emacs";
+
+% taken form home-lib.sl (http://jedmodes.sf.net)
+% -----------------------------------------------
+%
+% * append \var{lib} to the library path,
+% * evaluate (if existent) the file ini.sl in this library
+% to enable initialization (autoloads etc).
+% * set Color_Scheme_, dfa-cache- and documentation- path
+public define register_libdir(lib)
+{
+ !if (2 == file_status(lib)) % directory doesnot exist
+ return;
+
+ % jed library path
+ set_jed_library_path(lib + "," + get_jed_library_path());
+
+ % colors
+ variable path = path_concat(lib, "colors");
+ if (2 == file_status(path))
+ Color_Scheme_Path = path + "," + Color_Scheme_Path;
+
+ % documentation
+ path = path_concat(lib, "libfuns.txt");
+ if (1 == file_status(path))
+ Jed_Doc_Files = path + "," + Jed_Doc_Files;
+
+ % dfa cache
+#ifdef HAS_DFA_SYNTAX
+ path = path_concat(lib, "dfa");
+ if (2 != file_status(path))
+ path = lib;
+ Jed_Highlight_Cache_Dir = path;
+ Jed_Highlight_Cache_Path += "," + path;
+#endif
+
+ % Check for a file ini.sl containing initialization code
+ % (e.g. autoload declarations) and evaluate it.
+ path = path_concat(lib, "ini.sl");
+ if (1 == file_status(path))
+ () = evalfile(path);
+}
+
+% Jed_Home_Directory is defined in site.sl, defaulting to $HOME
+% If Jed_Home_Directory/.jed/ exists, point Jed_Home_Directory there,
+$1 = path_concat(Jed_Home_Directory, ".jed");
+if ( 2 == file_status($1) ) {
+ % backwards compatibility of jedrc-location
+ % (if nonexistent, Jed_Home_Library+"/jed.rc" will be tried)
+ $2 = path_concat(Jed_Home_Directory, ".jedrc");
+ if ( 1 == file_status($2) )
+ Default_Jedrc_Startup_File = $2;
+
+ Jed_Home_Directory = $1;
+
+ % jed library path
+ set_jed_library_path(Jed_Home_Directory + "," + get_jed_library_path());
+
+ % colors
+ $1 = path_concat(Jed_Home_Directory, "colors");
+ if ( 2 == file_status($1) )
+ Color_Scheme_Path = $1 + "," + Color_Scheme_Path;
+
+ % documentation
+ $1 = path_concat(Jed_Home_Directory, "libfuns.txt");
+ if ( 1 == file_status($1) )
+ Jed_Doc_Files = $1 + "," + Jed_Doc_Files;
+
+ % dfa cache
+#ifdef HAS_DFA_SYNTAX
+ $1 = path_concat(Jed_Home_Directory, "dfa");
+ if ( 2 != file_status($1) )
+ $1 = Jed_Home_Directory;
+ Jed_Highlight_Cache_Dir = $1;
+ Jed_Highlight_Cache_Path += "," + $1;
+#endif
+}
Deleted: trunk/packages/jed/debian/init.d/jed.conf
===================================================================
--- trunk/packages/jed/debian/init.d/jed.conf 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/init.d/jed.conf 2005-09-11 20:30:34 UTC (rev 59)
@@ -1,34 +0,0 @@
-% debian jed.conf -*- slang -*-
-
-% Disable loading of fallback config file /usr/share/jed/lib/jed.rc,
-% as this overwrites user settings in their private config #219448
-Default_Jedrc_Startup_File = NULL;
-
-% make delete key delete the character under the cursor
-% (section 10.8 of the Debian Policy)
-#ifdef XWINDOWS
-x_set_keysym (0xFFFF, 0, "\e[3~");
-#endif
-setkey ("delete_char_cmd", "\e[3~");
-
-% Fallback emulation if the user has no ~/.jedrc config file.
-%
-% Possible values are "brief", "cua", "emacs", "edt", "ide", "jed",
-% "wordstar", and (with jed-extra) "vi".
-_Jed_Default_Emulation = "emacs";
-
-
-% jed init.d
-% ----------
-%
-% Do not change the lines below, if you want the Debian startup system to
-% function correctly (see /usr/share/doc/jed-common/README.Debian-startup).
-$1 = listdir ("/etc/jed-init.d");
-foreach ($1[array_sort($1)])
-{
- $1 = ();
- if (path_extname ($1) == ".sl")
- () = evalfile (path_concat ("/etc/jed-init.d", $1));
-}
-
-
Modified: trunk/packages/jed/debian/jed-common.copyright
===================================================================
--- trunk/packages/jed/debian/jed-common.copyright 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/jed-common.copyright 2005-09-11 20:30:34 UTC (rev 59)
@@ -3,9 +3,17 @@
It was downloaded from ftp://space.mit.edu/pub/davis/jed.
+ Addition information about JED is available from
+ <http://www.jedsoft.org/jed/> The documentation for the slang library
+ and interpreter is available from <http://www.s-lang.org> and
+ <http://www.jedsoft.org/slang/>. Useful newsgroups include
+ comp.editors and alt.lang.s-lang. A mailing list is also available.
+ See <http://www.jedsoft.org/jed/mailinglists.html> for more
+ information about it.
+
Copyright:
-Copyright (C) 1998 by John E. Davis <davis at space.mit.edu>
+Copyright (C) by John E. Davis <davis at space.mit.edu>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,7 +27,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems the full text of the GPL, version 2 can be found
in /usr/share/common-licenses/GPL-2
Modified: trunk/packages/jed/debian/jed-common.dirs
===================================================================
--- trunk/packages/jed/debian/jed-common.dirs 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/jed-common.dirs 2005-09-11 20:30:34 UTC (rev 59)
@@ -1,5 +1,5 @@
etc
-etc/jed-init.d
+etc/jed.d
usr/share/info
usr/share/jed/lib
usr/share/jed/compile
Modified: trunk/packages/jed/debian/jed.postinst
===================================================================
--- trunk/packages/jed/debian/jed.postinst 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/jed.postinst 2005-09-11 20:30:34 UTC (rev 59)
@@ -12,7 +12,7 @@
TEMP=$(tempfile)
RET=0
- printf "Running files in /usr/share/jed/compile/..."
+ printf "Updating precompiled files..."
run-parts --exit-on-error --arg=install /usr/share/jed/compile/ \
>$TEMP 2>&1 || RET=$?
if test "$RET" -ne 0 ; then
Modified: trunk/packages/jed/debian/jed.prerm
===================================================================
--- trunk/packages/jed/debian/jed.prerm 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/jed.prerm 2005-09-11 20:30:34 UTC (rev 59)
@@ -1,18 +1,5 @@
#!/bin/sh
-TEMP=$(tempfile)
-RET=0
-printf "Running files in /usr/share/jed/compile/..."
-run-parts --exit-on-error --arg=install /usr/share/jed/compile/ \
- >$TEMP 2>&1 || RET=$?
-if test "$RET" -ne 0 ; then
- echo "failed (see $TEMP)"
- exit $RET
-fi
-echo "done"
-rm $TEMP
-
-# attention the scripts above may need jed-script or jed
update-alternatives --remove editor /usr/bin/jed
update-alternatives --remove jed-script /usr/bin/jed
Modified: trunk/packages/jed/debian/patches/00list
===================================================================
--- trunk/packages/jed/debian/patches/00list 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/patches/00list 2005-09-11 20:30:34 UTC (rev 59)
@@ -1,7 +1,9 @@
40_freetype-include
+40_site.sl-startup
50_slangfun-txt.dpatch
50_jed-manpage
50_enable-xrenderfont
50_paste-mode-sl
50_pymode_indent
+50_README
60_gpm-mouse-support
Added: trunk/packages/jed/debian/patches/40_site.sl-startup.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/40_site.sl-startup.dpatch 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/patches/40_site.sl-startup.dpatch 2005-09-11 20:30:34 UTC (rev 59)
@@ -0,0 +1,80 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_site.sl-startup by Jörg Sommer <joerg at alea.gnuu.de>
+##
+## DP: makes the startup process work the Debian way
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./lib/site.sl /tmp/dpep-work.rAQ6Xy/jed-B0.99-17.111/lib/site.sl
+--- ./lib/site.sl 2005-07-25 06:37:23.000000000 +0200
++++ /tmp/dpep-work.rAQ6Xy/jed-B0.99-17.111/lib/site.sl 2005-09-11 18:31:35.870748960 +0200
+@@ -41,7 +41,7 @@
+
+ public variable _Jed_Emulation = NULL;
+ public variable _Jed_Default_Emulation = "emacs";
+-public variable Default_Jedrc_Startup_File = "jed.rc";
++public variable Default_Jedrc_Startup_File = NULL;
+ public variable _Jed_Color_Scheme = NULL;
+ public variable _Jed_Default_Color_Scheme = "black3";
+
+@@ -3178,27 +3178,40 @@
+ % This code fragment looks for the existence of "defaults.sl" and loads
+ % it. This file IS NOT distributed with JED.
+ %
+-if (strlen(expand_jedlib_file("defaults.sl")))
+- () = evalfile("defaults");
+-#ifdef UNIX
+-else
+- {
+- % Map /install/prefix/bin/jed to /install/prefix/etc/
+- $1 = getenv ("JED_CONF_DIR");
+- if ($1 == NULL)
+- {
+- $1 = path_concat (path_dirname (path_dirname (__argv[0])), "etc");
+- if (($1 == "/usr/etc") and (0 == file_status ($1)))
+- $1 = "/etc";
+- }
+- $1 = path_concat ($1, "jed.conf");
+- if (1 == file_status ($1))
+- {
+- () = evalfile ($1);
+- break;
+- }
+- }
+-#endif
++
++%% The following part was disabled by the Debian package to make the startup
++%% follow the Debian way
++
++% if (strlen(expand_jedlib_file("defaults.sl")))
++% () = evalfile("defaults");
++% #ifdef UNIX
++% else
++% {
++% % Map /install/prefix/bin/jed to /install/prefix/etc/
++% $1 = getenv ("JED_CONF_DIR");
++% if ($1 == NULL)
++% {
++% $1 = path_concat (path_dirname (path_dirname (__argv[0])), "etc");
++% if (($1 == "/usr/etc") and (0 == file_status ($1)))
++% $1 = "/etc";
++% }
++% $1 = path_concat ($1, "jed.conf");
++% if (1 == file_status ($1))
++% {
++% () = evalfile ($1);
++% break;
++% }
++% }
++% #endif
++
++if (BATCH != 2) { % do not evaluate if jed is started as jed-script
++ $1 = listdir("/etc/jed.d/");
++ foreach ( $1[ array_sort($1) ] ) {
++ $1 = ();
++ if ($1[[-3:-1]] == ".sl")
++ () = evalfile("/etc/jed.d/"+$1);
++ }
++}
+
+ %require ("profile");
+ %_boseos_info = 0;
Property changes on: trunk/packages/jed/debian/patches/40_site.sl-startup.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/jed/debian/patches/50_README.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_README.dpatch 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/patches/50_README.dpatch 2005-09-11 20:30:34 UTC (rev 59)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_README.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
+##
+## DP: fix the manual path in README
+
+ at DPATCH@
+
+--- jed-0.99.16.pre.0.99.17.84.orig/doc/README
++++ jed-0.99.16.pre.0.99.17.84/doc/README
+@@ -15,7 +15,7 @@
+ functions. In addition, it contains Guido Gonzato's quick
+ reference guide for jed.
+
+- manual/
++ html/
+
+ Eventually the jed manual will be put here. Right now what is
+ in there is old and is most likely out of date.
+
Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/rules 2005-09-11 20:30:34 UTC (rev 59)
@@ -50,8 +50,6 @@
cd $(temp)/usr/share/jed/doc/manual/; \
rm jed.hevea jed.haux jed.htoc jed.tex
- # rename README, because we install later a second README
- mv $(temp)/usr/share/jed/doc/README $(temp)/usr/share/jed/doc/README.doc
# we install manual as html in doc/jed-common
mv $(temp)/usr/share/jed/doc/manual $(temp)/usr/share/jed/doc/html
# info files should be in /usr/share/info
@@ -80,9 +78,8 @@
# fill up /usr/share/doc/jed-common
dh_installchangelogs -pjed-common changes.txt
- dh_installdocs -pjed-common $(temp)/usr/share/jed/doc/txt \
- $(temp)/usr/share/jed/doc/README.doc $(temp)/usr/share/jed/doc/html \
- README debian/init.d/README.Debian-startup
+ dh_installdocs -pjed-common $(temp)/usr/share/jed/doc/* \
+ debian/init.d/README.Debian-startup
dh_link -pjed-common usr/share/doc/jed-common usr/share/jed/doc
# install some extra docs from the source
@@ -100,17 +97,17 @@
dh_install -pjed-common debian/compile usr/share/jed/compile
mv $(jed-common)/usr/share/jed/compile/compile \
$(jed-common)/usr/share/jed/compile/jed-common
+ chmod +x $(jed-common)/usr/share/jed/compile/jed-common
# fill up /etc
- dh_install -pjed-common debian/init.d/*.sl etc/jed-init.d/
- dh_install -pjed-common debian/init.d/jed.conf etc/
+ dh_install -pjed-common debian/init.d/*.sl etc/jed.d/
dh_installdebconf -i
@echo
@echo --- INSTALL-ARCH-INDEP ---
@echo
- dh_compress -i --exclude=libfuns --exclude=jedfuns --exclude=slangfun
+ dh_compress -i --exclude=usr/share/doc/jed-common/txt/
dh_fixperms -i
dh_installdeb -i
@@ -130,7 +127,6 @@
@echo
dh_install -pjed --autodest \
$(temp)/usr/bin/jed $(temp)/usr/share/man/man1/jed.1
-# $(temp)/usr/bin/jed-script $(temp)/usr/share/man/man1/jed-script.1
# $(temp)/usr/bin/jgrep $(temp)/usr/share/man/man1/jgrep.1
dh_link -pjed usr/share/doc/jed-common usr/share/doc/jed
Modified: trunk/packages/jed/debian/xjed.postinst
===================================================================
--- trunk/packages/jed/debian/xjed.postinst 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/xjed.postinst 2005-09-11 20:30:34 UTC (rev 59)
@@ -3,12 +3,16 @@
case "$1" in
configure)
update-alternatives \
+ --install /usr/bin/editor editor /usr/bin/xjed 35 \
+ --slave /usr/share/man/man1/editor.1.gz editor.1.gz /usr/share/man/man1/xjed.1.gz;
+
+ update-alternatives \
--install /usr/bin/jed-script jed-script /usr/bin/xjed 40 \
--slave /usr/share/man/man1/jed-script.1.gz jed-script.1.gz /usr/share/man/man1/xjed.1.gz;
TEMP=$(tempfile)
RET=0
- printf "Running files in /usr/share/jed/compile/..."
+ printf "Updating precompiled files..."
run-parts --exit-on-error --arg=install /usr/share/jed/compile/ \
>$TEMP 2>&1 || RET=$?
if test "$RET" -ne 0 ; then
Modified: trunk/packages/jed/debian/xjed.prerm
===================================================================
--- trunk/packages/jed/debian/xjed.prerm 2005-07-06 06:50:40 UTC (rev 58)
+++ trunk/packages/jed/debian/xjed.prerm 2005-09-11 20:30:34 UTC (rev 59)
@@ -1,17 +1,6 @@
#!/bin/sh
update-alternatives --remove jed-script /usr/bin/xjed
+update-alternatives --remove editor /usr/bin/xjed
-TEMP=$(tempfile)
-RET=0
-printf "Running files in /usr/share/jed/compile/..."
-run-parts --exit-on-error --arg=install /usr/share/jed/compile/ \
- >$TEMP 2>&1 || RET=$?
-if test "$RET" -ne 0 ; then
- echo "failed (see $TEMP)"
- exit $RET
-fi
-echo "done"
-rm $TEMP
-
#DEBHELPER#
More information about the Pkg-jed-commit
mailing list