r623 - in /branches/packages/vim/vim7/debian: changelog control rules

[jamessan at users.alioth.debian.org]

Author: jamessan
Date: Sun Apr 23 13:57:01 2006
New Revision: 623

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=623
Log:
Update to 7.0e06 snapshot and change the Conflicts on manpages-(pl|it) to versioned Replaces

Modified:
    branches/packages/vim/vim7/debian/changelog
    branches/packages/vim/vim7/debian/control
    branches/packages/vim/vim7/debian/rules

Modified: branches/packages/vim/vim7/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7/debian/changelog?rev=623&op=diff
==============================================================================
--- branches/packages/vim/vim7/debian/changelog (original)
+++ branches/packages/vim/vim7/debian/changelog Sun Apr 23 13:57:01 2006
@@ -1,7 +1,7 @@
-vim (1:6.4+7.0e04-1) UNRELEASED; urgency=low
+vim (1:6.4+7.0e06-1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream snapshot (7.0e04).
+  * New upstream snapshot (7.0e06).
     + Remove 161_cmake-support.diff, merged upstream.
     + Recognize zsh-beta as a shell that supports '2>&1| tee' for the
       'shellpipe' option. (closes: #362999)
@@ -24,7 +24,7 @@
       VIM Maintainers
 
   [ James Vega ]
-  * Add Conflicts against manpages-it and manpages-pl since upstream now
+  * Add Replaces against manpages-it and manpages-pl since upstream now
     provides i10n manpages. (closes: #364299)
 
  -- James Vega <jamessan at debian.org>  Sun, 23 Apr 2006 00:58:01 -0400

Modified: branches/packages/vim/vim7/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7/debian/control?rev=623&op=diff
==============================================================================
--- branches/packages/vim/vim7/debian/control (original)
+++ branches/packages/vim/vim7/debian/control Sun Apr 23 13:57:01 2006
@@ -11,8 +11,8 @@
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: manpages-it, manpages-pl, vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
-Replaces: vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
+Conflicts: vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
+Replaces: manpages-it (<= 0.3.4-3), manpages-pl (<=20060331-1), vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
 Recommends: vim | vim-gnome | vim-gtk | vim-lesstif | vim-perl | vim-python | vim-ruby | vim-tcl | vim-full | vim-tiny
 Description: Vi IMproved - Common files
  Vim is an almost compatible version of the UNIX editor Vi.
@@ -30,8 +30,8 @@
 Priority: optional
 Architecture: all
 Depends: vim-common (= ${Source-Version})
-Conflicts: manpages-pl, vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
-Replaces: vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
+Conflicts: vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
+Replaces: manpages-pl (<=20060331-1), vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
 Recommends: vim-gnome | vim-gtk | vim-lesstif | vim-perl | vim-python | vim-ruby | vim-tcl | vim-full
 Description: Vi IMproved - Common GUI files
  Vim is an almost compatible version of the UNIX editor Vi.
@@ -48,8 +48,8 @@
 Package: vim-runtime
 Priority: optional
 Architecture: all
-Conflicts: manpages-pl, vim-common (<< 1:6.4-007+2), vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
-Replaces: vim-common (<< 1:6.4-007+2), vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
+Conflicts: vim-common (<< 1:6.4-007+2), vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
+Replaces: manpages-pl (<=20060331-1), vim-common (<< 1:6.4-007+2), vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
 Recommends: vim | vim-gnome | vim-gtk | vim-lesstif | vim-perl | vim-python | vim-ruby | vim-tcl | vim-full | vim-tiny
 Enhances: vim-tiny
 Description: Vi IMproved - Runtime files

Modified: branches/packages/vim/vim7/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7/debian/rules?rev=623&op=diff
==============================================================================
--- branches/packages/vim/vim7/debian/rules (original)
+++ branches/packages/vim/vim7/debian/rules Sun Apr 23 13:57:01 2006
@@ -162,7 +162,7 @@
 
 NAME=vim
 VERSION=7.0e
-SNAPSHOT=04
+SNAPSHOT=06
 DEBVERSION=6.4+$(VERSION)$(SNAPSHOT)
 SRCDIR=$(NAME)$(subst .,,$(VERSION))
 VIMCUR=$(SRCDIR)