Merge lp:~sonia/ubuntu/quantal/vim-scripts/fix-for-31204 into lp:ubuntu/quantal/vim-scripts

Proposed by Sonia Hamilton
Status: Merged
Merge reported by: Stéphane Graber
Merged at revision: not available
Proposed branch: lp:~sonia/ubuntu/quantal/vim-scripts/fix-for-31204
Merge into: lp:ubuntu/quantal/vim-scripts
Diff against target: 72 lines (+48/-2)
2 files modified
debian/changelog (+9/-0)
debian/control (+39/-2)
To merge this branch: bzr merge lp:~sonia/ubuntu/quantal/vim-scripts/fix-for-31204
Reviewer Review Type Date Requested Status
Sonia Hamilton (community) Needs Resubmitting
Scott Kitterman Needs Fixing
Ubuntu branches Pending
Review via email: mp+126966@code.launchpad.net

Description of the change

Updated the description to give a better indication of what's included in the package. (LP: #31204).

This is my first merge proposal - feedback welcome.

To post a comment you must log in.
Revision history for this message
Scott Kitterman (kitterman) wrote :

For changes inside the debian dir, you don't use a patch. Just make the change directly. Also you added exuberant-ctags, aspell, and ispell to Suggests, but don't mention it in debian/changelog (which should be a record of all changes and particularly why).

review: Needs Fixing
14. By Sonia Hamilton

* Updated the description to give a better indication of what's included in
  the package. (LP: #31204)
* Appended exuberant-ctags, aspell, ispell to the Suggests field, as they
  would enhance the usefulness of some of the plugins. (LP: #31204)

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

The description is much better now, indeed. Looking at the package, it seems that it has evolved since #31204 was filed. There are now git/bzr/hg plugins and a few others not mentioned. And maintaining this list is not automatic. I see that some plugins use the "File:" or "Help:" header to describe themselves. Maybe these can be automatically harvested and added to the description?

Anyway that is just a suggestion...

"Here is an abbreviated summary of the included scripts:"
should be changed to
"Here is an abbreviated summary of some of the included scripts:"

Or document the rest of them? =)

15. By Sonia Hamilton

change wording of description

Revision history for this message
Sonia Hamilton (sonia) wrote :

Hi Dmitrijs,

Automatically maintaining the description would be difficult, as the tags used in the scripts are inconsistent. If you do a `egrep -r 'Help:|File' *` you'll see what I mean.

The git/bzr/hg plugins are covered by the inclusion of vcscommand.vim in the list of general plugins - it covers "cvs, svn, git, hg, bzr, svk".

Revision history for this message
Sonia Hamilton (sonia) wrote :

I notice that this is similar to Evolution Plugins http://packages.ubuntu.com/quantal/evolution-plugins.

Is there anything else I need to do to get this sponsored?

review: Needs Resubmitting (fixed 'needs fixing')
Revision history for this message
Sonia Hamilton (sonia) wrote :

@infinity on #ubuntu-devel said:

soniah: None of those changes look Ubuntu-specific in the least, have you
                  proposed the patch to the Debian maintainer?
soniah: He actually literally JUST did an upload to Debian, and he's on IRC
                  right now as jamessan.
soniah: We try to make sure all our (non-Ubuntu-specific) patches end up
                  pushed to Debian, so it really makes sense to just start there, IMO.
soniah: Makes sense doubly-so right now, since Ubuntu is in a freeze leading
                  up to a release, so uploading for cosmetic fixes seems less likely.

11:35 -!- jamessan [~jamessan@debian/developer/jamessan]
11:35 -!- ircname : James McCoy
11:35 -!- server : lindbohm.freenode.net [Stockholm, Sweden]
11:35 -!- away : stuff
11:35 -!- account : jamessan
11:35 -!- End of WHOIS
11:37 -!- * jamessan G 0 ~jamessan@debian/developer/jamessan [James McCoy]

Revision history for this message
Serge Hallyn (serge-hallyn) wrote :

@Sonia,

given your last comment, did you in fact talk to the Debian maintainer? You could also simply submit it as a debian bug and link it here. In either case, if you are going to go that route (which is encouraged) then the merge request can be closed as we'll get the fix through Debian.

Revision history for this message
Sonia Hamilton (sonia) wrote :

Hi Serge,

I've been busy at work. I contacted the Debian developer, and I'm going
to submit a patch to him.

Sonia.

On Sat, Oct 20, 2012, at 06:00, Serge Hallyn wrote:
> @Sonia,
>
> given your last comment, did you in fact talk to the Debian maintainer?
> You could also simply submit it as a debian bug and link it here. In
> either case, if you are going to go that route (which is encouraged) then
> the merge request can be closed as we'll get the fix through Debian.
> --
> https://code.launchpad.net/~sonia/ubuntu/quantal/vim-scripts/fix-for-31204/+merge/126966
> You are the owner of lp:~sonia/ubuntu/quantal/vim-scripts/fix-for-31204.

Revision history for this message
Sonia Hamilton (sonia) wrote :

I've emailed the patch to the debian maintainer (jamessan@) - I'll wait for his reply.

I'm not sure of the next step I should take on the Ubuntu side.

review: Needs Resubmitting
Revision history for this message
Sebastien Bacher (seb128) wrote :

did you get any news from the debian maintainer? is there any chance you could open a bug on the Debian BTS for public tracking? not sure we want a diff in Ubuntu for that since we are currently on sync with Debian for that source...

Revision history for this message
Sonia Hamilton (sonia) wrote :

My understanding is that a fix has been released, so no more work needs to be done on this bug.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-08-13 23:11:06 +0000
+++ debian/changelog 2012-09-30 11:13:21 +0000
@@ -1,3 +1,12 @@
1vim-scripts (20110813ubuntu1) UNRELEASED; urgency=low
2
3 * Updated the description to give a better indication of what's included in
4 the package. (LP: #31204)
5 * Appended exuberant-ctags, aspell, ispell to the Suggests field, as they
6 would enhance the usefulness of some of the plugins. (LP: #31204)
7
8 -- Sonia Hamilton <sonia@snowfrog.net> Fri, 28 Sep 2012 23:30:10 +1000
9
1vim-scripts (20110813) unstable; urgency=low10vim-scripts (20110813) unstable; urgency=low
211
3 * Rename "colors sampler pack" to "colors-sampler-pack" so it's easier to12 * Rename "colors sampler pack" to "colors-sampler-pack" so it's easier to
413
=== modified file 'debian/control'
--- debian/control 2011-08-13 23:11:06 +0000
+++ debian/control 2012-09-30 11:13:21 +0000
@@ -14,7 +14,7 @@
14Architecture: all14Architecture: all
15Depends: ${misc:Depends}15Depends: ${misc:Depends}
16Recommends: vim, vim-addon-manager16Recommends: vim, vim-addon-manager
17Suggests: perlsgml, libtemplate-perl17Suggests: perlsgml, libtemplate-perl, exuberant-ctags, aspell, ispell
18Enhances: vim18Enhances: vim
19Description: plugins for vim, adding bells and whistles19Description: plugins for vim, adding bells and whistles
20 Vim is a very capable editor. Its scripting support allows the use of plugins20 Vim is a very capable editor. Its scripting support allows the use of plugins
@@ -24,4 +24,41 @@
24 .24 .
25 This is a collection of some of those scripts on a purely subjective and biased25 This is a collection of some of those scripts on a purely subjective and biased
26 basis. Users can thus have some nice scripts without having to go searching.26 basis. Users can thus have some nice scripts without having to go searching.
27 The scripts can be installed globally or on a per user basis.27 The scripts can be installed globally or on a per user basis. Here is an
28 abbreviated summary of some of the included scripts:
29 .
30 Filetype Plugins
31 * po.vim - Easier editing of PO multi-lingual translation files
32 * xml.vim - Helper for editing XML, HTML, and SGML documents
33 .
34 Games
35 * VimSokoban_sokoban.vim - Sokoban Game for Vim
36 * tetris.vim - Tetris for Vim
37 .
38 General Plugins
39 * Align.vim - Provides commands to help produce aligned text, eqns, declarations
40 * EnhancedCommentify.vim - Quickly comment lines in a program
41 * NERD_commenter.vim - easy code commenting
42 * a.vim - Alternate Files quickly (.c --> .h etc)
43 * bufexplorer.vim - Easily switch between buffers without knowing their numbers
44 * calendar.vim - Calendar
45 * cvscommand.vim - CVS integration plugin
46 * cvsmenu.vim - CVS menu supporting most CVS commands
47 * gnupg.vim - Transparent editing of gpg encrypted files
48 * info.vim - GNU info documentation browser
49 * minibufexpl.vim - Elegant buffer explorer - takes very little screen space
50 * svncommand.vim - Subversion (svn) integration plugin
51 * taglist.vim - Source code browser (supports dozens of langauges)
52 * themes.vim - All the color schemes on vim.sf.net, with menu
53 * utl.vim - Univeral Text Linking - Execute URLs in plain text
54 * vcscommand.vim - Commands for cvs, svn, git, hg, bzr, svk
55 * vimspell.vim - ispell or aspell based spell checker with fly-spelling
56 * whatdomain.vim - Find out the meaning of any Top Level Domain
57 * winmanager.vim - A windows style IDE for Vim 6.0
58 .
59 Colors
60 * over 100 different color schemes e.g. autumn.vim, eclipse.vim, navajo.vim
61 .
62 Syntax Files
63 * CVSAnnotate.vim, gitAnnotate.vim, .. - for version control files
64 * deb.vim - for browsing debian packages

Subscribers

People subscribed via source and target branches