[Pkg-jed-commit] r32 - in trunk/packages/jed/debian: . patches
Rafael Laboissiere
rafael@costa.debian.org
Sat, 23 Apr 2005 15:14:14 +0000
Author: rafael
Date: 2005-04-23 15:14:13 +0000 (Sat, 23 Apr 2005)
New Revision: 32
Removed:
trunk/packages/jed/debian/jed-sl.dirs
trunk/packages/jed/debian/jed-sl.links
trunk/packages/jed/debian/jed-sl.preinst
trunk/packages/jed/debian/patches/50_jed-conf-build-fix.dpatch
Modified:
trunk/packages/jed/debian/changelog
trunk/packages/jed/debian/control
trunk/packages/jed/debian/jed-common.postinst
trunk/packages/jed/debian/jed-common.prerm
trunk/packages/jed/debian/patches/00list
trunk/packages/jed/debian/rules
Log:
Changes for generating the .slc and .dfa files at install time. The
previous change regarding the 50_jed-conf-build-fix patch is reverted.
Modified: trunk/packages/jed/debian/changelog
===================================================================
--- trunk/packages/jed/debian/changelog 2005-04-22 21:22:26 UTC (rev 31)
+++ trunk/packages/jed/debian/changelog 2005-04-23 15:14:13 UTC (rev 32)
@@ -1,3 +1,25 @@
+jed (0.99.16.pre.0.99.17.95-1) experimental; urgency=low
+
+ NOT YET RELEASED!
+
+ +++ 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.
+ * 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/jed-common.postinst: Included jed batch command for generation of
+ the *.slc and *.dfa files
+ * debian/jed-common.prerm: Delete *.slc and *.dfa files in
+ /usr/share/jed/lib before removal of the package
+ * debian/jed-sl.*: Removed files
+
+ --
+
jed (0.99.16.pre.0.99.17.84-1) experimental; urgency=low
+++ Changes by Rafael Laboissiere
Modified: trunk/packages/jed/debian/control
===================================================================
--- trunk/packages/jed/debian/control 2005-04-22 21:22:26 UTC (rev 31)
+++ trunk/packages/jed/debian/control 2005-04-23 15:14:13 UTC (rev 32)
@@ -48,17 +48,10 @@
Package: jed-common
Architecture: all
Depends: slang1 (>= 1.3.11)
-Replaces: jedslc, jedsl, jedsl-src, jed (<< 0.99.10-2)
-Conflicts: jedslc, jedsl, jedsl-src, jed (<< 0.99.10-2)
+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
Description: byte compiled S-Lang runtime files for jed and xjed
This package provides the compiled S-Lang runtime files that
are needed by both jed and xjed.
-Package: jed-sl
-Architecture: all
-Depends: jed (>= ${Source-Version}) | xjed (>= ${Source-Version}), jed-common (>= ${Source-Version})
-Description: sources of S-Lang runtime files for jed and xjed
- This package provides the source of S-Lang runtime files that
- are needed by both jed and xjed.
-
Modified: trunk/packages/jed/debian/jed-common.postinst
===================================================================
--- trunk/packages/jed/debian/jed-common.postinst 2005-04-22 21:22:26 UTC (rev 31)
+++ trunk/packages/jed/debian/jed-common.postinst 2005-04-23 15:14:13 UTC (rev 32)
@@ -2,7 +2,13 @@
case "$1" in
configure)
+
install-info --quiet --section Editors Editors --description='Programmers editor.' /usr/share/info/jed.info.gz;
+
+ echo -n "Compiling .slc and .dfa files... "
+ /usr/bin/jed -batch -n -l preparse.sl > /dev/null
+ echo done.
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/packages/jed/debian/jed-common.prerm
===================================================================
--- trunk/packages/jed/debian/jed-common.prerm 2005-04-22 21:22:26 UTC (rev 31)
+++ trunk/packages/jed/debian/jed-common.prerm 2005-04-23 15:14:13 UTC (rev 32)
@@ -4,5 +4,6 @@
# (this used to be the case, I haven't check with woody dh yet)
install-info --quiet --remove /usr/share/info/jed.info.gz;
+find /usr/share/jed/lib/ -name \*.slc -o -name \*.dfa | xargs rm -f
#DEBHELPER#
Deleted: trunk/packages/jed/debian/jed-sl.dirs
===================================================================
--- trunk/packages/jed/debian/jed-sl.dirs 2005-04-22 21:22:26 UTC (rev 31)
+++ trunk/packages/jed/debian/jed-sl.dirs 2005-04-23 15:14:13 UTC (rev 32)
@@ -1 +0,0 @@
-usr/share/jed/lib
Deleted: trunk/packages/jed/debian/jed-sl.links
===================================================================
--- trunk/packages/jed/debian/jed-sl.links 2005-04-22 21:22:26 UTC (rev 31)
+++ trunk/packages/jed/debian/jed-sl.links 2005-04-23 15:14:13 UTC (rev 32)
@@ -1 +0,0 @@
-usr/share/doc/jed-common usr/share/doc/jed-sl
Deleted: trunk/packages/jed/debian/jed-sl.preinst
===================================================================
--- trunk/packages/jed/debian/jed-sl.preinst 2005-04-22 21:22:26 UTC (rev 31)
+++ trunk/packages/jed/debian/jed-sl.preinst 2005-04-23 15:14:13 UTC (rev 32)
@@ -1,35 +0,0 @@
-#! /bin/sh
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-
-case "$1" in
- install|upgrade)
- # I want symlinks to jed-common
- test -d /usr/share/doc/jed-sl && rm -rf /usr/share/doc/jed-sl
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Modified: trunk/packages/jed/debian/patches/00list
===================================================================
--- trunk/packages/jed/debian/patches/00list 2005-04-22 21:22:26 UTC (rev 31)
+++ trunk/packages/jed/debian/patches/00list 2005-04-23 15:14:13 UTC (rev 32)
@@ -1,6 +1,5 @@
40_freetype-include
50_slangfun-txt.dpatch
-50_jed-conf-build-fix
50_jed-manpage-option-g
50_enable-xrenderfont
50_emacs-bindings
Deleted: trunk/packages/jed/debian/patches/50_jed-conf-build-fix.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_jed-conf-build-fix.dpatch 2005-04-22 21:22:26 UTC (rev 31)
+++ trunk/packages/jed/debian/patches/50_jed-conf-build-fix.dpatch 2005-04-23 15:14:13 UTC (rev 32)
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_jed_conf_build_fix.dpatch by <joerg@alea.gnuu.de>
-##
-## DP: When building jed, it byte compiles the .sl-file. For this it run the
-## DP: new build jed, which loads /etc/jed.conf, which loads jed-extra, which
-## DP: fails, because it is build with a different jed version.
-
-@DPATCH@
-diff -urNad jed-B0.99-17.56/lib/site.sl /tmp/dpep.CK4Cus/jed-B0.99-17.56/lib/site.sl
---- jed-B0.99-17.56/lib/site.sl 2004-11-28 22:44:05.000000000 +0100
-+++ /tmp/dpep.CK4Cus/jed-B0.99-17.56/lib/site.sl 2005-04-15 13:17:57.330336624 +0200
-@@ -3163,14 +3163,15 @@
- if (strlen(expand_jedlib_file("defaults.sl")))
- () = evalfile("defaults");
- #ifdef UNIX
--else foreach (["/etc/jed.conf", "/usr/local/etc/jed.conf", "/usr/etc/jed.conf"])
--{
-- $1 = ();
-- if (1 == file_status ($1))
-- {
-- () = evalfile ($1);
-- break;
-- }
--}
-+else if (getenv("NO_JED_CONF") == NULL)
-+ foreach (["/etc/jed.conf", "/usr/local/etc/jed.conf", "/usr/etc/jed.conf"])
-+ {
-+ $1 = ();
-+ if (1 == file_status ($1))
-+ {
-+ () = evalfile ($1);
-+ break;
-+ }
-+ }
- #endif
-
Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules 2005-04-22 21:22:26 UTC (rev 31)
+++ trunk/packages/jed/debian/rules 2005-04-23 15:14:13 UTC (rev 32)
@@ -6,7 +6,6 @@
jed=`pwd`/debian/jed
xjed=`pwd`/debian/xjed
-jed-sl=`pwd`/debian/jed-sl
jed-common=`pwd`/debian/jed-common
@@ -65,6 +64,7 @@
@echo
@echo --- JED-COMMON ---
@echo
+ cp -r lib $(jed-common)/usr/share/jed/
# install docs
cp -r doc/* $(jed-common)/usr/share/doc/jed-common
mv $(jed-common)/usr/share/doc/jed-common/README \
@@ -93,27 +93,6 @@
# $(jed-common)/usr/share/man/man8
@echo
- @echo --- JED-SL ---
- @echo
- # compile .sl; move compileable .sl to jed-sl.deb
- JED_ROOT=`pwd` NO_JED_CONF=1 ./src/$(ARCH)objs/jed -batch -n -l preparse.sl
- cp -r lib $(jed-common)/usr/share/jed/
- for i in $(jed-common)/usr/share/jed/lib/*.slc; do \
- sl=`basename $$i .slc`.sl; \
- if [ -r "$(jed-common)/usr/share/jed/lib/$$sl" ]; then \
- mv $(jed-common)/usr/share/jed/lib/$$sl \
- $(jed-sl)/usr/share/jed/lib/; \
- fi \
- done
-
- # move linux.sl to the jed-sl package, it has no reason to be in
- # jed-common, even if it doesn't get compiled.
- mv $(jed-common)/usr/share/jed/lib/linux.sl $(jed-sl)/usr/share/jed/lib/;
- # compile.sl doesn't get byte-compiled, but should go to jed-sl
- # in anycase
- mv $(jed-sl)/usr/share/jed/lib/compile.sl $(jed-common)/usr/share/jed/lib
-
- @echo
@echo --- INSTALL-ARCH-INDEP ---
@echo
dh_link -i