[Pkg-jed-commit] r1198 - in jed-extra/trunk: debian utils
Guenter Milde
milde-guest at alioth.debian.org
Mon Oct 5 18:25:59 UTC 2009
tags 540859 pending
thanks
Author: milde-guest
Date: 2009-10-05 18:25:59 +0000 (Mon, 05 Oct 2009)
New Revision: 1198
Removed:
jed-extra/trunk/debian/config
jed-extra/trunk/debian/patches/
jed-extra/trunk/debian/po/
jed-extra/trunk/debian/templates
Modified:
jed-extra/trunk/debian/changelog
jed-extra/trunk/debian/control
jed-extra/trunk/debian/copyright
jed-extra/trunk/debian/jed-extra-preparse.sl
jed-extra/trunk/debian/rules
jed-extra/trunk/utils/do-unittests.sh
Log:
New version 2.5.4-1.
Modified: jed-extra/trunk/debian/changelog
===================================================================
--- jed-extra/trunk/debian/changelog 2009-10-05 14:31:24 UTC (rev 1197)
+++ jed-extra/trunk/debian/changelog 2009-10-05 18:25:59 UTC (rev 1198)
@@ -1,9 +1,17 @@
-jed-extra (2.5.3-3) unstable; urgency=low
+jed-extra (2.5.4-1) UNRELEASED; urgency=low
+ * New upstream release,
+ * debian/rules: updated download URLs, [GM]
+ boxquote now included in upstream release, [GM]
+ * debian/config, debian/templates: Removed debconf question for
+ leftover files from pre-etch versions (closes: #540859). [GM]
+ * debian/jed-extra-preparse.sl: load tm.sl to extract online-help [GM]
+ * Add cua and cuamisc to drop-in modes
+ superseding outdated versions in jed 0.99.18, [GM]
+ * remove unused dpatch dependency (Lintian warning), [GM]
+ * add install-info to suggested packages (closes: #532588).
- * Add install-info to suggested packages (closes: #532588).
+ -- Guenter Milde <milde at users.sf.net> Mon, 05 Oct 2009 21:19:31 +0200
- -- Guenter Milde <milde at users.sf.net> Mon, 29 Jun 2009 11:19:31 +0200
-
jed-extra (2.5.3-2) unstable; urgency=low
* Upload to unstable, since lenny is released [RL]
Deleted: jed-extra/trunk/debian/config
===================================================================
--- jed-extra/trunk/debian/config 2009-10-05 14:31:24 UTC (rev 1197)
+++ jed-extra/trunk/debian/config 2009-10-05 18:25:59 UTC (rev 1198)
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-# md5sums from revision 21 to 50
-file_1=01df57bfb7f4af02082086abfe6ab406:/etc/jed-init.d/50jed-extra.sl
-file_2=9d2acbacef0953e7bb112a134035c822:/etc/jed-init.d/55ispell.sl
-
-# md5sums from revision 51 to 97
-file_3=6ec18c9842df332f7b40e516491b6e1c:/etc/jed-init.d/05home-lib.sl
-file_4=16824865e1cd8d3fd12c87fdad8bc7fb:/etc/jed-init.d/50jed-extra.sl
-file_5=75dcb623b01d51288a55dd146df5b631:/etc/jed-init.d/55ispell.sl
-
-# md5sums from revision 98 to 99:
-file_6=3e19363a2115d023fc25687278f237b6:/etc/jed-init.d/50jed-extra.sl
-
-# (starting at SVN revision 100, the /etc/jed-init.d/ was not used anymore)
-
-changed=false
-
-for n in `seq 1 6` ; do
- eval "tmp=\$file_$n"
- md5sum=`echo $tmp | cut -d: -f1`
- file=`echo $tmp | cut -d: -f2`
- if [ -e $file ] ; then
- if echo "$md5sum $file" | md5sum -c >/dev/null 2>&1 ; then
- # The configuration file was not changed by the user: remove it
- # silently
- rm -f $file
- else
- changed=true
- fi
- fi
-done
-
-if $changed = true ; then
- db_fset jed-extra/rm-site-defaults seen false
- db_input medium jed-extra/rm-site-defaults || true
- db_go
- db_get jed-extra/rm-site-defaults
- if [ "$RET" = true ] ; then
- for n in `seq 1 6` ; do
- eval "tmp=\$file_$n"
- rm -f `echo $tmp | cut -d: -f2`
- done
- fi
-fi
Modified: jed-extra/trunk/debian/control
===================================================================
--- jed-extra/trunk/debian/control 2009-10-05 14:31:24 UTC (rev 1197)
+++ jed-extra/trunk/debian/control 2009-10-05 18:25:59 UTC (rev 1198)
@@ -4,9 +4,9 @@
Maintainer: Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>
Uploaders: Rafael Laboissiere <rafael at debian.org>,
Guenter Milde <milde at users.sf.net>
-Build-Depends: debhelper (>= 7), dpatch
+Build-Depends: debhelper (>= 7)
Build-Depends-Indep: po-debconf
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
Homepage: http://jedmodes.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-jed/jed-extra/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-jed/jed-extra/
Modified: jed-extra/trunk/debian/copyright
===================================================================
--- jed-extra/trunk/debian/copyright 2009-10-05 14:31:24 UTC (rev 1197)
+++ jed-extra/trunk/debian/copyright 2009-10-05 18:25:59 UTC (rev 1198)
@@ -8,15 +8,11 @@
Upstream Sources
----------------
-Most files included in this release were downloaded from the
+The files included in this release were downloaded from the
Jed Modes Repository
http://jedmodes.sf.net/
-The file boxquote.sl was downloaded from
-
- http://www.cis.fu-berlin.de/~phgrau/slang/boxquote.sl
-
Upstream Authors
----------------
Modified: jed-extra/trunk/debian/jed-extra-preparse.sl
===================================================================
--- jed-extra/trunk/debian/jed-extra-preparse.sl 2009-10-05 14:31:24 UTC (rev 1197)
+++ jed-extra/trunk/debian/jed-extra-preparse.sl 2009-10-05 18:25:59 UTC (rev 1198)
@@ -20,9 +20,8 @@
vmessage("jed library path: %s", get_jed_library_path());
-vmessage(expand_jedlib_file("circle.sl"));
-
% load utility functions
+require("tm");
require("make_ini");
% Do not generate autoloads for the following files:
Modified: jed-extra/trunk/debian/rules
===================================================================
--- jed-extra/trunk/debian/rules 2009-10-05 14:31:24 UTC (rev 1197)
+++ jed-extra/trunk/debian/rules 2009-10-05 18:25:59 UTC (rev 1198)
@@ -7,7 +7,7 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+#include /usr/share/dpatch/dpatch.make
# Variables
# =========
@@ -34,62 +34,55 @@
# Source download
# ---------------
-# WGET = wget -N
-# Use curl, as this also understands a file:// URL
-# * write output to file named like the remote file
-# * attempt to figure out the timestamp of the remote file,
-# and if that is available make the local file get that same timestamp.
-WGET = curl --remote-name --remote-time
+WGET = wget -N
# URL of the upstream source package
UPSTREAM_VERSION ?= $(shell perl -ne '/([\d.]+[pre]*\d*)-?/; print $$1; exit' < debian/changelog)
UPSTREAM_PACKAGE = jedmodes-$(UPSTREAM_VERSION).tgz
UPSTREAM_PACKAGE_CHECKSUM = jedmodes-$(UPSTREAM_VERSION).md5sum
# officially released CVS tarball from the SF FRS
-RELEASE_URL = http://osdn.dl.sourceforge.net/sourceforge/jedmodes/
-# pre-release (source tarball from the jedmodes home site)
-PRERELEASE_URL = http://jedmodes.sourceforge.net/cvs/
-# local copy
-LOCAL_RELEASE_URL = file:/home/milde/.jed/jedmodes/src/
+UPSTREAM_URL = http://downloads.sourceforge.net/project/jedmodes/
+MIRROR = ?use_mirror=surfnet
-# Choose source
-# -------------
+# build from local copy
+# Use curl, as this also understands a file:// URL
+# * write output to file named like the remote file
+# * attempt to figure out the timestamp of the remote file,
+# and if that is available make the local file get that same timestamp.
+#UPSTREAM_URL = file:/home/milde/.jed/jedmodes/src/
+#MIRROR = ''
+#WGET = curl --remote-name --remote-time
-# TODO: auto-select PRERELEASE_URL if UPSTREAM_VERSION contains "pre"
-
-UPSTREAM_URL = $(RELEASE_URL)
-# UPSTREAM_URL = $(PRERELEASE_URL)
-# UPSTREAM_URL = $(LOCAL_RELEASE_URL)
-
# Rules
# =====
get-orig-source:
# get and check the jedmodes tarball
- $(WGET) $(UPSTREAM_URL)$(UPSTREAM_PACKAGE)
+ $(WGET) $(UPSTREAM_URL)$(UPSTREAM_PACKAGE)$(MIRROR)
# Check the md5sum of the upstream tarball
- $(WGET) $(UPSTREAM_URL)$(UPSTREAM_PACKAGE_CHECKSUM)
+ $(WGET) $(UPSTREAM_URL)$(UPSTREAM_PACKAGE_CHECKSUM)$(MIRROR)
cat $(UPSTREAM_PACKAGE_CHECKSUM) | md5sum -c || exit 1
mv $(UPSTREAM_PACKAGE) jed-extra_$(UPSTREAM_VERSION).orig.tar.gz
# additional modes from other sources
- mkdir --parents jedmodes-$(UPSTREAM_VERSION)/boxquote
- cd jedmodes-$(UPSTREAM_VERSION)/boxquote; \
- $(WGET) http://www.cis.fu-berlin.de/~phgrau/slang/boxquote.sl
+ # currently none, code kept for reference
+ # mkdir --parents jedmodes-$(UPSTREAM_VERSION)/boxquote
+ # cd jedmodes-$(UPSTREAM_VERSION)/boxquote; \
+ # $(WGET) http://www.cis.fu-berlin.de/~phgrau/slang/boxquote.sl
+ #
+ # gunzip jed-extra_$(UPSTREAM_VERSION).orig.tar.gz
+ # tar --append --file jed-extra_$(UPSTREAM_VERSION).orig.tar \
+ # jedmodes-$(UPSTREAM_VERSION)/boxquote/*
+ # gzip -9 jed-extra_$(UPSTREAM_VERSION).orig.tar
- gunzip jed-extra_$(UPSTREAM_VERSION).orig.tar.gz
- tar --append --file jed-extra_$(UPSTREAM_VERSION).orig.tar \
- jedmodes-$(UPSTREAM_VERSION)/boxquote/*
- gzip -9 jed-extra_$(UPSTREAM_VERSION).orig.tar
-
-clean: unpatch
+clean:
dh_testdir
# debconf-updatepo
rm -rf *.tgz *.md5sum *.tar.gz jedmodes-*
dh_clean
-binary binary-indep: patch-stamp
+binary binary-indep:
dh_testdir
dh_testroot
dh_clean
Deleted: jed-extra/trunk/debian/templates
===================================================================
--- jed-extra/trunk/debian/templates 2009-10-05 14:31:24 UTC (rev 1197)
+++ jed-extra/trunk/debian/templates 2009-10-05 18:25:59 UTC (rev 1198)
@@ -1,20 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# for an advice to debian-l10n-english at lists.debian.org
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: jed-extra/rm-site-defaults
-Type: boolean
-Default: false
-_Description: Remove old files in /etc/jed-init.d/?
- Former versions of the jed-extra package put configuration files in
- /etc/jed-init.d/, namely 05home-lib.sl, 50jed-extra.sl, and
- 55ispell.sl. These files are not used anymore and should be deleted
- from the file system.
- .
- However, some of these files appear to have been manually
- modified. Please confirm whether you want these files to be removed.
Modified: jed-extra/trunk/utils/do-unittests.sh
===================================================================
--- jed-extra/trunk/utils/do-unittests.sh 2009-10-05 14:31:24 UTC (rev 1197)
+++ jed-extra/trunk/utils/do-unittests.sh 2009-10-05 18:25:59 UTC (rev 1198)
@@ -18,7 +18,7 @@
# the S-Lang function for running the tests
# output written to testreport.txt in the pwd
-TESTFUN='test_files_and_exit("/usr/share/jed/jed-extra/tests/*.sl")'
+TESTFUN='test_files_and_exit("/usr/share/jed/jed-extra/tests/")'
# jed (without X)
LANG=en_US; jed -n -l extra/unittest.sl -f $TESTFUN
More information about the Pkg-jed-commit
mailing list