[Pkg-jed-commit] r254 - in trunk/packages/jed-extra/debian: . patches

Thu Apr 6 14:27:42 UTC 2006

Author: jo-guest
Date: 2006-04-06 14:27:41 +0000 (Thu, 06 Apr 2006)
New Revision: 254

Modified:
   trunk/packages/jed-extra/debian/changelog
   trunk/packages/jed-extra/debian/control
   trunk/packages/jed-extra/debian/copyright
   trunk/packages/jed-extra/debian/patches/50_ispell-fix-requirements.dpatch
   trunk/packages/jed-extra/debian/rules
Log:
* jed-extra/debian/control:
  + extended build dependencies, we need dpatch and (jed or xjed)

* jed-extra/debian/patches/50_ispell-fix-requirements.dpatch:
  + updated

* jed-extra/debian/rules:
  + made the VER assignment robust against execution from anywhere else
    than the source dir

  + the jed-extra file in /u/s/j/compile need to be executable. The
    exec-flag of the file from the svn REPO gets lost in the .diff.gz file

* jed-extra/debian/copyright:
  + updated copyright file to comply more with
    http://lists.debian.org/debian-devel-announce/2006/03/msg00023.html


Modified: trunk/packages/jed-extra/debian/changelog
===================================================================

--- trunk/packages/jed-extra/debian/changelog	2006-04-06 14:27:22 UTC (rev 253)
+++ trunk/packages/jed-extra/debian/changelog	2006-04-06 14:27:41 UTC (rev 254)
@@ -1,22 +1,22 @@
 jed-extra (2.1-1) experimental; urgency=high
 
   NOT YET RELEASED!
-  
+
   TODO:
     + fine tune ini.sl (add missing autoloads and remove redundancy) by
-        - modifying upstream, 
-        - excluding offending modes from the auto-initialization, 
+        - modifying upstream,
+        - excluding offending modes from the auto-initialization,
         - adding stuff to 50jed-extra.sl
-        
+
     + create example alternative 50jed-extra.sl and example jed.rc
-    
-    + make upstream release of jedmodes-2.1 by GM (once it is ready and holds 
+
+    + 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
-  
+
   +++ Changes by Guenter Milde <milde at users.sf.net>
 
   * new upstream source URI
@@ -28,7 +28,7 @@
     using libdir.sl for "registering" of library directories
   * changed location of jed-extra library dir to /usr/share/jed/jed-extra/
   * removed patches for bugs fixed upstream
-  
+
   +++ Changes by Rafael Laboisssiere
 
   * The *.slc files are now generated at install-time
@@ -51,7 +51,7 @@
     server, sfrecent, tracker, tree, yankpop
 
   * the following modes were added by upstream:
-    
+
     filter-buffer, tm, libdir
 
   * updated debian/copyright about the sources
@@ -69,8 +69,10 @@
     README.tar.sl, in order to keep lintian happy) [now removed as tar is in
     experimental state, GM]
   * the example file for apsmode/apsconf is in examples
+  * updated copyright file to comply more with
+    http://lists.debian.org/debian-devel-announce/2006/03/msg00023.html
 
- -- Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>  
+ -- Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>  Thu, 6 Apr 2006 16:22:40 +0200
 
 jed-extra (1.0-1) experimental; urgency=low
 

Modified: trunk/packages/jed-extra/debian/control
===================================================================
--- trunk/packages/jed-extra/debian/control	2006-04-06 14:27:22 UTC (rev 253)
+++ trunk/packages/jed-extra/debian/control	2006-04-06 14:27:41 UTC (rev 254)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0)
+Build-Depends-Indep: debhelper (>> 4.0.0), dpatch, jed (>= 0.99.17.111-1) | xjed (>= 0.99.17.111-1)
 Standards-Version: 3.6.2
 
 Package: jed-extra

Modified: trunk/packages/jed-extra/debian/copyright
===================================================================
--- trunk/packages/jed-extra/debian/copyright	2006-04-06 14:27:22 UTC (rev 253)
+++ trunk/packages/jed-extra/debian/copyright	2006-04-06 14:27:41 UTC (rev 254)
@@ -1,6 +1,9 @@
 This package was debianized by Rafael Laboissiere <rafael at debian.org> on
 Fri, 11 Jul 2003 10:32:35 +0200.
 
+It is currently maintained by the
+          Debian Jed Group <pkg-jed-devel at lists.alioth.debian.org>
+
 The tarballs/files included in this release were downloaded from:
 
      http://jedmodes.sf.net/cvs/jedmodes.tgz
@@ -22,7 +25,7 @@
     Sommer,    Jörg
     Wheeler,   Kyle
 
-Jedmodes comes with its own mail list: 
+Jedmodes comes with its own mailing list:
 
     jedmodes-users at lists.sourceforge.net
 
@@ -30,5 +33,18 @@
     All files in this package are released under the GNU General Public
     License.
 
-    For the complete text of the GPL, see /usr/share/common-licenses/GPL
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License.
 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+   On Debian systems, the complete text of the GNU General Public
+   License, version 2, can be found in /usr/share/common-licenses/GPL-2.

Modified: trunk/packages/jed-extra/debian/patches/50_ispell-fix-requirements.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/50_ispell-fix-requirements.dpatch	2006-04-06 14:27:22 UTC (rev 253)
+++ trunk/packages/jed-extra/debian/patches/50_ispell-fix-requirements.dpatch	2006-04-06 14:27:41 UTC (rev 254)
@@ -7,11 +7,10 @@
 diff -urNad --exclude=CVS --exclude=.svn ./ispell/ispell_init.sl /tmp/dpep-work.wIsxzL/mode.cvs/ispell/ispell_init.sl
 --- ./ispell/ispell_init.sl	2005-06-16 10:54:35.000000000 +0200
 +++ /tmp/dpep-work.wIsxzL/mode.cvs/ispell/ispell_init.sl	2005-07-04 00:56:49.007973624 +0200
-@@ -26,7 +26,9 @@
+@@ -26,6 +26,8 @@
  	  "flyspell_region", "flyspell",
- 	  "auto_ispell", "ispell",
  	  "ispell_region", "ispell",
--	  "vispell", "vispell", 10);
+-	  "vispell", "vispell", 9);
 +	  "vispell", "vispell",
 +	  "push_defaults", "sl_utils",
 +	  "menu_radio", "menu_utils", 12);

Modified: trunk/packages/jed-extra/debian/rules
===================================================================
--- trunk/packages/jed-extra/debian/rules	2006-04-06 14:27:22 UTC (rev 253)
+++ trunk/packages/jed-extra/debian/rules	2006-04-06 14:27:41 UTC (rev 254)
@@ -11,7 +11,8 @@
 
 debroot = $(PWD)/debian/jed-extra
 # upstream version
-VER = $(shell perl -ne '/([\d.]+)-/; print $$1; exit' < debian/changelog)
+VER = $(shell perl -ne '/([\d.]+)-/; print $$1; exit' < \
+                      $(dir $(firstword $(MAKEFILE_LIST)))/changelog)
 
 
 build:
@@ -30,9 +31,11 @@
 	# 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
-	# local copy
-	# cp ~/.jed/jedmodes/src/jedmodes-$(VER).tgz .
+	if [ -e ~/.jed/jedmodes/src/jedmodes-$(VER).tgz ]; then \
+	    cp ~/.jed/jedmodes/src/jedmodes-$(VER).tgz .; \
+	else \
+	    wget  http://jedmodes.sf.net/cvs/jedmodes-$(VER).tgz; \
+	fi
 	
 	# rename
 	mv jedmodes-$(VER).tgz jed-extra_$(VER).orig.tar.gz
@@ -77,6 +80,8 @@
 	mv $(debroot)/usr/share/jed/compile/compile \
 	    $(debroot)/usr/share/jed/compile/jed-extra
 
+	chmod +x $(debroot)/usr/share/jed/compile/jed-extra
+
 	#dh_installdebconf
 	
 	dh_installchangelogs


