Your message dated Thu, 11 Oct 2012 06:04:46 +0100
with message-id <[email protected]>
and subject line Re: Bug#690195: unblock: vim-scripts/20121007
has caused the Debian Bug report #690195,
regarding unblock: vim-scripts/20121007
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 [email protected]
immediately.)
--
690195: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690195
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package vim-scripts
This upload adds support for svn 1.7 to the vcscommand plugin and
xz-compressed debs to debPlugin. Both patches are pretty minimal.
Debdiff attached.
unblock vim-scripts/20121007
--
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <[email protected]>
diff -Naur vim-scripts-20110813/debian/changelog
vim-scripts-20121007/debian/changelog
--- vim-scripts-20110813/debian/changelog 2011-08-13 23:11:50.000000000
-0400
+++ vim-scripts-20121007/debian/changelog 2012-10-07 11:16:17.000000000
-0400
@@ -1,3 +1,13 @@
+vim-scripts (20121007) unstable; urgency=low
+
+ * Update Vcs-* URLs.
+ * vcscommand: Backport patch from upstream to handle svn 1.7. (Closes:
+ #688093)
+ * debPlugin: Add support for xz compressed debs. Thanks to Jakub Wilk for
+ the patch. (Closes: #644172)
+
+ -- James McCoy <[email protected]> Sun, 07 Oct 2012 11:15:37 -0400
+
vim-scripts (20110813) unstable; urgency=low
* Rename "colors sampler pack" to "colors-sampler-pack" so it's easier to
diff -Naur vim-scripts-20110813/debian/control
vim-scripts-20121007/debian/control
--- vim-scripts-20110813/debian/control 2011-08-13 23:11:50.000000000 -0400
+++ vim-scripts-20121007/debian/control 2012-10-07 11:16:17.000000000 -0400
@@ -2,13 +2,13 @@
Section: editors
Priority: optional
Maintainer: Debian Vim Maintainers
<[email protected]>
-Uploaders: Michael Piefel <[email protected]>, James Vega <[email protected]>
+Uploaders: Michael Piefel <[email protected]>, James McCoy
<[email protected]>
Build-Depends: cdbs, debhelper (>> 5.0.0), quilt
Build-Depends-Indep: xsltproc, docbook-xsl
Standards-Version: 3.9.2.0
Homepage: http://www.vim.org/scripts/
-Vcs-Git: git://git.debian.org/git/pkg-vim/vim-scripts.git
-Vcs-Browser: http://git.debian.org/?p=pkg-vim/vim-scripts.git
+Vcs-Git: git://anonscm.debian.org/pkg-vim/vim-scripts.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-vim/vim-scripts.git
Package: vim-scripts
Architecture: all
diff -Naur vim-scripts-20110813/debian/patches/deb.vim-xz.diff
vim-scripts-20121007/debian/patches/deb.vim-xz.diff
--- vim-scripts-20110813/debian/patches/deb.vim-xz.diff 1969-12-31
19:00:00.000000000 -0500
+++ vim-scripts-20121007/debian/patches/deb.vim-xz.diff 2012-10-07
11:16:17.000000000 -0400
@@ -0,0 +1,25 @@
+Subject: Add support for xz-compressed debs
+Author: Jakub Wilk <[email protected]>
+Bug-Debian: http://bugs.debian.org/644172
+
+diff --git a/autoload/deb.vim b/autoload/deb.vim
+--- a/autoload/deb.vim
++++ b/autoload/deb.vim
+@@ -32,6 +32,8 @@
+ let l:unpcmp = "tar zxfO "
+ elseif l:archmember == "data.tar.bz2"
+ let l:unpcmp = "tar jxfO "
++ elseif l:archmember == "data.tar.xz"
++ let l:unpcmp = "tar JxfO "
+ elseif l:archmember == "data.tar.lzma"
+ if !s:hascmd("lzma")
+ return
+@@ -230,7 +232,7 @@
+ " return data file name for debian package. This can be either data.tar.gz,
+ " data.tar.bz2 or data.tar.lzma
+ fun s:dataFileName(deb)
+- for fn in ["data.tar.gz", "data.tar.bz2", "data.tar.lzma", "data.tar"]
++ for fn in ["data.tar.gz", "data.tar.bz2", "data.tar.lzma", "data.tar.xz",
"data.tar"]
+ " [0:-2] is to remove trailing null character from command output
+ if (system("ar t " . "'" . a:deb . "'" . " " . fn))[0:-2] == fn
+ return fn
diff -Naur vim-scripts-20110813/debian/patches/series
vim-scripts-20121007/debian/patches/series
--- vim-scripts-20110813/debian/patches/series 2011-08-13 23:11:50.000000000
-0400
+++ vim-scripts-20121007/debian/patches/series 2012-10-07 11:16:17.000000000
-0400
@@ -18,3 +18,5 @@
lbdbq-query.diff
lbdbq-detect-lbdbq.diff
disabledby-doxygentoolkit.diff
+vcscommand-svn1.7.diff
+deb.vim-xz.diff
diff -Naur vim-scripts-20110813/debian/patches/vcscommand-svn1.7.diff
vim-scripts-20121007/debian/patches/vcscommand-svn1.7.diff
--- vim-scripts-20110813/debian/patches/vcscommand-svn1.7.diff 1969-12-31
19:00:00.000000000 -0500
+++ vim-scripts-20121007/debian/patches/vcscommand-svn1.7.diff 2012-10-07
11:16:17.000000000 -0400
@@ -0,0 +1,44 @@
+commit f0750a4e0b1606e51807d7157759b3a5e1e9760d
+Author: Bob Hiestand <[email protected]>
+Date: Tue Oct 18 10:50:12 2011 -0500
+
+ identify via 'svn info'
+
+ don't look for .svn directories as svn 1.7 breaks that method
+
+--- a/plugin/vcssvn.vim
++++ b/plugin/vcssvn.vim
+@@ -90,22 +90,17 @@
+
+ " Function: s:svnFunctions.Identify(buffer) {{{2
+ function! s:svnFunctions.Identify(buffer)
+- let fileName = resolve(bufname(a:buffer))
+- if isdirectory(fileName)
+- let directoryName = fileName
+- else
+- let directoryName = fnamemodify(fileName, ':h')
+- endif
+- if strlen(directoryName) > 0
+- let svnDir = directoryName . '/.svn'
+- else
+- let svnDir = '.svn'
+- endif
+- if isdirectory(svnDir)
+- return 1
+- else
+- return 0
+- endif
++ let oldCwd =
VCSCommandChangeToCurrentFileDir(resolve(bufname(a:buffer)))
++ try
++ call s:VCSCommandUtility.system(s:Executable() . ' info .')
++ if(v:shell_error)
++ return 0
++ else
++ return g:VCSCOMMAND_IDENTIFY_EXACT
++ endif
++ finally
++ call VCSCommandChdir(oldCwd)
++ endtry
+ endfunction
+
+ " Function: s:svnFunctions.Add() {{{2
--- End Message ---
--- Begin Message ---
On Wed, 2012-10-10 at 21:31 -0400, James McCoy wrote:
> Please unblock package vim-scripts
>
> This upload adds support for svn 1.7 to the vcscommand plugin and
> xz-compressed debs to debPlugin. Both patches are pretty minimal.
> Debdiff attached.
Unblocked; thanks.
Regards,
Adam
--- End Message ---
