[Pkg-jed-commit] [SCM] Debian packaging of JED branch, 0.99.19, updated. 1%3A0.99.18+dfsg.1-10-182-gdba9171
Jörg Sommer
joerg at alea.gnuu.de
Sat May 24 12:47:54 UTC 2008
The following commit has been merged in the 0.99.19 branch:
commit 5edd4c8657ac8415fc87e2f8a63c860d3f6ef364
Merge: 1e4ab7b707868e257e374ed8f8c2632a4c245a2e 72c0c6442297be0f1f3880537df886bab810c46e
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date: Sat May 24 13:06:28 2008 +0200
Merge commit '1:0.99.18+dfsg.1-10' into 0.99.19
diff --combined debian/NEWS
index bc1a632,a2888a0..7eee798
--- a/debian/NEWS
+++ b/debian/NEWS
@@@ -1,12 -1,3 +1,12 @@@
+jed-common (1:0.99.19~pre89-1) experimental; urgency=medium
+
+ The require function was dropped from site.sl and replaced by the require
+ function in the package slsh. This function has a different argument list.
+ The second (optional) argument accepted by the old jed version is the
+ namespace for the file not the file name.
+
+ -- Jörg Sommer <joerg at alea.gnuu.de> Sat, 9 Jun 2007 23:34:41 +0200
+
jed-common (0.99.18+dfsg.1-1) unstable; urgency=low
The handling of "~" in path names changed between version 0.99.16 of
@@@ -38,127 -29,12 +38,12 @@@ jed-common (0.99.18-8) unstable; urgenc
The directory /etc/jed-init.d/ is no longer needed and should be removed
after transferring eventual customizations to /etc/jed.d/.
- -- Rafael Laboissiere <rafael at debian.org> Fri, 12 Jan 2007 14:11:18 +0100
+ -- Rafael Laboissiere <rafael at debian.org> Sat, 28 Jul 2007 00:35:50 +0200
jed-common (0.99.18-7) unstable; urgency=low
- =========================================
- Recent changes to the Debian jed packages
- =========================================
+ Important changes in the start-up scheme have been introduced in this
+ version. Users upgrading from sarge should read the file
+ /usr/share/doc/jed-common/README.Debian-sarge-upgrade
- This is a listing of most important changes to the Debian Jed packages
- intended for people upgrading from Sarge (0.99.16-5).
-
- See "changelog.Debian.gz" for a detailled list of Debian specific changes
- and "changelog.gz" for the upstream changes.
-
- Packages and contents
- ---------------------
-
- * The jed-sl package is dropped. jed-common contains the SLang source of the
- runtime files. During the installation of jed or xjed the *.sl
- files will be converted to *.slc files (preparsed).
-
- * new executable jed-script (similar to jed -batch but sets the BATCH
- variable to 2 and doesnot run the config
- scripts in /etc/jed.d/)
-
- * removed executable jgrep (did not compile cleanly)
-
- S-Lang Version 2
- ----------------
-
- * Jed now uses S-Lang Version 2. There are incompatibilities that
- break some home-made or downloaded extensions made for Slang-1.
- This affects also several scripts in the jed-extra (1.0) package!
-
- New features and upgrade information for version 2 are described in
- appendix A. "S-Lang 2 Interpreter NEWS" of
- /usr/share/doc/libslang2/slang.txt.
-
- UTF 8 support
- -------------
-
- * Unicode via the UTF-8 encoding is available for jed versions 0.99-17
- and greater that use slang2.
-
- This feature is new and still in beta stage. Not all library
- functions are tested with UTF-8 so expect some "teething problems".
-
- * Enabling UTF-8 support: If the locale indicates that the character set is
- UTF-8, then UTF-8 mode will be enabled.
-
- Examples:
-
- Start xjed in UTF-8 mode: LANG=de_DE.UTF-8; xjed
- Start jed in non-UTF-8 mode: LANG=de_DE; jed
-
- ~/.bashrc alias: alias ujed="LANG=de_DE.UTF-8; xjed"
-
- There is no provision for enabling or disabling UTF-8 support during
- runtime.
-
- More details under the menu topic
-
- Help>Browse_Docs utf8
-
- Jed_Home_Directory
- ------------------
-
- * If the directory "~/.jed/" exists, it will become the `Jed_Home_Directory'
- and Jed will no longer search for "~/.jedrc" at startup.
-
- The user needs to move an eventually existing "~/.jedrc" to
- "~/.jed/jed.rc" ("~/.jed/.jedrc" is still found but deprecated).
-
- * However, Jed will not create such a directory. Users are encouraged to
- create the directory ".jed/" in their home directory and move an
- eventually existing ~/.jedrc to ~/.jed/jed.rc (and ~/.jedrecent to
- ~.jed/.jedrecent).
-
- Motivation
- ''''''''''
-
- Debian Jed now supports a per-user "~/.jed/" application directory in
- accordance with the file hierarchy standard (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.
-
- Debian Jed startup scheme
- -------------------------
-
- * The Jed config directory is renamed from "/etc/jed-init.d/" to
- "/etc/jed.d".
-
- If there are files in "/etc/jed-init.d/" that are unknown to jed-common,
- the old directory will remain in place (but not used). The sysadmin should
- check, manually delete remaining files or move them to "/etc/jed.d" and
- delete "/etc/jed-init.d/".
-
- An example are the files 05home-lib.sl and 55ispell.sl installed by the
- jed-extra (1.0) package. These will no longer be evaluated at startup
- after the upgrade to jed (0.99.18). (The upcoming jed-extra (2.1) will
- replace them with the new initialization file /etc/jed.d/50jed-extra.sl.)
-
- * The file "/etc/jed.conf" has been removed.
-
- "/usr/share/jed/lib/defaults.sl" contains the code to evaluate the files
- in "/etc/jed.d".
-
- "/etc/jed.d/05jed-common.sl" contains the site-wide configuration for
- jed|xjed.
-
- * Evalutation of "/etc/jed.d/" can be suppressed by the
- --skip-debian-startup command line option.
-
- * "/etc/jed.d/" is not evaluated if Jed is started as `jed-script`.
-
- If a script depends on the Debian configuration, it can use the function
- debian_startup() (defined in defaults.sl) or be called with jed -batch.
-
- For details see README.Debian-startup.
+ -- Rafael Laboissiere <rafael at debian.org> Thu, 21 Jun 2007 12:15:36 +0200
diff --combined debian/changelog
index 019a83f,56cab98..a2f1b12
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,171 -1,24 +1,194 @@@
+jed (1:0.99.19~pre138-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ + 131. src/gpmmouse.c: Do not use GPM if running in xterm or rxvt
+ (Joerg Sommer). (closes: #473617)
+
++ * Merged the changes from the unstable release branch.
++
+ -- Jörg Sommer <joerg at alea.gnuu.de> Thu, 01 Jan 1970 00:00:00 +0000
+
+jed (1:0.99.19~pre117-1) experimental; urgency=low
+
+ * New upstream release, taken from the upstream SVN repository at
+ gna.org
+
+ * debian/patches/empty_rectangle.dpatch .../fix-warnings.dpatch
+ .../fix-read_mini.dpatch .../update-copyright.dpatch
+ + Removed these patches. They are now applied upstream.
+
+ * copyright:
+ + Put the address of the SVN repository there to make it more obvious
+ where the code comes from.
+
+ * debian/patches/fix-jed-doc-file.dpatch
+ + New patch applied to make changes of Jed_Doc_Files made with
+ jed_(append|insert)_doc_file go to set_doc_files.
+
+ -- Jörg Sommer <joerg at alea.gnuu.de> Sun, 7 Oct 2007 20:17:19 +0200
+
+jed (1:0.99.19~pre95-2) experimental; urgency=low
+
+ * debian/patches/fix-update-before-key-hook.dpatch: The LASTKEY
+ variable is not updated before the _jed_before_key_hook hooks are
+ called.
+
+ * /etc/jed.d/05jed-common.sl: Activated the keys Home and End by default.
+
+ * debian/patches/fix-help.sl.dpatch: A new patch to fix problems in
+ help.sl:
+ + describe_bindings() doesn't take care of CASE_SEARCH with leads to the
+ problem that "ESC [ A" and "ESC [ a" is replace by the same key
+ + describe_bindings() gets confused by newlines in the key definiton,
+ like in setkey(" \n", Key_KP_Enter)
+ + describe_bindings(): A key definition that starts with @, SPACE or . must
+ must be treated specialy
+
+ * debian/patches/extend-help.sl.dpatch: A new patch to improve help.sl
+ + Improves expand_keystring() to return Alt- instead of ESC, if ALT_CHAR
+ is non-zero, and print Space instead of the space character
+ + Improves describe_bindings() to convert the key sequences with
+ expand_keystring().
+
+ -- Jörg Sommer <joerg at alea.gnuu.de> Mon, 2 Jul 2007 12:35:05 +0200
+
+jed (1:0.99.19~pre95-1) experimental; urgency=medium
+
+ * New upstream release, taken from the upstream SVN repository at
+ gna.org
+
+ * debian/patches/remove_jed_library_path.dpatch: In version 0.99.19-82 the
+ require function was removed from jed and superseded by the version in
+ slsh. This new function has a new argument structure and doesn't care
+ about the jed_library_path anymore. Due to this, all jed_library stuff was
+ removed and two transition functions get_jed_library_path and
+ set_jed_library_path where added to site.sl until all third party scripts
+ moved to [gs]et_slang_load_path. (closes: #428308)
+
+ * debian/control:
+ + Added slsh to the Depends field of jed-common, because since 0.99.19-82
+ jed uses the require from slsh.
+
+ + jed-extra breaks with the new require function from slsh and makes jed
+ unusable. Added a conflict for the current version.
+
+ * debian/patches/empty_rectangle.dpatch: Added a new patch that makes
+ string_rectangle (^X R T) does not fail with an empty rectangle and
+ insert only the text.
+
+ * debian/patches/update-copyright.dpatch: Added a patch to update the
+ copyright messages.
+
+ * debian/patches/fix-documentation.dpatch: A new patch to improve the
+ documentation.
+
+ -- Jörg Sommer <joerg at alea.gnuu.de> Sun, 10 Jun 2007 20:58:14 +0200
+
+jed (1:0.99.19~pre89-1) experimental; urgency=low
+
+ * New upstream release, taken from the upstream SVN repository at
+ gna.org
+
+ * debian/patches/50_jed.tex.dpatch: Removed. It's includes upstream.
+
+ * debian/patches/manpage.dpatch: Described the operation modes of jed
+ in the manpage.
+
+ * debian/patches/slang2.dpatch: Replaced and removed old SLang code
+ that is deprecated since SLang2.
+
+ * debian/patches/fix-warnings.dpatch: Fixed some warnings that show up
+ when building with additional compiling checks.
+
+ * debian/control: Added Jörg Sommer to the list of uploaders.
+
+ -- Jörg Sommer <joerg at alea.gnuu.de> Tue, 29 May 2007 13:54:52 +0200
+
+jed (1:0.99.19~pre78-1) experimental; urgency=low
+
+ * Use an epoch in the package version number, since the unstable branch
+ has also an epoch now. Also start using "~pre" instead of ".+pre" in
+ the version number, which is more appropriate.
+ * debian/rules: Adjust the get-orig-source rule to the above
+
+ -- Rafael Laboissiere <rafael at debian.org> Tue, 22 May 2007 22:51:27 +0200
+
+jed (0.99.19.+pre78-2) experimental; urgency=low
+
+ * Uploading to experimental. The last release was accidentally uploaded
+ to unstable.
+ * debian/rules: Added code in the binary rule to check whether this version
+ is targeted to the experimental distribution and issue a warning if it
+ is not
+
+ -- Rafael Laboissiere <rafael at debian.org> Thu, 17 May 2007 21:54:33 +0200
+
+jed (0.99.19.+pre78-1) unstable; urgency=low
+
+ * New upstream release, taken from the upstream SVN repository at
+ gna.org [JS]
+ * Changed the upstream version numbering scheme, where the number after
+ "+pre" corresponds to the micro version of the unstable Jed
+ branch. [RL]
+ * debian/rules:
+ + Simplified the get-orig-source rule [JS]
+ + The upstream version is obtained by parsing debian/changelog [RL]
+ + Remove *.orig.tar.gz in the clean rule
+
+ * Dropped debian/patches/fix-pymode-block-end.dpatch, which is now
+ applied upstream. [JS]
+
+ -- Rafael Laboissiere <rafael at debian.org> Thu, 17 May 2007 11:55:33 +0200
+
+jed (0.99.19.svn.60-1) experimental; urgency=low
+
+ * New upstream release, taken from the upstream SVN repository at
+ gna.org
+ * The package version number contain the SVN revision number on which
+ the package is built [RL]
+ * Uploaded to experimental
+
+ * In xjed, pasting with middle mouse button into an open mark works now
+ (closes: #330825) [RL]
+
+ * debian/patches/50_popups.sl.dpatch, debian/patches/doc.dpatch,
+ debian/patches/highlight-isearch-results.dpatch,
+ debian/patches/sane-color-object-return.dpatch,
+ debian/patches/pymode-repeat-shift.dpatch,
+ debian/patches/fix-menu-utf8.dpatch,
+ debian/patches/add-describe-bindings-to-C-h.dpatch:
+ Dropped these patches, which are now applied upstream
+ * debian/patches/fix-pymode-block-end.dpatch:
+ Adapted for the 0.99.19 branch [RL]
+
+ * debian/po/es.po: Added translation of debconf templates to Spanish.
+ (synched from 0.99.18-8.etch.1) [RL]
+
+ * Synched with 0.99.18+dfsg.1-2 [RL]
+
+ -- Rafael Laboissiere <rafael at debian.org> Sun, 15 Apr 2007 11:37:36 +0200
+
+ jed (1:0.99.18+dfsg.1-10) unstable; urgency=low
+
+ * debian/control:
+ + Added Homepage field
+ + Use the now official Vcs-* fields instead of the obsolete XS-Vcs-*
+ + Dropped the Homepage pseudo-field for the extended description
+ + Bumped Standards-Version to 3.7.3
+ * debian/po/fi.po: Add Finnish translation of the debconf templates,
+ thanks to Esko Arajärvi (closes: #476637)
+ * debian/README.Debian, debian/README.Debian-startup: Updated to make
+ clear the startup scheme in Debian (closes: #466486) [GM]
+ * debian/jed-common.doc-base: Change section to Editors, in accordance
+ with the doc-base Manual
+ * debian/jed-common.copyright: Add release years to the copyright notice
+ * debian/NEWS: Use the recommended format. Put the last (long) entry
+ containing the information about upgrading from sarge into a separated
+ file
+ * debian/jed.README.Debian-sarge-upgrade: New file
+
+ -- Rafael Laboissiere <rafael at debian.org> Mon, 21 Apr 2008 17:02:04 +0200
+
jed (1:0.99.18+dfsg.1-9) unstable; urgency=low
* debian/rules:
diff --combined debian/control
index 6c3d5dc,9079ea2..15242f8
--- a/debian/control
+++ b/debian/control
@@@ -2,14 -2,16 +2,16 @@@ Source: je
Section: editors
Priority: optional
Maintainer: Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>
- Uploaders: Rafael Laboissiere <rafael at debian.org>, Jörg Sommer <joerg at alea.gnuu.de>
- Standards-Version: 3.7.2
+ Uploaders: Rafael Laboissiere <rafael at debian.org>,
+ Jörg Sommer <joerg at alea.gnuu.de>
+ Standards-Version: 3.7.3
Build-Depends-Indep: hevea
- Build-Depends: debhelper (>= 4.1.16), dpatch, libslang2-dev, libxft-dev,
- libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libxt-dev,
- pkg-config
- XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-jed/jed/
- XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-jed/jed/
+ Build-Depends: debhelper (>= 4.1.16), dpatch, libslang2-dev (>= 2.0.7-2),
+ libxft-dev, libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ libxt-dev, pkg-config
+ Homepage: http://www.jedsoft.org/jed/
+ Vcs-Svn: svn://svn.debian.org/svn/pkg-jed/jed/
+ Vcs-Browser: http://svn.debian.org/wsvn/pkg-jed/jed/
Package: jed
Architecture: any
@@@ -37,8 -39,6 +39,6 @@@ Description: editor for programmers (te
editing and BibTeX)
.
Additional tools and modes can be found in the jed-extra package.
- .
- Homepage: http://www.jedsoft.org/jed/
Package: xjed
Architecture: any
@@@ -70,19 -70,15 +70,15 @@@ Description: editor for programmers (x1
text mode, thus there is no need to install both jed and xjed packages.
.
Additional tools and modes can be found in the jed-extra package.
- .
- Homepage: http://www.jedsoft.org/jed/
Package: jed-common
Architecture: all
Replaces: jed-sl
-Conflicts: jed-sl, jed (<< ${source:Version}), xjed (<< ${source:Version})
+Conflicts: jed-sl, jed (<< ${source:Version}), xjed (<< ${source:Version}), jed-extra (<= 2.3.2-3)
Recommends: jed | xjed
-Depends: findutils (>= 4.1.20-6), debconf | debconf-2.0
+Depends: findutils (>= 4.1.20-6), debconf | debconf-2.0, slsh
Description: S-Lang runtime files for jed and xjed
Jed is a small, fast and powerful text editor.
.
This package provides the S-Lang runtime files that are needed by both
jed and xjed.
- .
- Homepage: http://www.jedsoft.org/jed/
diff --combined debian/jed-common.copyright
index d8c04d2,d7bff31..c5a7371
--- a/debian/jed-common.copyright
+++ b/debian/jed-common.copyright
@@@ -3,8 -3,6 +3,8 @@@ Sat Jun 2 23:18:10 CEST 200
It was downloaded from ftp://space.mit.edu/pub/davis/jed.
+SVN snapshots are taken from <svn://svn.gna.org/svn/jed/trunk>.
+
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
@@@ -13,9 -11,11 +13,11 @@@
See <http://www.jedsoft.org/jed/mailinglists.html> for more
information about it.
+ Author: John E. Davis <davis at space.mit.edu>
+
Copyright:
- Copyright (C) by John E. Davis <davis at space.mit.edu>
+ Copyright (C) 1992, 1998, 2000, 2002, 2003, 2004, 2005, 2006 John E. Davis
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
diff --combined debian/patches/00list
index 3273ff1,ff4182b..098ab43
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,7 -1,7 +1,7 @@@
+extend-manpage
+
50_README
50_jed-manpage
-50_jed.tex
-50_popups.sl
#if ! defined (DEB_BUILD_ARCH_hurd)
/* The xrender extension is not supported on the hurd: #95843 */
@@@ -13,12 -13,10 +13,17 @@@
60_gpm-mouse-support
#endif
-fix-pymode-block-end
-doc
+remove_jed_library_path
+fix-multi-key
+slang2
+fix-documentation
+fix-update-before-key-hook
+extend-jed_faq
+fix-help.sl
+extend-help.sl
+fix-jed-doc-file
+ fix-pymode-tab-space
+ pymode-repeat-shift /* depends on fix-pymode-tab-space */
+ add-describe-bindings-to-C-h
+ highlight-isearch-results
+ sane-color-object-return
diff --combined debian/rules
index a70223b,1a6c573..ea914e2
--- a/debian/rules
+++ b/debian/rules
@@@ -4,9 -4,7 +4,9 @@@
# These additional compiler flags should bring up warnings about common
# sources of errors.
-CFLAGS += -Wall -Wformat=2 -Wunused -Wundef -Wextra -g
+CFLAGS += -g -Wall -Wformat=2 -Wunused -Wundef -Wextra -Wswitch-enum -Wshadow \
+ -Wpointer-arith -Wnested-externs -Wbad-function-cast -Wcast-qual \
+ -Wcast-align
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@@ -19,12 -17,21 +19,12 @@@ include /usr/share/dpatch/dpatch.mak
jed=$(CURDIR)/debian/jed
xjed=$(CURDIR)/debian/xjed
jed-common=$(CURDIR)/debian/jed-common
-temp=debian/tmp
-
-# get upstream version from changelog (FIXME)
-# UPSTREAM_VERSION = $(shell perl -ne '/([\d.]+)-/; print $$1; exit' < \
-# $(dir $(firstword $(MAKEFILE_LIST)))/changelog)
-UPSTREAM_VERSION=0.99-18
-DEBIAN_UPSTREAM_VERSION=$(subst -,.,$(UPSTREAM_VERSION)).dfsg.1
clean: unpatch
dh_testdir
dh_clean
- if [ -f Makefile ]; then $(MAKE) distclean; fi
+ [ ! -f Makefile ] || $(MAKE) distclean
rm -f build-stamp install-stamp
- # fixme-upstream
- rm -f src/config.h
config.status: patch-stamp
dh_testdir
@@@ -56,10 -63,8 +56,10 @@@ binary-indep: config.statu
dh_clean -i --keep
dh_installdirs -i
+ if ! [ -e src/objs/jed ]; then > src/objs/jed; fi
$(MAKE) DESTDIR=$(jed-common) install
- rm -r $(jed-common)/usr/bin/ $(jed-common)/usr/share/man/
+ if ! [ -s src/objs/jed ]; then rm src/objs/jed; fi
+ rm -r $(jed-common)/usr/bin/
# fixme-upstream
rm -r $(jed-common)/usr/share/jed/bin/
@@@ -159,35 -164,13 +159,35 @@@ binary-arch: build-stam
dh_md5sums -a
dh_builddeb -a
+DEB_VER = ${shell perl -ne '/\((.*);/; print $$1; last' < debian/changelog}
+JED_VER = $(shell echo "$(DEB_VER)" | sed "s/-.*//")
+DIST = ${shell echo "$(DEB_VER)" | sed 's/.*) *//'}
+
binary: binary-arch binary-indep
+ @if [ "$(DIST)" != experimental ] ; then \
+ echo "***********************************************************"; \
+ echo This version should be uploaded to experimental, not $(DIST)!; \
+ echo "***********************************************************"; \
+ fi
get-orig-source:
- wget ftp://space.mit.edu/pub/davis/jed/v0.99/jed-$(UPSTREAM_VERSION).tar.gz
- gunzip jed-$(UPSTREAM_VERSION).tar.gz
- tar f jed-$(UPSTREAM_VERSION).tar --delete jed-$(UPSTREAM_VERSION)/info
- gzip -9 jed-$(UPSTREAM_VERSION).tar
- mv jed-$(UPSTREAM_VERSION).tar.gz jed_$(DEBIAN_UPSTREAM_VERSION).orig.tar.gz
+ test -d trunk && rm -rf trunk || true
+ svn export http://svn.gna.org/svn/jed/trunk
+ REV=$$(perl -n -e 'last if /{{{ Previous Versions/; \
+ $$v{$$1} = 1 if /^(\d+)\./; \
+ END { print ((sort {$$b <=> $$a} keys %v) [0]) }' \
+ < trunk/changes.txt ) ; \
+ rm -rf trunk/info ; \
+ PKG_VER=0.99.19~pre$$REV ; \
+ SRC_DIR=jed-$$PKG_VER ; \
+ if [ -d $$SRC_DIR ] ; then \
+ echo Directory $$SRC_DIR exists, move it away! >&2 ; \
+ rm -rf trunk ; \
+ exit 1 ; \
+ else \
+ mv trunk jed-$$PKG_VER ; \
+ tar czf jed_$$PKG_VER.orig.tar.gz jed-$$PKG_VER ; \
+ rm -rf jed-$$PKG_VER ; \
+ fi
.PHONY: build clean binary binary-arch binary-indep get-orig-source
--
Debian packaging of JED
More information about the Pkg-jed-commit
mailing list