On Mon, Jan 11, 2010 at 2:29 PM, Silviu Paragina <sil...@paragina.ro> wrote: > When you apt-get source the package you get a few files. A tar.gz (bz2 not > sure), a diff, and few more (not interesting for this problem). The tar one > is the original source code, the diff is the difference from the debian > package (including the debian dir). So all you need to do is apply that > patch. If the gap between 0.25.1 0.25.2 isn't that big it should work. ;)
It should be simpler to use git-buildpackage. # apt-get install git-buildpackage $ git clone git://git.debian.org/git/pkg-puppet/puppet.git $ cd puppet $ git remote add reductive git://github.com/reductivelabs/puppet.git $ git remote update $ git checkout -b upstream 0.25.2 $ git checkout master $ dch -i add something like: ---------------------------------------------------------------------- puppet (0.25.2-1) unstable; urgency=low * 0.25.2 internal release -- Nigel Kersten <nig...@google.com> Tue, 12 Jan 2010 09:29:49 -0800 ---------------------------------------------------------------------- (at least bump the version to 0.25.2, you should probably suffix it with an internal ~mycorp or something to distinguish it from real upstream builds or whatever your internal processes are) $ git add debian/changelog $ git commit -m "0.25.2 changelog update" $ git-buildpackage That should result in a 0.25.2 deb in the parent directory. The advantage of doing it this way is that you can pull in *any* puppet git branch as "upstream". If you're more familiar with git-buildpackage, you can point it at any git branch as upstream, but this seemed a simpler path to follow. > > > > Silviu > > Steve Wray wrote: >> >> James Turnbull wrote: >>> >>> -----BEGIN PGP SIGNED MESSAGE----- >>> Hash: SHA1 >>> >>> On 12/01/10 6:57 AM, Steve Wray wrote: >>>> >>>> Hi there >>>> >>>> I'd like to build packages of 0.25.2 for Debian but I'm finding that the >>>> git repositories are still on 0.25.1 >>> >>> I am not sure how that's happening because they aren't. :) >>> >>>> I'm not sure of how I should get 0.25.2 from git. >>>> >>>> At the moment I'm using the commandline: >>>> >>>> git clone git://github.com/reductivelabs/puppet >>> >>> $ git clone git://github.com/reductivelabs/puppet.git >>> $ cd puppet >>> $ git branch --track 0.25.x origin/0.25.x >>> $ git checkout 0.25.x >>> >>> $ cat lib/puppet.rb | grep 'PUPPET' >>> PUPPETVERSION = '0.25.2' >>> >>> Regards >> >> Thanks, and yes I actually figured that part out myself :) >> >> The problem is that I want to be able to use git-buildpackage, and the >> reductive labs version doesn't have the debian subdirectory. >> >> Its ok though, I understand that this is moving along and will probably be >> all fine later this week. >> >> >> >> >>> >>> James Turnbull >>> >>> - -- Author of: >>> * Pro Linux System Administration (http://tinyurl.com/linuxadmin) >>> * Pulling Strings with Puppet (http://tinyurl.com/pupbook) >>> * Pro Nagios 2.0 (http://tinyurl.com/pronagios) >>> * Hardening Linux (http://tinyurl.com/hardeninglinux) >>> -----BEGIN PGP SIGNATURE----- >>> Version: GnuPG v1.4.7 (Darwin) >>> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ >>> >>> iQEVAwUBS0uZ9iFa/lDkFHAyAQL+0wgAxwPKiE5rV73VRONgY6dexx5cab7s4CWX >>> cDVHWEyfoAYl1ndyLTbYtu9ng+W2k9VqviUJHH2/5Jc2sVMmYrO7YweuTCvAdIMy >>> MwCNf8uO6FF8WqNG0qw69Sz+N129noUqsOmc8k+V0y8CZy6QjVLWoJnUOL2SB/rC >>> Mhtto8d9yixtiPL0lYLfbx5M16jyUJ3VS8od6aeCHbxbzmvTGIkfLJBXyorTZZdI >>> Ixr6AtBl3CCOWBHVq6CN+rytY8Ee3CSgeaTIawD/B8jKNth5bgqlj23klPogB5J8 >>> 6wxC3qvsR7TfJqJVQjZoHwkfbMipoQSPL9CtJtNx9tqQ/xdNUAzvXQ== >>> =Dhix >>> -----END PGP SIGNATURE----- >>> >> >> > > > -- > You received this message because you are subscribed to the Google Groups > "Puppet Users" group. > To post to this group, send email to puppet-us...@googlegroups.com. > To unsubscribe from this group, send email to > puppet-users+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/puppet-users?hl=en. > > > > -- nigel
-- You received this message because you are subscribed to the Google Groups "Puppet Users" group. To post to this group, send email to puppet-us...@googlegroups.com. To unsubscribe from this group, send email to puppet-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-users?hl=en.
