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

[Guenter Milde]

Author: milde-guest
Date: 2006-06-15 07:34:42 +0000 (Thu, 15 Jun 2006)
New Revision: 333

Modified:
   trunk/packages/jed/debian/changelog
   trunk/packages/jed/debian/control
Log:
Cleanup Conflicts (as proposed by J?\195?\182rg Sommer)


Modified: trunk/packages/jed/debian/changelog
===================================================================
--- trunk/packages/jed/debian/changelog	2006-06-13 12:30:59 UTC (rev 332)
+++ trunk/packages/jed/debian/changelog	2006-06-15 07:34:42 UTC (rev 333)
@@ -12,14 +12,15 @@
     
   * debian/control:
     - Make sure jed|xjed and jed-common are of the same version. 
-      jed|xjed depend on jed-common (same version),
-      jed-common is not broken without jed|xjed, so it just recommends
-      them and conflicts with earlier versions. 
+       + jed|xjed depend on jed-common (same version),
+       + jed-common recommends jed|xjed and conflicts with earlier versions
+         (as it is not broken without jed|xjed).
     - Removed the conflict with jed-extra (<= 1.0-1) as jed-extra will not
-      break jed|xjed
-      (jed-common will not work by default, as jed|xjed now uses the startup
-      dir /etc/jed-init.d/ instead of /etc/jed.d/. Some modes of jed-extra
-      will fail with SLang2. See also NEWS) [GM]
+      break jed|xjed (jed-common will not work by default, as jed|xjed now
+      uses the startup dir /etc/jed-init.d/ instead of /etc/jed.d/. Some
+      modes of jed-extra will fail with SLang2. See also NEWS)
+    - Removed the obsolete Conflict and Replace of jedslc, jedsl, jedsl-src,
+      and jed (<< 0.99.10-2) These packages are older than /oldstable.
   
  -- Rafael Laboissiere <rafael at debian.org>  Wed, 07 Jun 2006 13:48:13 +0200
 

Modified: trunk/packages/jed/debian/control
===================================================================
--- trunk/packages/jed/debian/control	2006-06-13 12:30:59 UTC (rev 332)
+++ trunk/packages/jed/debian/control	2006-06-15 07:34:42 UTC (rev 333)
@@ -70,8 +70,8 @@
 
 Package: jed-common
 Architecture: all
-Replaces: jedslc, jedsl, jed-sl, jedsl-src, jed (<< 0.99.10-2)
-Conflicts: jedslc, jedsl, jed-sl, jedsl-src, jed (<< ${Source-Version}), xjed (<< ${Source-Version})
+Replaces: jed-sl
+Conflicts: jed-sl, jed (<< ${Source-Version}), xjed (<< ${Source-Version})
 Recommends: jed | xjed
 Depends: debconf | debconf-2.0, findutils (>= 4.1.20-6)
 Description: S-Lang runtime files for jed and xjed