[Pkg-jed-commit] r317 - trunk/packages/jed/debian

[Guenter Milde]

Author: milde-guest
Date: 2006-06-07 15:03:06 +0000 (Wed, 07 Jun 2006)
New Revision: 317

Modified:
   trunk/packages/jed/debian/changelog
   trunk/packages/jed/debian/control
   trunk/packages/jed/debian/rules
Log:
control: move the conflict with old jed-extra from jed-common to jed & xjed
rules:   name the orig tarball according to the maintainers guide (ch 3.4):
          Beachten Sie zwei wichtige Stellen in dem Dateinamen: 
          *Paketname und Version sind durch das Zeichen "_" getrennt. 
          *Es steht "orig." vor "tar.gz". 




Modified: trunk/packages/jed/debian/changelog
===================================================================
--- trunk/packages/jed/debian/changelog	2006-06-06 09:51:44 UTC (rev 316)
+++ trunk/packages/jed/debian/changelog	2006-06-07 15:03:06 UTC (rev 317)
@@ -4,10 +4,10 @@
 
   * Documentation update (README.Debian, README.Debian-startup) [GM]
 
-  * debian/po/cs.po: Added Czech translationsfor debconf templates,
+  * debian/po/cs.po: Added Czech translations for debconf templates,
     thanks to Miroslav Kure <kurem at upcase.inf.upol.cz> [RL]
 
- --
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 07 Jun 2006 13:48:13 +0200
 
 jed (0.99.18-1) experimental; urgency=low
 

Modified: trunk/packages/jed/debian/control
===================================================================
--- trunk/packages/jed/debian/control	2006-06-06 09:51:44 UTC (rev 316)
+++ trunk/packages/jed/debian/control	2006-06-07 15:03:06 UTC (rev 317)
@@ -9,6 +9,7 @@
 
 Package: jed
 Architecture: any
+Conflicts: jed-extra (<= 1.0-1)
 Depends: ${shlibs:Depends}, jed-common (>= ${Source-Version})
 Provides: info-browser, mail-reader, editor
 Description: editor for programmers (textmode version)
@@ -37,6 +38,7 @@
 
 Package: xjed
 Architecture: any
+Conflicts: jed-extra (<= 1.0-1)
 Depends: ${shlibs:Depends}, jed-common (>= ${Source-Version})
 Provides: info-browser, mail-reader, editor
 Description: editor for programmers (x11 version)
@@ -67,7 +69,7 @@
 Package: jed-common
 Architecture: all
 Replaces: jedslc, jedsl, jedsl-src, jed (<< 0.99.10-2), jed-sl
-Conflicts: jedslc, jedsl, jedsl-src, jed (<< 0.99.10-2), jed-sl, jed-extra (<= 1.0-1)
+Conflicts: jedslc, jedsl, jedsl-src, jed (<< 0.99.10-2), jed-sl
 Recommends: jed | xjed
 Depends: debconf | debconf-2.0, findutils (>= 4.1.20-6)
 Description: S-Lang runtime files for jed and xjed

Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules	2006-06-06 09:51:44 UTC (rev 316)
+++ trunk/packages/jed/debian/rules	2006-06-07 15:03:06 UTC (rev 317)
@@ -144,6 +144,6 @@
 
 get-orig-source: 
 	wget ftp://space.mit.edu/pub/davis/jed/v0.99/jed-$(UPSTREAM_VERSION).tar.gz
-	mv jed-$(UPSTREAM_VERSION).tar.gz jed-$(UPSTREAM_VERSION).orig.tar.gz
+	mv jed-$(UPSTREAM_VERSION).tar.gz jed_$(UPSTREAM_VERSION).orig.tar.gz
 
 .PHONY: build clean binary binary-arch binary-indep get-orig-source