r622 - in /branches/packages/vim/vim7/debian: changelog control

[jamessan at users.alioth.debian.org]

Author: jamessan
Date: Sun Apr 23 05:01:12 2006
New Revision: 622

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=622
Log:
Add Conflicts for i10n manpages.

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

Modified: branches/packages/vim/vim7/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7/debian/changelog?rev=622&op=diff
==============================================================================
--- branches/packages/vim/vim7/debian/changelog (original)
+++ branches/packages/vim/vim7/debian/changelog Sun Apr 23 05:01:12 2006
@@ -23,7 +23,11 @@
     + syntax/debchangelog.vim is now officially maintained upstream by Debian
       VIM Maintainers
 
- -- James Vega <jamessan at debian.org>  Fri, 21 Apr 2006 09:51:20 -0400
+  [ James Vega ]
+  * Add Conflicts 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
 
 vim (1:6.4+7.0d03-1) experimental; urgency=low
 

Modified: branches/packages/vim/vim7/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7/debian/control?rev=622&op=diff
==============================================================================
--- branches/packages/vim/vim7/debian/control (original)
+++ branches/packages/vim/vim7/debian/control Sun Apr 23 05:01:12 2006
@@ -11,7 +11,7 @@
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}
-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)
+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)
 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
@@ -30,7 +30,7 @@
 Priority: optional
 Architecture: all
 Depends: vim-common (= ${Source-Version})
-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)
+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)
 Recommends: vim-gnome | vim-gtk | vim-lesstif | vim-perl | vim-python | vim-ruby | vim-tcl | vim-full
 Description: Vi IMproved - Common GUI files
@@ -48,7 +48,7 @@
 Package: vim-runtime
 Priority: optional
 Architecture: all
-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)
+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)
 Recommends: vim | vim-gnome | vim-gtk | vim-lesstif | vim-perl | vim-python | vim-ruby | vim-tcl | vim-full | vim-tiny
 Enhances: vim-tiny