[Pkg-jed-commit] r109 - in trunk/packages/jed/debian: . patches
Rafael Laboissiere
rafael at costa.debian.org
Fri Oct 28 17:16:35 UTC 2005
Author: rafael
Date: 2005-10-28 17:16:34 +0000 (Fri, 28 Oct 2005)
New Revision: 109
Removed:
trunk/packages/jed/debian/patches/40_site.sl-startup.dpatch
trunk/packages/jed/debian/patches/50_all.dpatch
Modified:
trunk/packages/jed/debian/changelog
trunk/packages/jed/debian/patches/00list
trunk/packages/jed/debian/patches/50_abbrev_fix.dpatch
trunk/packages/jed/debian/patches/50_enable-xrenderfont.dpatch
trunk/packages/jed/debian/patches/50_jed-manpage.dpatch
trunk/packages/jed/debian/patches/50_pymode_indent.dpatch
trunk/packages/jed/debian/rules
Log:
Make the package build for JED 0.99-17.135:
* patches/00list, patches/40_site.sl-startup.dpatch,
patches/50_all_fix.dpatch: Removed obsolete patches
* patches/50_abbrev.dpatch, patches/50_jed-manpage.dpatch,
patches/50_pymode_indent.dpatch: Fixed paths for files in diff
output. This was preventing the patches to be applied.
* patches/50_enable-xrenderfont.dpatch: Removed section patching the
file src/jed-feat.h
* rules: Install file defaults.sl into /usr/share/jed/lib/
Modified: trunk/packages/jed/debian/changelog
===================================================================
--- trunk/packages/jed/debian/changelog 2005-10-28 15:24:17 UTC (rev 108)
+++ trunk/packages/jed/debian/changelog 2005-10-28 17:16:34 UTC (rev 109)
@@ -1,31 +1,32 @@
-jed (0.99.17.111-2) experimental; urgency=low
+jed (0.99.17.135-1) experimental; urgency=low
NOT YET RELEASED !
+++ Changes by Rafael Laboissiere
- * debian/rules: Prevent compression of *.txt files in pacakge
+ * New upstream release
+ * debian/rules: Prevent compression of *.txt files in package
jed-common.
+++ Changes by Guenter Milde
* jed.d/05jed-common.sl: Support ~/.jed/jed.rc config file in accordance
- with FHS 2.3
-
+ with FHS 2.3
+
User specific configuration files for applications are stored in the
user's home directory in a file that starts with the '.' character (a
"dot file"). If an application needs to create more than one dot file
then they should be placed in a subdirectory with a name starting with
a '.' character, (a "dot directory"). In this case the configuration
files should not start with the '.' character.
-
+
ATTENTION: This change means that if a user has a ~/.jed/ directory, JED
will no longer search for ~/.jedrc at startup. Instead it expects the
config file in ~/.jed/ (which will become the `Jed_Home_Directory').
-
+
If a user creates a "~/.jed/" directory, he|she must move ~/.jedrc to
~/.jed/jed.rc (~/.jed/.jedrc is still found but deprecated).
-
+
--
jed (0.99.17.111-1) experimental; urgency=low
Modified: trunk/packages/jed/debian/patches/00list
===================================================================
--- trunk/packages/jed/debian/patches/00list 2005-10-28 15:24:17 UTC (rev 108)
+++ trunk/packages/jed/debian/patches/00list 2005-10-28 17:16:34 UTC (rev 109)
@@ -1,8 +1,6 @@
40_freetype-include.dpatch
-40_site.sl-startup.dpatch
50_README.dpatch
50_abbrev_fix.dpatch
-50_all.dpatch
50_enable-xrenderfont.dpatch
50_jed-manpage.dpatch
50_popups.sl.dpatch
Deleted: trunk/packages/jed/debian/patches/40_site.sl-startup.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/40_site.sl-startup.dpatch 2005-10-28 15:24:17 UTC (rev 108)
+++ trunk/packages/jed/debian/patches/40_site.sl-startup.dpatch 2005-10-28 17:16:34 UTC (rev 109)
@@ -1,80 +0,0 @@
-#! /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;
Modified: trunk/packages/jed/debian/patches/50_abbrev_fix.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_abbrev_fix.dpatch 2005-10-28 15:24:17 UTC (rev 108)
+++ trunk/packages/jed/debian/patches/50_abbrev_fix.dpatch 2005-10-28 17:16:34 UTC (rev 109)
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./src/abbrev.c /tmp/dpep-work.pdCHmu/jed-B0.99-17.111/src/abbrev.c
---- ./src/abbrev.c 2005-07-25 06:37:23.000000000 +0200
-+++ /tmp/dpep-work.pdCHmu/jed-B0.99-17.111/src/abbrev.c 2005-09-11 23:52:44.622453448 +0200
+--- jed-B0.99-17.111.orig/src/abbrev.c 2005-07-25 06:37:23.000000000 +0200
++++ jed-B0.99-17.111/src/abbrev.c 2005-09-11 23:52:44.622453448 +0200
@@ -375,7 +375,7 @@
if (tbl == NULL)
Deleted: trunk/packages/jed/debian/patches/50_all.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_all.dpatch 2005-10-28 15:24:17 UTC (rev 108)
+++ trunk/packages/jed/debian/patches/50_all.dpatch 2005-10-28 17:16:34 UTC (rev 109)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_src-Makefile-include-freetype.dpatch by by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Add include path for FreeType in CFLAGS
-
- at DPATCH@
-
---- jed-0.99.16.pre.0.99.17.84.orig/src/Makefile.in
-+++ jed-0.99.16.pre.0.99.17.84/src/Makefile.in
-@@ -2,7 +2,7 @@
-
- # C compiler and C flags
- CC = @CC@
--CFLAGS = @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@
-+CFLAGS = @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ -I/usr/include/freetype2
- LDFLAGS = @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
-
- #---------------------------------------------------------------------------
Modified: trunk/packages/jed/debian/patches/50_enable-xrenderfont.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_enable-xrenderfont.dpatch 2005-10-28 15:24:17 UTC (rev 108)
+++ trunk/packages/jed/debian/patches/50_enable-xrenderfont.dpatch 2005-10-28 17:16:34 UTC (rev 109)
@@ -5,17 +5,6 @@
@DPATCH@
---- jed-0.99.16.pre.0.99.17.84.orig/src/jed-feat.h
-+++ jed-0.99.16.pre.0.99.17.84/src/jed-feat.h
-@@ -88,7 +88,7 @@
- * extension. You also need to uncomment and possibly modify
- * XRENDERFONTLIBS in src/Makefile
- */
--#define XJED_HAS_XRENDERFONT 0
-+#define XJED_HAS_XRENDERFONT 1
-
- /* Set JED_HAS_IMPORT if you want the ability to import modules into jed via
- * the slang import statement. This assumes that slang was compiled with
--- jed-0.99.16.pre.0.99.17.84.orig/src/Makefile.in
+++ jed-0.99.16.pre.0.99.17.84/src/Makefile.in
@@ -59,7 +59,7 @@
Modified: trunk/packages/jed/debian/patches/50_jed-manpage.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_jed-manpage.dpatch 2005-10-28 15:24:17 UTC (rev 108)
+++ trunk/packages/jed/debian/patches/50_jed-manpage.dpatch 2005-10-28 17:16:34 UTC (rev 109)
@@ -7,8 +7,8 @@
@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
+--- 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.
Modified: trunk/packages/jed/debian/patches/50_pymode_indent.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_pymode_indent.dpatch 2005-10-28 15:24:17 UTC (rev 108)
+++ trunk/packages/jed/debian/patches/50_pymode_indent.dpatch 2005-10-28 17:16:34 UTC (rev 109)
@@ -9,8 +9,8 @@
@DPATCH@
diff -urNad jed-B0.99-17.56/lib/pymode.sl /tmp/dpep.1VBPmj/jed-B0.99-17.56/lib/pymode.sl
---- jed-B0.99-17.56/lib/pymode.sl 2004-11-28 22:44:05.000000000 +0100
-+++ /tmp/dpep.1VBPmj/jed-B0.99-17.56/lib/pymode.sl 2005-04-22 22:18:21.436779048 +0200
+--- jed-B0.99-17.56.orig/lib/pymode.sl 2004-11-28 22:44:05.000000000 +0100
++++ jed-B0.99-17.56/lib/pymode.sl 2005-04-22 22:18:21.436779048 +0200
@@ -580,7 +580,13 @@
{
variable python = "python";
Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules 2005-10-28 15:24:17 UTC (rev 108)
+++ trunk/packages/jed/debian/rules 2005-10-28 17:16:34 UTC (rev 109)
@@ -74,6 +74,7 @@
@echo
# install *.sl files
dh_install -pjed-common -Xjed.rc --autodest $(temp)/usr/share/jed/lib/
+ dh_install -pjed-common debian/defaults.sl usr/share/jed/lib/
# fill up /usr/share/doc/jed-common
dh_installchangelogs -pjed-common changes.txt
More information about the Pkg-jed-commit
mailing list