[Pkg-jed-commit] [SCM] Debian packaging of JED branch, master, updated. 1%3A0.99.18+dfsg.1-10-308-g429f421

[Jörg Sommer]

The following commit has been merged in the master branch:
commit 2b9aaacbac1319f58b6b591a033c0f45b03a33dc
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date:   Sun Nov 29 15:04:43 2009 +0100

    jed-common: Remove conflict on jed-extra (<= 2.3.2-3)
    
    The version of jed-extra in stable is 2.5.1, hence we do not have to
    provide this conflict anymore.

diff --git a/debian/changelog b/debian/changelog
index 4665b1d..0afacd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ jed (1:0.99.19-1) UNRELEASED; urgency=low
     to satisfy recommendation of Policy 2.5 regarding optional
     packages.
 
+  * Drop conflict with jed-extra <= 2.3.2-3, stable version is newer
+    than this.
+
  -- Jörg Sommer <joerg at alea.gnuu.de>  Thu, 01 Jan 1970 00:00:00 +0000
 
 jed (1:0.99.19~pre210-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 71fcb10..d00eb7f 100644
--- a/debian/control
+++ b/debian/control
@@ -79,7 +79,7 @@ Description: editor for programmers (x11 version)
 Package: jed-common
 Architecture: all
 Replaces: jed-sl
-Conflicts: jed-sl, jed-extra (<= 2.3.2-3)
+Conflicts: jed-sl
 Recommends: jed | xjed
 Suggests: info | info-browser
 Depends: ${misc:Depends}, slsh

-- 
Debian packaging of JED