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

Jörg Sommer jo-guest at alioth.debian.org
Tue May 29 12:54:32 UTC 2007


Author: jo-guest
Date: 2007-05-29 12:54:32 +0000 (Tue, 29 May 2007)
New Revision: 758

Removed:
   jed/branches/0.99.19/debian/patches/50_jed.tex.dpatch
   jed/branches/0.99.19/debian/patches/update-hlp.dpatch
   jed/branches/0.99.19/debian/patches/x_toggle_visibility.dpatch
Modified:
   jed/branches/0.99.19/debian/changelog
   jed/branches/0.99.19/debian/patches/00list
   jed/branches/0.99.19/debian/rules
Log:
• debian/patches/x_toggle_visibility.dpatch
  · It's applied upstream.

• debian/patches/update-hlp.dpatch
  · No more needed. John has updated the hlp files.

• debian/patches/50_jed.tex.dpatch
  · Applied upstream.

• debian/changelog
  · Version number increased.

• debian/rules
  · Now, the file src/config.h is no more left after distclean.

  · Adaption to new situation with usr/share/man.


Modified: jed/branches/0.99.19/debian/changelog
===================================================================
--- jed/branches/0.99.19/debian/changelog	2007-05-29 06:29:09 UTC (rev 757)
+++ jed/branches/0.99.19/debian/changelog	2007-05-29 12:54:32 UTC (rev 758)
@@ -1,23 +1,22 @@
-jed (1:0.99.19~pre78-2) UNRELEASED; urgency=low
+jed (1:0.99.19~pre89-1) UNRELEASED; urgency=low
 
+  * New upstream release, taken from the upstream SVN repository at
+    gna.org [JS]
+
+  * debian/patches/50_jed.tex.dpatch: Removed. It's includes upstream. [JS]
+
   * debian/patches/manpage.dpatch: 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]
 
-  * debian/patches/x_toggle_visibility.dpatch: 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]
 
-  * 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]
 
- -- Rafael Laboissiere <rafael at debian.org>  Mon, 28 May 2007 15:22:41 +0200
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 29 May 2007 13:54:52 +0200
 
 jed (1:0.99.19~pre78-1) experimental; urgency=low
 

Modified: jed/branches/0.99.19/debian/patches/00list
===================================================================
--- jed/branches/0.99.19/debian/patches/00list	2007-05-29 06:29:09 UTC (rev 757)
+++ jed/branches/0.99.19/debian/patches/00list	2007-05-29 12:54:32 UTC (rev 758)
@@ -2,7 +2,6 @@
 
 50_README
 50_jed-manpage
-50_jed.tex
 
 #if ! defined (DEB_BUILD_ARCH_hurd)
   /* The xrender extension is not supported on the hurd: #95843 */
@@ -16,6 +15,4 @@
 
 fix-multi-key
 slang2
-x_toggle_visibility
 fix-warnings
-update-hlp

Deleted: jed/branches/0.99.19/debian/patches/50_jed.tex.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/50_jed.tex.dpatch	2007-05-29 06:29:09 UTC (rev 757)
+++ jed/branches/0.99.19/debian/patches/50_jed.tex.dpatch	2007-05-29 12:54:32 UTC (rev 758)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## jed.tex.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: hevea complains that it does not know the commands \parindent and
-## DP: \parskip. We remove them by their LaTeX commands.
-
- at DPATCH@
-diff -urNad jed-0.99.17.135~/doc/manual/jed.tex jed-0.99.17.135/doc/manual/jed.tex
---- jed-0.99.17.135~/doc/manual/jed.tex	2006-02-13 18:51:58.000000000 +0100
-+++ jed-0.99.17.135/doc/manual/jed.tex	2006-04-06 15:15:50.233284000 +0200
-@@ -4,8 +4,8 @@
- \setlength{\textwidth}{160mm}
- \setlength{\topmargin}{-10mm}
- \setlength{\textheight}{210mm}
--\parindent=0mm
--\parskip=5mm
-+\setlength{\parindent}{0mm}
-+\setlength{\parskip}{5mm}
- 
- \def\mytitle{The JED Editor}
- 

Deleted: jed/branches/0.99.19/debian/patches/update-hlp.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/update-hlp.dpatch	2007-05-29 06:29:09 UTC (rev 757)
+++ jed/branches/0.99.19/debian/patches/update-hlp.dpatch	2007-05-29 12:54:32 UTC (rev 758)
@@ -1,38 +0,0 @@
-#! /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

Deleted: jed/branches/0.99.19/debian/patches/x_toggle_visibility.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/x_toggle_visibility.dpatch	2007-05-29 06:29:09 UTC (rev 757)
+++ jed/branches/0.99.19/debian/patches/x_toggle_visibility.dpatch	2007-05-29 12:54:32 UTC (rev 758)
@@ -1,93 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## x_toggle_visibility.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: This patch adds a new function to XJed to raise and lower the window.
-
- at 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
-@@ -117,3 +117,18 @@
- \seealso{}
- \done
- 
-+\function{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 \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
-+ \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
-+ it, if the window doesn't have the focus.
-+\seealso{suspend}
-+\done
-diff -urNad 0.99.19~/src/xterm.c 0.99.19/src/xterm.c
---- 0.99.19~/src/xterm.c	2007-05-25 17:52:00.154248336 +0200
-+++ 0.99.19/src/xterm.c	2007-05-25 17:52:00.622248336 +0200
-@@ -1605,6 +1605,22 @@
- 
- /*}}}*/
- 
-+static void x_toggle_visibility (void) /*{{{*/
-+{
-+   int hide_win = XWin->visible == VisibilityUnobscured;
-+
-+   if (SLang_Num_Function_Args == 1 && -1 == SLang_pop_integer (&hide_win))
-+      return;
-+
-+    if (hide_win)
-+      /* XIconifyWindow (This_XDisplay, XWin->w, This_XScreen); */
-+      XLowerWindow (This_XDisplay, This_XWindow);
-+    else
-+      XRaiseWindow (This_XDisplay, This_XWindow);
-+}
-+
-+/*}}}*/
-+
- static int get_font_width (XFontStruct *f, int *wp, int *is_dualp)
- {
-    int w0, w1;
-@@ -3049,6 +3065,7 @@
- #if SLANG_VERSION < 10404
-    MAKE_INTRINSIC_S("get_termcap_string", get_termcap_string, STRING_TYPE),
- #endif
-+   MAKE_INTRINSIC("x_toggle_visibility", x_toggle_visibility, SLANG_VOID_TYPE, 0),
-    MAKE_INTRINSIC(NULL,NULL,0,0)
- };
- 

Modified: jed/branches/0.99.19/debian/rules
===================================================================
--- jed/branches/0.99.19/debian/rules	2007-05-29 06:29:09 UTC (rev 757)
+++ jed/branches/0.99.19/debian/rules	2007-05-29 12:54:32 UTC (rev 758)
@@ -23,8 +23,6 @@
 	dh_clean
 	-make distclean
 	rm -f build-stamp install-stamp
-	# fixme-upstream
-	rm -f src/config.h
 
 config.status: patch-stamp
 	dh_testdir
@@ -59,7 +57,7 @@
 	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
-	rm -r $(jed-common)/usr/bin/ $(jed-common)/usr/share/man/
+	rm -r $(jed-common)/usr/bin/
 	# fixme-upstream
 	rm -r $(jed-common)/usr/share/jed/bin/
 




More information about the Pkg-jed-commit mailing list