Bug#338483: keeping vim outside of testing

[Adeodato Simó]

* Stefano Zacchiroli [Mon, 12 Dec 2005 21:37:36 +0100]:

> This bug is keeping vim 6.4 out of testing.

> Could you please do one of the following:
> 1) port the package so that it works with vim 6.4 (if possible)
> 2) ask for help on the pkg-vim-maintainers mailing list, we can consider
>    maintainaing vimacs collaboratively if you're interested (and if the
>    package still work with vim 6.4, of course)
> 3) ask for its removal from the unstable archive

  Looking at the previous uploads of vimacs, I don't think the
  maintainer is going to answer. Popcon lists 16 users in state
  'nofiles', whatever does means.

  I think (3) would be a reasonable option, but in case it takes long,
  I've just uploaded a NMU fixing this bug (using /usr/share/vim/addons
  as the install path, so this package should never get in vim's way,
  anymore. (So I did it because it's the fastest option.)

  Patch attached.

-- 
Adeodato Simó                                     dato at net.com.org.es
Debian Developer                                  adeodato at debian.org
 
                                   Listening to: Luke Vibert - Countdown
-------------- next part --------------
diff -u vimacs-0.95/debian/changelog vimacs-0.95/debian/changelog
--- vimacs-0.95/debian/changelog
+++ vimacs-0.95/debian/changelog
@@ -1,8 +1,25 @@
+vimacs (0.95-1.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+
+  * Update package to comply with the Debian Vim Scripts Policy document
+    (closes: #338483, package is installable again). Needed changes:
+    + debian/control:
+      - depend on unversioned vim, and do not conflict with any vim version.
+    + debian/rules, debian/dirs:
+      - install files in /usr/share/vim/addons, instead of /usr/share/vim/vim6X.
+    + debian/changelog:
+      - update reference to vimacs.txt path.
+
+  * Convert changelog to UTF-8.
+
+ -- Adeodato Simó <dato at net.com.org.es>  Mon, 12 Dec 2005 22:10:27 +0100
+
 vimacs (0.95-1.2) unstable; urgency=low
 
   * non-maintainer upload
   * updated package to vim 6.3 (closes: #265435)
-    + patch by Adeodato Simó
+    + patch by Adeodato Simó
   * debian/control:
     + depend on vim >= 6.3
     + conflict with vim >= 6.4
diff -u vimacs-0.95/debian/rules vimacs-0.95/debian/rules
--- vimacs-0.95/debian/rules
+++ vimacs-0.95/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-VIM_VERSION=63
-
 build: 
 
 clean:
@@ -16,8 +14,8 @@
 	dh_clean -k
 	dh_installdirs
 
-	cp -R plugin/* $(CURDIR)/debian/vimacs/usr/share/vim/vim$(VIM_VERSION)/plugin/
-	cp -R doc/* $(CURDIR)/debian/vimacs/usr/share/vim/vim$(VIM_VERSION)/doc/
+	cp -R plugin/* $(CURDIR)/debian/vimacs/usr/share/vim/addons/plugin/
+	cp -R doc/* $(CURDIR)/debian/vimacs/usr/share/vim/addons/doc/
 
 binary-arch:
 
diff -u vimacs-0.95/debian/control vimacs-0.95/debian/control
--- vimacs-0.95/debian/control
+++ vimacs-0.95/debian/control
@@ -7,8 +7,7 @@
 
 Package: vimacs
 Architecture: all
-Depends: vim (>= 1:6.3)
-Conflicts: vim (>= 1:6.4)
+Depends: vim
 Description: Emacs emulation for Vim
  Vimacs (_V_im-_i_mproved E_macs_) is a Vim plugin, which brings Emacs
  extensive keybindings and modeless editing features to the the Vim
diff -u vimacs-0.95/debian/postinst vimacs-0.95/debian/postinst
--- vimacs-0.95/debian/postinst
+++ vimacs-0.95/debian/postinst
@@ -4,7 +4,7 @@
 
 case "$1" in
     configure)
-        vim --cmd "helptags /usr/share/vim/vim63/doc/" --cmd "q"
+        vim --cmd "helptags /usr/share/vim/addons/doc/" --cmd "q"
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff -u vimacs-0.95/debian/dirs vimacs-0.95/debian/dirs
--- vimacs-0.95/debian/dirs
+++ vimacs-0.95/debian/dirs
@@ -1,2 +1,2 @@
-usr/share/vim/vim63/plugin
-usr/share/vim/vim63/doc
+usr/share/vim/addons/plugin
+usr/share/vim/addons/doc
diff -u vimacs-0.95/debian/copyright vimacs-0.95/debian/copyright
--- vimacs-0.95/debian/copyright
+++ vimacs-0.95/debian/copyright
@@ -12 +12 @@
-as /usr/share/vim/vim63/doc/vimacs.txt
+as /usr/share/vim/addons/doc/vimacs.txt