[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-78-ge324435

James Vega jamessan at debian.org
Mon Apr 14 15:57:46 UTC 2008


The following commit has been merged in the debian branch:
commit e324435d3d73434f026821aaa1faf5112daf6b19
Author: James Vega <jamessan at debian.org>
Date:   Mon Apr 14 11:45:36 2008 -0400

    Cleanup Conflicts/Provides/Replaces related to transition packages.
    
    - Transition packages (vim-$language, vim-full) no longer have Provides.
    - The packages which are Depended on by transition packages no longer
      Conflict/Replace the transition package.
    - Clarify the wording of the changelog entry for the new Provides.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 69f9b89..682a8b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
 vim (1:7.1.291-2) UNRELEASED; urgency=low
 
   * debian/control:
-    - Add Provides/Conflicts/Replaces for vim-{ruby,python,perl,tcl} in any
-      variant that supports those language bindings since some packages want a
-      vim that supports a certain language.
+    - Add Provides for vim-{ruby,python,perl,tcl} to any variant that supports
+      those language bindings since some packages benefit from being able to
+      specify a Depends on a vim package with support for a specific language.
     - Only Build-Depend on libselinux1-dev for linux systems.
+    - Remove Provides from the transition packages.
   * runtime/filetype.vim:
     - Use "setf" instead of "set ft" when setting the filetype to git so that
       we don't override another filetype which may have been set during
diff --git a/debian/control b/debian/control
index cbb5090..2b7c45e 100644
--- a/debian/control
+++ b/debian/control
@@ -137,7 +137,6 @@ Package: vim-perl
 Priority: extra
 Architecture: all
 Depends: vim-gtk (>= 1:7.1-135+1)
-Provides: gvim, editor
 Description: Vi IMproved - enhanced vi editor (transitional package)
  This package is simply a transitional package from individual
  vim-$language packages to vim-gtk.
@@ -146,7 +145,6 @@ Package: vim-python
 Priority: extra
 Architecture: all
 Depends: vim-gtk (>= 1:7.1-135+1)
-Provides: gvim, editor
 Description: Vi IMproved - enhanced vi editor (transitional package)
  This package is simply a transitional package from individual
  vim-$language packages to vim-gtk.
@@ -155,7 +153,6 @@ Package: vim-ruby
 Priority: extra
 Architecture: all
 Depends: vim-gtk (>= 1:7.1-135+1)
-Provides: gvim, editor
 Description: Vi IMproved - enhanced vi editor (transitional package)
  This package is simply a transitional package from individual
  vim-$language packages to vim-gtk.
@@ -164,7 +161,6 @@ Package: vim-tcl
 Priority: extra
 Architecture: all
 Depends: vim-gtk (>= 1:7.1-135+1)
-Provides: gvim, editor
 Description: Vi IMproved - enhanced vi editor (transitional package)
  This package is simply a transitional package from individual
  vim-$language packages to vim-gtk.
@@ -173,8 +169,6 @@ Package: vim-gtk
 Priority: extra
 Architecture: any
 Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
-Conflicts: vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1)
-Replaces: vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1)
 Suggests: cscope, vim-doc, ttf-dejavu, gnome-icon-theme
 Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl
 Description: Vi IMproved - enhanced vi editor - with GTK2 GUI
@@ -191,8 +185,6 @@ Package: vim-nox
 Priority: extra
 Architecture: any
 Depends: vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
-Conflicts: vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1)
-Replaces: vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1)
 Suggests: cscope, vim-doc
 Provides: vim, editor, vim-perl, vim-python, vim-ruby, vim-tcl
 Description: Vi IMproved - enhanced vi editor
@@ -209,8 +201,6 @@ Package: vim-lesstif
 Priority: extra
 Architecture: any
 Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
-Conflicts: vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1)
-Replaces: vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1)
 Suggests: cscope, vim-doc, ttf-dejavu
 Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl
 Description: Vi IMproved - enhanced vi editor - with LessTif GUI
@@ -227,8 +217,6 @@ Package: vim-gnome
 Priority: extra
 Architecture: any
 Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
-Conflicts: vim-full (<< 1:7.1-135+1), vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1)
-Replaces: vim-full (<< 1:7.1-135+1), vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1)
 Suggests: cscope, vim-doc, ttf-dejavu, gnome-icon-theme
 Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl
 Description: Vi IMproved - enhanced vi editor - with GNOME2 GUI
@@ -245,6 +233,5 @@ Package: vim-full
 Priority: extra
 Architecture: all
 Depends: vim-gnome (>= 1:7.1-135+1)
-Provides: gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl
 Description: Vi IMproved - enhanced vi editor (transitional package)
  This package is simply a transitional package from vim-full to vim-gnome.

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list