[Pkg-jed-commit] r748 - in jed/branches/0.99.19/debian: . patches

Jörg Sommer jo-guest at alioth.debian.org
Sun May 27 23:21:07 UTC 2007 

Author: jo-guest
Date: 2007-05-27 23:21:07 +0000 (Sun, 27 May 2007)
New Revision: 748

Modified:
   jed/branches/0.99.19/debian/changelog
   jed/branches/0.99.19/debian/control
   jed/branches/0.99.19/debian/patches/slang2.dpatch
   jed/branches/0.99.19/debian/patches/x_toggle_visibility.dpatch
   jed/branches/0.99.19/debian/rules
Log:
• debian/patches/x_toggle_visibility.dpatch
  · Fixed the description of this patch.

  · Removed the jedfuns.hlp part.

• debian/patches/slang2.dpatch
  · Enhanced.

• debian/changelog
  · Added the file names connected to the changes.

  · Fixed a mistake in the last version.

• debian/rules
  · Removed the variable temp. It was unused.

  · From now on, rebuild the .hlp files from scratch.

• debian/control
  · Added tmexpand to the build dependencies. It's needed the rebuild the hlp
    files.


Modified: jed/branches/0.99.19/debian/changelog
===================================================================
--- jed/branches/0.99.19/debian/changelog	2007-05-27 21:15:58 UTC (rev 747)
+++ jed/branches/0.99.19/debian/changelog	2007-05-27 23:21:07 UTC (rev 748)
@@ -1,25 +1,32 @@
 jed (1:0.99.19~pre78-2) UNRELEASED; urgency=low
 
-  * Added Jörg Sommer to the list of uploaders. [JS]
+  * debian/patches/manpage.dpatch: Described the operation modes of jed
+    in the manpage. [JS]
 
-  * Described the operation modes of jed in the manpage. [JS]
+  * debian/patches/slang2.dpatch: Replaced and removed old SLang code
+    that is deprecated since SLang2. [JS]
 
-  * Replaced and removed old SLang code that is deprecated since SLang2. [JS]
+  * debian/patches/x_toggle_visibility.dpatch: Added a new function
+    x_toggle_visibility to XJed that shows or hides the window. [JS]
 
-  * Added a new function x_toggle_visibility to XJed that shows or hides the
-    window. [JS]
+  * debian/patches/fix-warnings.dpatch: Fixed some warnings they show up
+    when building with additional compiling checks. [JS]
 
-  * 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]
 
- -- Rafael Laboissiere <rafael at debian.org>  Fri, 25 May 2007 17:59:08 +0200
+  * 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 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
     has also an epoch now.  Also start using "~pre" instead of ".+pre" in
     the version number, which is more appropriate.
-  * debian/control: Adjust the get-orig-source rule to the above
+  * 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
 

Modified: jed/branches/0.99.19/debian/control
===================================================================
--- jed/branches/0.99.19/debian/control	2007-05-27 21:15:58 UTC (rev 747)
+++ jed/branches/0.99.19/debian/control	2007-05-27 23:21:07 UTC (rev 748)
@@ -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
+Build-Depends-Indep: hevea, tmexpand
 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/slang2.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/slang2.dpatch	2007-05-27 21:15:58 UTC (rev 747)
+++ jed/branches/0.99.19/debian/patches/slang2.dpatch	2007-05-27 23:21:07 UTC (rev 748)
@@ -21,10 +21,37 @@
 -}
 -#endif
 diff -urNad 0.99.19~/lib/site.sl 0.99.19/lib/site.sl
---- 0.99.19~/lib/site.sl	2007-05-23 00:55:09.000000000 +0200
-+++ 0.99.19/lib/site.sl	2007-05-25 14:37:42.438248336 +0200
-@@ -1729,13 +1729,13 @@
+--- 0.99.19~/lib/site.sl	2007-01-23 08:07:54.000000000 +0100
++++ 0.99.19/lib/site.sl	2007-05-27 13:43:34.718340355 +0200
+@@ -246,14 +246,8 @@
  %!%-
+ define str_replace_all (str, old, new)
+ {
+-#ifexists strreplace
+-   (str,) = strreplace (str, old, new, strlen (str));
+-   str;
+-#else
+-   while (str_replace (str, old, new))
+-     str = ();
+-   str;
+-#endif
++   () = strreplace (str, old, new, strlen (str));
++   % leave the new string on the stack
+ }
+ 
+ %}}}
+@@ -263,9 +257,6 @@
+ 
+ %{{{ Compatibility functions
+ 
+-if (_slang_version < 10308)
+-  () = evalfile ("emul.sl");
+-
+ #ifnexists strbytelen
+ define strbytelen (s)
+ {
+@@ -1738,13 +1729,13 @@
+ %!%-
  public define redo ()
  {
 -   ERROR_BLOCK 
@@ -41,7 +68,7 @@
  }
  
  %}}}
-@@ -1832,30 +1832,32 @@
+@@ -1841,30 +1832,32 @@
  
     widen ();
  
@@ -93,3 +120,40 @@
  }
  
  variable Mode_List_Exts = "h,cc,cpp,hpp,hh,sl,txt,doc,f,for,pro,1,pl,pm,v,verilog,vhd,vhdl,vt,sp,cir,py,cxx,m,bib";
+@@ -2627,9 +2620,10 @@
+ {
+    read_with_completion("Insert Buffer:", Null_String, Null_String, 'b');
+    push_spot();
+-   ERROR_BLOCK {pop_spot();}
+-   insbuf(());
+-   EXECUTE_ERROR_BLOCK;
++   try
++     insbuf(());
++   finally
++     pop_spot();
+ }
+ add_completion("insert_buffer");
+ 
+@@ -2856,15 +2850,15 @@
+ {
+    variable n = strlen (str);
+ 
+-   EXIT_BLOCK
+-     {
+-	pop_spot ();
+-     }
+-
+    push_spot ();
+ 
+-   if (n != left(n)) return 0;
+-   return looking_at (__tmp(str));
++   try
++     {
++        if (n != left(n)) return 0;
++        return looking_at (__tmp(str));
++     }
++   finally
++      pop_spot ();
+ }
+ 
+ %}}}

Modified: jed/branches/0.99.19/debian/patches/x_toggle_visibility.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/x_toggle_visibility.dpatch	2007-05-27 21:15:58 UTC (rev 747)
+++ jed/branches/0.99.19/debian/patches/x_toggle_visibility.dpatch	2007-05-27 23:21:07 UTC (rev 748)
@@ -1,42 +1,9 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## slang2.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
+## x_toggle_visibility.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
 ##
-## DP: This patch changes old pre‐slang2 language contructs into slang2
-## DP: contructs. The intention of this patch is to help the upstream
-## DP: maintainer John Davis.
+## DP: This patch adds a new function to XJed to raise and lower the window.
 
 @DPATCH@
-diff -urNad 0.99.19~/doc/hlp/jedfuns.hlp 0.99.19/doc/hlp/jedfuns.hlp
---- 0.99.19~/doc/hlp/jedfuns.hlp	2007-01-19 16:01:16.000000000 +0100
-+++ 0.99.19/doc/hlp/jedfuns.hlp	2007-05-25 17:55:09.514248336 +0200
-@@ -7719,3 +7719,27 @@
-  SEE ALSO
- 
- --------------------------------------------------------------
-+
-+x_toggle_visibility
-+
-+ SYNOPSIS
-+  Shows or hides the window
-+
-+ USAGE
-+  x_toggle_visibility([Integer_Type hide])
-+
-+ DESCRIPTION
-+ Makes the window visible or invisible. If the argument `hide' is not
-+ given, the visility of the windows is toggled, e.g. if the window is
-+ invisible it becomes visible and vice versa. If the optional argument
-+ `hide' is given the state to the window becomes visible if
-+ `hide' is non-zero or invisible if `hide' is zero, whether of
-+ the current state.
-+
-+ You can also hide the window by calling `suspend', but you can now show
-+ it, if the window doesn't have the focus.
-+
-+ SEE ALSO
-+  suspend
-+
-+--------------------------------------------------------------
 diff -urNad 0.99.19~/doc/tm/rtl/xjed.tm 0.99.19/doc/tm/rtl/xjed.tm
 --- 0.99.19~/doc/tm/rtl/xjed.tm	2006-03-25 23:47:54.000000000 +0100
 +++ 0.99.19/doc/tm/rtl/xjed.tm	2007-05-25 17:55:28.606248336 +0200
@@ -48,11 +15,11 @@
 +\synopsis{Shows or hides the window}
 +\usage{x_toggle_visibility([Integer_Type hide])}
 +\description
-+ Makes the window visible or invisible. If the argument \exmp{hide} is not
++ Makes the window visible or invisible. If the argument \var{hide} is not
 + given, the visility of the windows is toggled, e.g. if the window is
 + invisible it becomes visible and vice versa. If the optional argument
-+ \exmp{hide} is given the state to the window becomes visible if
-+ \exmp{hide} is non-zero or invisible if \exmp{hide} is zero, whether of
++ \var{hide} is given the state to the window becomes visible if
++ \var{hide} is non-zero or invisible if \var{hide} is zero, whether of
 + the current state.
 +
 + You can also hide the window by calling \ifun{suspend}, but you can now show

Modified: jed/branches/0.99.19/debian/rules
===================================================================
--- jed/branches/0.99.19/debian/rules	2007-05-27 21:15:58 UTC (rev 747)
+++ jed/branches/0.99.19/debian/rules	2007-05-27 23:21:07 UTC (rev 748)
@@ -20,18 +20,23 @@
 jed=$(CURDIR)/debian/jed
 xjed=$(CURDIR)/debian/xjed
 jed-common=$(CURDIR)/debian/jed-common
-temp=debian/tmp
 
 clean: unpatch
 	dh_testdir
 	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
@@ -60,6 +65,12 @@
 	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