Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package vim
A vim.desktop file is shipped by vim-common (for non-GUI versions of
Vim), but the icons it and gvim.desktop reference are only in
vim-gui-common. This upload moves the icons to vim-common, which all
vim variants Depend on.
$ debdiff vim_7.4.488-3.dsc vim_7.4.488-4.dsc
diffstat for vim-7.4.488 vim-7.4.488
changelog | 7 +++++++
control | 3 +++
vim-common.install.in | 4 ++++
vim-gui-common.install.in | 4 ----
4 files changed, 14 insertions(+), 4 deletions(-)
diff -Nru vim-7.4.488/debian/changelog vim-7.4.488/debian/changelog
--- vim-7.4.488/debian/changelog 2014-11-30 15:08:12.000000000 -0500
+++ vim-7.4.488/debian/changelog 2014-12-29 23:13:20.000000000 -0500
@@ -1,3 +1,10 @@
+vim (2:7.4.488-4) unstable; urgency=medium
+
+ * Move vim icon from vim-gui-common to vim-common since both vim.desktop and
+ gvim.desktop use it. (Closes: #773930)
+
+ -- James McCoy <james...@debian.org> Mon, 29 Dec 2014 23:13:17 -0500
+
vim (2:7.4.488-3) unstable; urgency=medium
* Install icons to /usr/share/icons/hicolor to work around #765069.
diff -Nru vim-7.4.488/debian/control vim-7.4.488/debian/control
--- vim-7.4.488/debian/control 2014-11-04 21:10:48.000000000 -0500
+++ vim-7.4.488/debian/control 2014-12-29 21:14:50.000000000 -0500
@@ -29,6 +29,9 @@
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: vim | vim-gnome | vim-gtk | vim-athena | vim-nox | vim-tiny
+# Move vim icon from vim-gui-common to vim-common
+Breaks: vim-gui-common (<< 2:7.4.488-4~)
+Replaces: vim-gui-common (<< 2:7.4.488-4~)
Description: Vi IMproved - Common files
Vim is an almost compatible version of the UNIX editor Vi.
.
diff -Nru vim-7.4.488/debian/vim-common.install.in
vim-7.4.488/debian/vim-common.install.in
--- vim-7.4.488/debian/vim-common.install.in 2014-11-04 19:41:11.000000000
-0500
+++ vim-7.4.488/debian/vim-common.install.in 2014-12-29 21:13:22.000000000
-0500
@@ -1,6 +1,10 @@
debian/tmp/usr/bin/xxd usr/bin/
debian/helpztags usr/bin/
debian/vim.desktop usr/share/applications/
+debian/icons/* usr/share/pixmaps/
+debian/icons/vim.svg
usr/share/icons/hicolor/scalable/apps/
+debian/icons/vim-16.xpm
usr/share/icons/hicolor/16x16/apps/vim.xpm
+debian/icons/vim-32.xpm
usr/share/icons/hicolor/32x32/apps/vim.xpm
debian/runtime/vimrc etc/vim/
debian/runtime/debian.vim usr/share/vim/@VIMCUR@/
debian/tmp/usr/share/man/man1/xxd.1 usr/share/man/man1/
diff -Nru vim-7.4.488/debian/vim-gui-common.install.in
vim-7.4.488/debian/vim-gui-common.install.in
--- vim-7.4.488/debian/vim-gui-common.install.in 2014-11-30
14:34:27.000000000 -0500
+++ vim-7.4.488/debian/vim-gui-common.install.in 2014-12-29
21:13:26.000000000 -0500
@@ -1,9 +1,5 @@
debian/tmp/usr/bin/gvimtutor usr/bin/
debian/gvim.desktop usr/share/applications/
-debian/icons/* usr/share/pixmaps/
-debian/icons/vim.svg
usr/share/icons/hicolor/scalable/apps/
-debian/icons/vim-16.xpm
usr/share/icons/hicolor/16x16/apps/vim.xpm
-debian/icons/vim-32.xpm
usr/share/icons/hicolor/32x32/apps/vim.xpm
debian/runtime/gvimrc etc/vim/
debian/tmp/usr/share/man/man1/evim.1 usr/share/man/man1/
debian/lintian/vim-gui-common
usr/share/lintian/overrides/
unblock vim/2:7.4.488-4
-- System Information:
Debian Release: 8.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
