[Pkg-jed-commit] r237 - in trunk/packages/jed-extra: debian utils
Guenter Milde
milde-guest at costa.debian.org
Fri Dec 9 15:24:23 UTC 2005
Author: milde-guest
Date: 2005-12-09 15:24:21 +0000 (Fri, 09 Dec 2005)
New Revision: 237
Modified:
trunk/packages/jed-extra/debian/README.Debian
trunk/packages/jed-extra/debian/changelog
trunk/packages/jed-extra/debian/contents.txt
trunk/packages/jed-extra/debian/rules
trunk/packages/jed-extra/debian/sort-modes.sl
trunk/packages/jed-extra/utils/prepare-build.sh
Log:
prepare-build.sh: include Rafaels patches to build-from-scratch
call this script from its place (utils/)
rules: uncomment non-local, non-official download URL
apsconf permissions fixed upstream (maybe only temporary,
as changing permissions in CVS is tricky)
sort-modes/contents: move apsmode to the eXperimental section, as
configuration is untested and non-standard
README.Debian: list Debian JED Group as contact
now that Jedmodes has a version numbering, we can use it
Modified: trunk/packages/jed-extra/debian/README.Debian
===================================================================
--- trunk/packages/jed-extra/debian/README.Debian 2005-12-08 16:28:07 UTC (rev 236)
+++ trunk/packages/jed-extra/debian/README.Debian 2005-12-09 15:24:21 UTC (rev 237)
@@ -1,19 +1,17 @@
jed-extra for Debian
--------------------
-This package contains several extensions for the JED editor. It contains
-mainly extensions from the Jedmodes project at SourceForge
-(http://jedmodes.sf.net/).
+This package contains extensions for the JED editor, mainly from the
+"Jedmodes" project at SourceForge (http://jedmodes.sf.net/).
-Activation/Customization is done in /etc/jed.d/50jed-extra.sl.
-Adapt this file to the needs of your site.
+Activation/Customization is done in /etc/jed.d/50jed-extra.sl,
+adapt this file to the needs of your site (the comments in this file
+provide further details).
-The version numbering scheme for the jed-extra package is similar to the
-scheme used by the emacs-goodies.el package: the major number will be
-incremented when new files are added to the package. The minor number is
-incremented when files are removed or upstream files change. The Debian
-version number is only for Debian packaging.
+The version numbering scheme for the jed-extra package follows the versions
+on Jedmodes. All modes in versions 2.x should be SLang-2 compatible (while
+still backwards compatible to SLang-1).
-
- -- Rafael Laboissiere <rafael at debian.org>
+ -- Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>
+
$Id$
Modified: trunk/packages/jed-extra/debian/changelog
===================================================================
--- trunk/packages/jed-extra/debian/changelog 2005-12-08 16:28:07 UTC (rev 236)
+++ trunk/packages/jed-extra/debian/changelog 2005-12-09 15:24:21 UTC (rev 237)
@@ -10,8 +10,9 @@
+ create example alternative 50jed-extra.sl and example jed.rc
- + use new upstream release jedmodes-2.1 once it is ready and holds
- all changes proposed during the preparation of the new package release
+ + make upstream release of jedmodes-2.1 by GM (once it is ready and holds
+ all changes proposed during the preparation of the new package release)
+ change the download URL in the rules file
new upstream release
all modes should now work with SLang-2
@@ -20,8 +21,7 @@
* new upstream source URI
* list of upstream modes (with categorization) in contents.txt
- modes marked as "Obsolete" or "eXotic/eXperimental" are now excluded
- from the jed-extra package to keep the footprint small
+ modes marked as "Obsolete" are excluded
* updated copyright (source URI, author list, contact info)
* updated README.Debian (give customization instructions)
* move all initialization/customization to jed.d/50jed-extra.sl
Modified: trunk/packages/jed-extra/debian/contents.txt
===================================================================
--- trunk/packages/jed-extra/debian/contents.txt 2005-12-08 16:28:07 UTC (rev 236)
+++ trunk/packages/jed-extra/debian/contents.txt 2005-12-09 15:24:21 UTC (rev 237)
@@ -1,14 +1,14 @@
# Modes at Jedmodes
# ~~~~~~~~~~~~~~~~~
#
-# Types: *A*ddition *C*olor *D*rop-In *E*nhancement
-# *O*bsolete *U*tils e*X*clude
+# Types: Addition Color Drop-In Enhancement
+# Obsolete Utils eXperimental (or eXotic)
#
# Type Name Abstract
X a2ps Pretty-printing tools
X apache mode for editing Apache configuration files
-E apsmode pretty printing mode using a2ps
+X apsmode pretty printing mode using a2ps
X autotext autotext a la MS Word
X awk mode for editing Awk scripts
D brief Brief editor emulation
Modified: trunk/packages/jed-extra/debian/rules
===================================================================
--- trunk/packages/jed-extra/debian/rules 2005-12-08 16:28:07 UTC (rev 236)
+++ trunk/packages/jed-extra/debian/rules 2005-12-09 15:24:21 UTC (rev 237)
@@ -14,7 +14,6 @@
VER = $(shell perl -ne '/([\d.]+)-/; print $$1; exit' < debian/changelog)
-
build:
# nothing to do, but required by debian policy
@@ -31,9 +30,9 @@
# officially released CVS tarball directly from a download mirror
# wget http://kent.dl.sourceforge.net/sourceforge/jedmodes/jedmodes-$(VER).tgz
# latest non-released source tarball
- # wget http://jedmodes.sf.net/cvs/jedmodes-$(VER).tgz
+ wget http://jedmodes.sf.net/cvs/jedmodes-$(VER).tgz
# local copy
- cp ~/.jed/jedmodes/src/jedmodes-$(VER).tgz .
+ # cp ~/.jed/jedmodes/src/jedmodes-$(VER).tgz .
# rename
mv jedmodes-$(VER).tgz jed-extra_$(VER).orig.tar.gz
@@ -49,7 +48,6 @@
# take care to clean up any temporary files this rule may have left!
# rm -R jed-extra-$(VER)
-
clean: unpatch
dh_testdir
@@ -67,14 +65,13 @@
dh_install -X.html -X.otl -X.example -XREADME
# install documentation (under /usr/share/doc/jed-extra)
- # TODO: this installs also html docs for eXcluded modes :-(
dh_installdocs $$(find . -name \*.html -o -name \*.otl) \
README.txt
# Install examples
dh_installexamples $$(find . -name \*.example)
- #fix apsconf permissions
- chmod -x $(debroot)/usr/share/jed/jed-extra/apsconf/*
+ # fix apsconf permissions
+ # chmod -x $(debroot)/usr/share/jed/jed-extra/apsconf/*
# fix some names (as dh_install* cannot change filenames)
mv $(debroot)/usr/share/jed/compile/compile \
Modified: trunk/packages/jed-extra/debian/sort-modes.sl
===================================================================
--- trunk/packages/jed-extra/debian/sort-modes.sl 2005-12-08 16:28:07 UTC (rev 236)
+++ trunk/packages/jed-extra/debian/sort-modes.sl 2005-12-09 15:24:21 UTC (rev 237)
@@ -42,7 +42,7 @@
% files that do not fit into the list
private variable non_listed_files =
["debian/init/*.sl etc/jed.d/",
- "apsmode/apsconf " + lib_dir,
+ % "apsmode/apsconf " + extra_dir,
"debian/compile usr/share/jed/compile",
"debian/jed-extra-preparse.sl usr/share/jed/compile"];
Modified: trunk/packages/jed-extra/utils/prepare-build.sh
===================================================================
--- trunk/packages/jed-extra/utils/prepare-build.sh 2005-12-08 16:28:07 UTC (rev 236)
+++ trunk/packages/jed-extra/utils/prepare-build.sh 2005-12-09 15:24:21 UTC (rev 237)
@@ -1,3 +1,4 @@
+#!/bin/sh
# This is an experimental script that helps me test-build jed-extra
# (c) 2005 Guenter Milde
@@ -12,18 +13,21 @@
# svn export svn+ssh://svn.debian.org/svn/pkg-jed/trunk/packages/jed-extra
# cd jed-extra
+cd ..
+
# upstream version
-VER=2.1
+VER=`perl -ne '/\(([\d.]+)-/; print $1; exit' < debian/changelog`
# Download the upstream tarball
# -----------------------------
debian/rules get-orig-source
-
# Unpack
# ------
+# remove old dir (if left over)
+rm -Rf jedmodes-$VER
tar -xzf jed-extra_$VER.orig.tar.gz
# Copy the debian/ subdir to the source tree
@@ -31,15 +35,15 @@
install -d jedmodes-$VER/debian
cp -uRf debian/* jedmodes-$VER/debian
-
cd jedmodes-$VER
-# xjed debian/changelog
+# Fix the trailer line in changelog automatically
+perl -ni -e 'if (not $done and /^ --/) {'\
+' print (" -- Debian JED Group "'\
+' . "<pkg-jed-devel\@lists.alioth.debian.org> ",'\
+' qx/date -R/, "\n");'\
+' $done = 1;'\
+' } else {print}' debian/changelog
+# Build (do not sign, ignore SVN entries)
debuild -i -us -uc
-
-
-
-
-
-
More information about the Pkg-jed-commit
mailing list