[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#698880: marked as done (unblock: ldapvi/1.7-9)

Your message dated Thu, 24 Jan 2013 21:13:54 +0100
with message-id <51019602.60806@thykier.net>
and subject line Re: Bug#698880: unblock: ldapvi/1.7-9
has caused the Debian Bug report #698880,
regarding unblock: ldapvi/1.7-9
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
698880: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698880
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package ldapvi

 The bug that is fixed by changing one word that is put into a comment
line of the file to be handed to vim makes it croak because the encoding
setting isn't allowed (anymore) in a modeline of vim and requires the
user to press enter every time they use ldapvi with vim as editor.

 The debdiff is kept to a minimum:

#v+
diff -u ldapvi-1.7/debian/changelog ldapvi-1.7/debian/changelog
--- ldapvi-1.7/debian/changelog
+++ ldapvi-1.7/debian/changelog
@@ -1,3 +1,10 @@
+ldapvi (1.7-9) unstable; urgency=low
+
+  * Use fileencoding instead of encoding in vim modeline which makes recent
+    versions of vim give an error (closes: #688129, #663121)
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Mon, 21 Jan 2013 16:28:10 +0100
+
 ldapvi (1.7-8) unstable; urgency=low
 
   * Really change libreadline5-dev to libreadline-dev this time
diff -u ldapvi-1.7/debian/patches/series ldapvi-1.7/debian/patches/series
--- ldapvi-1.7/debian/patches/series
+++ ldapvi-1.7/debian/patches/series
@@ -5,0 +6 @@
+06_fix-vim-modeline
only in patch2:
unchanged:
--- ldapvi-1.7.orig/debian/patches/06_fix-vim-modeline
+++ ldapvi-1.7/debian/patches/06_fix-vim-modeline
@@ -0,0 +1,18 @@
+Description: use fileencoding in vim modeline instead of encoding
+  The encoding setting is not allowed in modeline in recent vim versions,
+  so switch to fileencoding instead.
+Origin: http://lists.askja.de/pipermail/ldapvi/2011-January/000088.html
+Bug-Debian: http://bugs.debian.org/688129, http://bugs.debian.org/663121
+Author: Devin J. Pohly <djpohly@gmail.com>
+
+--- a/ldapvi.c
++++ b/ldapvi.c
+@@ -1414,7 +1414,7 @@
+ 	int nlines = 0;
+ 
+ 	if (print_binary_mode == PRINT_UTF8 && !cmdline->ldif) {
+-		fputs("# -*- coding: utf-8 -*- vim:encoding=utf-8:\n", s);
++		fputs("# -*- coding: utf-8 -*- vim:fileencoding=utf-8:\n", s);
+ 		nlines++;
+ 	}
+ 	if (cmdline->ldif) {
#v-

unblock ldapvi/1.7-9

 Thanks for considering,
Rhonda

--- End Message ---
--- Begin Message --- 
On 2013-01-24 20:23, Gerfried Fuchs wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> 
> Please unblock package ldapvi
> 
>  The bug that is fixed by changing one word that is put into a comment
> line of the file to be handed to vim makes it croak because the encoding
> setting isn't allowed (anymore) in a modeline of vim and requires the
> user to press enter every time they use ldapvi with vim as editor.
> 
>  The debdiff is kept to a minimum:
> 
> [...]
> 
> unblock ldapvi/1.7-9
> 
>  Thanks for considering,
> Rhonda
> 
> 

Unblocked, thanks.

~Niels

--- End Message ---
Reply to: