[Pkg-jed-commit] r752 - in jed/branches/0.99.19: . debian debian/patches
Jörg Sommer
jo-guest at alioth.debian.org
Mon May 28 15:18:46 UTC 2007
Author: jo-guest
Date: 2007-05-28 15:18:46 +0000 (Mon, 28 May 2007)
New Revision: 752
Added:
jed/branches/0.99.19/check_package
jed/branches/0.99.19/debian/patches/update-hlp.dpatch
Modified:
jed/branches/0.99.19/debian/changelog
jed/branches/0.99.19/debian/control
jed/branches/0.99.19/debian/patches/00list
jed/branches/0.99.19/debian/rules
Log:
• 0.99.19/debian/control 0.99.19/debian/rules
· Reverted the changes to build the hlp files from scratch, because we need
tmexpand for this, which needs jed-script. Due to this we couldn't
bootstrap the jed nor the tmexpand packages.
• 0.99.19/debian/patches/x_toggle_visibility.dpatch
· Moved back the part to change jedfuns.hlp.
• 0.99.19/debian/patches/update-hlp.dpatch
· Added a patch that incorporate the changes of the hlp files.
• 0.99.19/check_package
· Added a check to see if the hlp files shipped with the source need to be
updated.
Added: jed/branches/0.99.19/check_package
===================================================================
--- jed/branches/0.99.19/check_package (rev 0)
+++ jed/branches/0.99.19/check_package 2007-05-28 15:18:46 UTC (rev 752)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -u -e
+
+tmp=..
+
+if which tmexpand >/dev/null; then
+ mkdir $tmp/hlp-new
+
+ sed -n '/^%!%+/,/^%!%-/ { /^%!%+/d; /^%!%-/ { s/.*/\\done/; }; s/^%//g; p; }' \
+ lib/*.sl | tmexpand -Mslhlp - $tmp/hlp-new/libfuns.hlp
+ cat doc/tm/rtl/*.tm | tmexpand -Mslhlp - $tmp/hlp-new/jedfuns.hlp
+
+ dpkg-deb --fsys-tarfile ../jed-common* | \
+ tar -C $tmp -x ./usr/share/doc/jed-common/hlp
+
+ diff -ur $tmp/usr/share/doc/jed-common/hlp $tmp/hlp-new || true
+
+ rm -r ../hlp-new ../usr
+else
+ echo "tmexpand not found. Skipped uptodate hlp check"
+fi
Property changes on: jed/branches/0.99.19/check_package
___________________________________________________________________
Name: svn:executable
+ *
Modified: jed/branches/0.99.19/debian/changelog
===================================================================
--- jed/branches/0.99.19/debian/changelog 2007-05-28 15:04:38 UTC (rev 751)
+++ jed/branches/0.99.19/debian/changelog 2007-05-28 15:18:46 UTC (rev 752)
@@ -12,15 +12,13 @@
* debian/patches/fix-warnings.dpatch: Fixed some warnings they show up
when building with additional compiling checks. [JS]
- * debian/rules: From now on, rebuild the hlp files from scratch. [JS]
+ * debian/patches/update-hlp.dpatch: The hlp files shipped with the
+ source miss some functions they are found in the source. [JS]
- * debian/control:
- + Added Jörg Sommer to the list of uploaders. [JS]
+ * debian/control: Added Jörg Sommer to the list of uploaders. [JS]
- + Added build tmexpand. Needed to rebuild the hlp files. [JS]
+ -- Rafael Laboissiere <rafael at debian.org> Mon, 28 May 2007 15:22:41 +0200
- -- Rafael Laboissiere <rafael at debian.org> Mon, 28 May 2007 00:33:37 +0200
-
jed (1:0.99.19~pre78-1) experimental; urgency=low
* Use an epoch in the package version number, since the unstable branch
Modified: jed/branches/0.99.19/debian/control
===================================================================
--- jed/branches/0.99.19/debian/control 2007-05-28 15:04:38 UTC (rev 751)
+++ jed/branches/0.99.19/debian/control 2007-05-28 15:18:46 UTC (rev 752)
@@ -4,7 +4,7 @@
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
-Build-Depends-Indep: hevea, tmexpand
+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
Modified: jed/branches/0.99.19/debian/patches/00list
===================================================================
--- jed/branches/0.99.19/debian/patches/00list 2007-05-28 15:04:38 UTC (rev 751)
+++ jed/branches/0.99.19/debian/patches/00list 2007-05-28 15:18:46 UTC (rev 752)
@@ -18,3 +18,4 @@
slang2
x_toggle_visibility
fix-warnings
+update-hlp
Added: jed/branches/0.99.19/debian/patches/update-hlp.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/update-hlp.dpatch (rev 0)
+++ jed/branches/0.99.19/debian/patches/update-hlp.dpatch 2007-05-28 15:18:46 UTC (rev 752)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## update-hlp.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad 0.99.19~/doc/hlp/libfuns.hlp 0.99.19/doc/hlp/libfuns.hlp
+--- 0.99.19~/doc/hlp/libfuns.hlp 2007-01-18 16:20:00.000000000 +0100
++++ 0.99.19/doc/hlp/libfuns.hlp 2007-05-28 15:20:53.888466265 +0200
+@@ -1035,6 +1035,27 @@
+
+ --------------------------------------------------------------
+
++Help_Describe_Bindings_Show_Synopsis
++
++ SYNOPSIS
++ Used to control the searching of synopsis strings
++
++ USAGE
++ variable Help_Describe_Bindings_Show_Synopsis = 0;
++
++ DESCRIPTION
++ If the value of this variable is non-zero, the
++ `describe_bindings' function will search through the
++ documentation for synopsis strings and display the resulting strings
++ along with the key bindings. Since this can be a time consuming
++ process for slow computers or slow filesystems, this feature is
++ turned off by default.
++
++ EXAMPLE
++ variable Help_Describe_Bindings_Show_Synopsis = 1;
++
++--------------------------------------------------------------
++
+ expand_keystring
+
+ SYNOPSIS
Property changes on: jed/branches/0.99.19/debian/patches/update-hlp.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: jed/branches/0.99.19/debian/rules
===================================================================
--- jed/branches/0.99.19/debian/rules 2007-05-28 15:04:38 UTC (rev 751)
+++ jed/branches/0.99.19/debian/rules 2007-05-28 15:18:46 UTC (rev 752)
@@ -26,17 +26,11 @@
dh_clean
-make distclean
rm -f build-stamp install-stamp
- -mv doc/hlp/jedfuns.hlp.upstream doc/hlp/jedfuns.hlp
- -mv doc/hlp/libfuns.hlp.upstream doc/hlp/libfuns.hlp
# fixme-upstream
rm -f src/config.h
config.status: patch-stamp
dh_testdir
-# Save these files, because we rebuild them later and may get different
-# files which would show up in the .diff.gz
- mv doc/hlp/jedfuns.hlp doc/hlp/jedfuns.hlp.upstream
- mv doc/hlp/libfuns.hlp doc/hlp/libfuns.hlp.upstream
./configure "CFLAGS=$(CFLAGS)" --prefix=/usr/share --exec-prefix=/usr --with-x
build: build-stamp
@@ -65,12 +59,6 @@
dh_clean -i --keep
dh_installdirs -i
-# rebuild the hlp files
- sed -n '/^%!%+/,/^%!%-/ { /^%!%+/d; /^%!%-/ { s/.*/\\done/; }; s/^%//g; p; }' \
- lib/*.sl | tmexpand -Mslhlp - doc/tm/libfuns.hlp
- cat doc/tm/rtl/*.tm | tmexpand -Mslhlp - doc/tm/jedfuns.hlp
- make -C doc/tm install clean
-
if ! [ -e src/objs/jed ]; then > src/objs/jed; fi
make DESTDIR=$(jed-common) install
if ! [ -s src/objs/jed ]; then rm src/objs/jed; fi
More information about the Pkg-jed-commit
mailing list