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

jo-guest at alioth.debian.org jo-guest at alioth.debian.org
Tue May 15 15:26:06 UTC 2007


Author: jo-guest
Date: 2007-05-15 15:26:06 +0000 (Tue, 15 May 2007)
New Revision: 689

Removed:
   jed/branches/0.99.19/debian/patches/fix-pymode-block-end.dpatch
Modified:
   jed/branches/0.99.19/debian/changelog
   jed/branches/0.99.19/debian/compile
   jed/branches/0.99.19/debian/patches/00list
   jed/branches/0.99.19/debian/rules
Log:
• debian/patches/fix-pymode-block-end.dpatch debian/patches/00list
  · Removed this patch. I has been applied upstream in 0.99.19-59.

• debian/compile
  · The .slc files must be removed before an update that jed do not load an
    old slc file which doesn't work with the new version. (e.g. the new
    version implements any() as intrinsic function while it was implemente
    before in site.sl—error: redefinition of an intrinsic function)

• debian/changelog
  · Imported the changelog from 0.99.18+dfsg.1-2.

• debian/rules
  · Simplified the get-orig-source target and switched to an version scheme
    that uses the upstream version.


Modified: jed/branches/0.99.19/debian/changelog
===================================================================
--- jed/branches/0.99.19/debian/changelog	2007-05-15 14:53:37 UTC (rev 688)
+++ jed/branches/0.99.19/debian/changelog	2007-05-15 15:26:06 UTC (rev 689)
@@ -1,3 +1,13 @@
+jed (0.99.19~pre78-1) experimental; urgency=low
+
+  * New upstream release, taken from the upstream SVN repository at
+    gna.org.
+
+  * Dropped debian/patches/fix-pymode-block-end.dpatch, which is now
+    applied upstream. [JS]
+
+ --
+
 jed (0.99.19.svn.60-1) experimental; urgency=low
 
   * New upstream release, taken from the upstream SVN repository at
@@ -26,6 +36,12 @@
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 15 Apr 2007 11:37:36 +0200
 
+jed (0.99.18+dfsg.1-2) unstable; urgency=low
+
+  * Added debian/po/ja.po, forgotten in the last upload
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 15 Apr 2007 11:36:09 +0200
+
 jed (0.99.18+dfsg.1-1) unstable; urgency=low
 
   * Synched with versions 0.99.18-8.etch.3 and 0.99.18-8.etch.4

Modified: jed/branches/0.99.19/debian/compile
===================================================================
--- jed/branches/0.99.19/debian/compile	2007-05-15 14:53:37 UTC (rev 688)
+++ jed/branches/0.99.19/debian/compile	2007-05-15 15:26:06 UTC (rev 689)
@@ -4,14 +4,19 @@
 PREPARSE=$LIBDIR/preparse.sl
 
 case "$1" in
-  install)
-	jed-script $PREPARSE || true
-        # don't worry if jed-script is missing, because jed runs this scipt
-        # again at installation
-	;;
-  remove)
+  install|remove)
+        # Remove the files in both cases, because some .sl files may have
+        # gone and some .slc files may not work with the new jed version
 	find $LIBDIR \( -name \*.slc -o -name \*.dfa \) -print0 \
         | xargs -0 --no-run-if-empty rm
+
+        case "$1" in
+          install)
+		jed-script $PREPARSE || true
+		# don't worry if jed-script is missing, because jed runs this scipt
+		# again at installation
+                ;;
+        esac
 	;;
   *)
 	echo "unknown argument --> \"$1"\" >&2

Modified: jed/branches/0.99.19/debian/patches/00list
===================================================================
--- jed/branches/0.99.19/debian/patches/00list	2007-05-15 14:53:37 UTC (rev 688)
+++ jed/branches/0.99.19/debian/patches/00list	2007-05-15 15:26:06 UTC (rev 689)
@@ -12,6 +12,5 @@
 60_gpm-mouse-support
 #endif
 
-fix-pymode-block-end
 fix-multi-key
 

Deleted: jed/branches/0.99.19/debian/patches/fix-pymode-block-end.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/fix-pymode-block-end.dpatch	2007-05-15 14:53:37 UTC (rev 688)
+++ jed/branches/0.99.19/debian/patches/fix-pymode-block-end.dpatch	2007-05-15 15:26:06 UTC (rev 689)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-pymode-block-end.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##  taken from a patch Peter Bengtsson <peter at fry-it.com> send on
-##  8 Aug 2006 15:49:46 +0100 to the jed mailing list
-##
-## DP: PyMode treats lines starting with "passport" or "returning" (they start
-## DP: with a keyword) as the last line of a block, which is wrong.
-
- at DPATCH@
-diff -urNad trunk~/lib/pymode.sl trunk/lib/pymode.sl
---- trunk~/lib/pymode.sl	2006-02-13 18:51:58.000000000 +0100
-+++ trunk/lib/pymode.sl	2006-08-12 18:13:15.761345577 +0200
-@@ -95,13 +95,10 @@
- private define py_endblock_cmd()
- {
-    bol_skip_white();
--   if (looking_at("return") or
--       looking_at("raise")  or
--       looking_at("break")  or
--       looking_at("pass")  or
--       looking_at("continue"))
--     return 1;
--   return 0;
-+   push_mark();
-+   skip_chars("a-z");
-+   return is_list_element("return,raise,break,pass,continue",
-+                          bufsubstr(), ',') > 0;
- }
- 
- private define py_line_starts_subblock()

Modified: jed/branches/0.99.19/debian/rules
===================================================================
--- jed/branches/0.99.19/debian/rules	2007-05-15 14:53:37 UTC (rev 688)
+++ jed/branches/0.99.19/debian/rules	2007-05-15 15:26:06 UTC (rev 689)
@@ -172,14 +172,11 @@
 
 binary: binary-arch binary-indep
 
+JED_VER=0.99.19~pre78
 get-orig-source:
-	( url="svn://svn.gna.org/svn/jed/trunk" ;		\
-	  rev=$$(svn info $$url | grep ^Rev | sed "s/.*: //") ;	\
-	  ver=0.99.19.svn.$$rev ;				\
-	  dir=jed-$$ver ;					\
-	  svn export $$url $$dir ;				\
-	  rm -rf $$dir/info ;					\
-	  tar czf jed_$$ver.orig.tar.gz $$dir ;			\
-	  rm -rf $$dir )
+	svn export svn://svn.gna.org/svn/jed/trunk jed-$(JED_VER)
+	rm -rf jed-$(JED_VER)/info
+	tar czf jed_$(JED_VER).orig.tar.gz jed-$(JED_VER)
+	rm -rf jed-$(JED_VER)
 
 .PHONY: build clean binary binary-arch binary-indep get-orig-source




More information about the Pkg-jed-commit mailing list