[Pkg-puppet-devel] The 0.24.5-3 changelog

[Andrew Pollock]

On Wed, May 27, 2009 at 09:58:24AM -0400, Micah Anderson wrote:
> * Andrew Pollock <apollock at debian.org> [2009-05-27 07:45-0400]:
> > On Tue, May 26, 2009 at 05:59:06PM -0400, Micah Anderson wrote:
> > > 
> > > Hey all,
> > > 
> > > It seems like the changelog entry for the 0.24.5-3 upload[0] that Thom
> > > made (the last one for Lenny) got cut out of the squeeze upload. I'm not
> > > sure if the changes that were made there also went missing, but I
> > > thought i'd write and see if anyone knows what happened to these:
> > 
> > I have to say that looking at the history for this repository gives me a
> > headache. I'm having trouble finding a commit that added that changelog
> > entry. Was it possibly not checked in and uploaded only? If it's checked in,
> > can you tell me the SHA-1 of the commit?
> 
> It gives me a headache too. I think that this is the first package that
> any of us have tried to do with git, and we've all struggled to figure
> out the right process, resulting in some crazy gitk subway maps. I for
> one know that I still don't have a very clear handle on the process.

Heh. Glad to know I'm not the only one :-)
 
> I can't find the commit that adds the changelog entry either. My guess
> is you are right that it was uploaded, but not pushed. 

Okay. Good to know I'm not blind or completely stupid.
 
> So looking at the items:
> 
> > >     * Set wait for cert timeout to 5 secs, to avoid resource abuse
> > >     (Closes: #509566)                                                         
> 
> This caused some flak, and I'm not finding it set in the repository
> (although I might be looking in the wrong places). 

That would be

--- puppet-0.24.5/debian/puppet.default 2009-05-27 10:29:31.000000000 +0200
+++ puppet-0.24.5/debian/puppet.default 2009-05-27 15:47:05.000000000 +0200
@@ -4,4 +4,4 @@
 START=yes
 
 # Startup options
-DAEMON_OPTS="-w 0"
+DAEMON_OPTS="-w 5"

from my debdiff that I cooked up, if we do want to put it back in. What
specifically caused flak about this change? Reading the man page, it seems
to default to 120 seconds, but it looks like we'd previously had it turned
off altogether. Is there any reason to deviate from the upstream default?
 
> > >     * Distribute filebucket binary (Closes: #499999)    
> 
> This was re-fixed by me in a later version (0.24.6-1)

Okay.
 
> > >     * Place vim syntax in the correct location (LP: #181960)
> 
> I'm not a vim user, so I'm not sure of this one, looking at the
> launchpad bug[0] it indicates that the vim version number in the name of
> the syntax file was wrong (if the version of vim is 7.2 and the syntax
> file is installed as vim71, then it wont get found). The debian/rules
> does this for vim installation:
> 
>         # Vim auto-syntax-highlighting stuff
>         $(INSTALL) -m0644 ext/vim/syntax/puppet.vim	\
>                 $(CURDIR)/debian/puppet/usr/share/vim/vim71/syntax/
>         $(INSTALL) -m0644 ext/vim/ftdetect/puppet.vim	\
>                 $(CURDIR)/debian/puppet/usr/share/vim/addons/ftdetect/
> 
> This says to me that we are installing the vim highlighting into a vim71
> directory. A quick question on #debian-devel told me that we can just
> s/vim71/vimcurrent/ as 'vimcurrent' is a symlink to the most current
> installed version. So I've made that change and pushed it. 

So for this, the relevant bits of the debdiff are:

--- puppet-0.24.5/debian/puppet.dirs    2009-05-27 10:29:31.000000000 +0200
+++ puppet-0.24.5/debian/puppet.dirs    2009-05-27 15:47:05.000000000 +0200
@@ -3,5 +3,5 @@
 var/log/puppet
 etc/puppet/files
 usr/share/vim/addons/ftdetect
-usr/share/vim/vim71/syntax
+usr/share/vim/addons/syntax
 var/lib/puppet

and 


--- puppet-0.24.5/debian/rules  2009-05-27 13:54:20.000000000 +0200
+++ puppet-0.24.5/debian/rules  2009-05-27 15:47:05.000000000 +0200
@@ -65,7 +65,7 @@
 
        # Vim auto-syntax-highlighting stuff
        $(INSTALL) -m0644 ext/vim/syntax/puppet.vim                             \
-               $(CURDIR)/debian/puppet/usr/share/vim/vim71/syntax/
+               $(CURDIR)/debian/puppet/usr/share/vim/addons/syntax/
        $(INSTALL) -m0644 ext/vim/ftdetect/puppet.vim                           \
                $(CURDIR)/debian/puppet/usr/share/vim/addons/ftdetect/
 
which looks a bit different to what you ended up doing just now, and sounds
like it'd address the concerns you raised in your other email.
 
> Based on the above, I think we can forget about the missing changelog
> entries. What do you think?

I'd say yes, except it was in stable, and for historical reasons it'd be
preferable to retain that changelog entry, I'd think.
 
> micah
> 
> 
> 0. https://bugs.launchpad.net/ubuntu/+source/puppet/+bug/181960


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-puppet-devel/attachments/20090528/22b7ee2d/attachment-0001.pgp>