[hipl-dev] Re: [Branch ~hipl-core/hipl/trunk] Rev 5961: debian packaging: Integrate Bazaar revision number in package version.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-dev@xxxxxxxxxxxxx
  • Date: Fri, 10 Jun 2011 20:31:31 +0200

On Fri, Jun 10, 2011 at 09:45:31AM +0300, Miika Komu wrote:
> On 06/10/2011 09:23 AM, René Hummen wrote:
>> On 10.06.2011, at 07:16, Miika Komu wrote:
>>> On 06/10/2011 12:57 AM, Diego Biurrun wrote:
>>>> On Thu, Jun 09, 2011 at 09:25:31PM +0000, noreply@xxxxxxxxxxxxx wrote:
>>>>> ------------------------------------------------------------
>>>>> revno: 5961
>>>>> committer: Diego Biurrun<diego@xxxxxxxxxx>
>>>>> branch nick: hipl
>>>>> timestamp: Thu 2011-06-09 23:23:26 +0200
>>>>> message:
>>>>>    debian packaging: Integrate Bazaar revision number in package version.
>>>>> modified:
>>>>>    packaging/create-package.sh
>>>>>
>>>>> --- packaging/create-package.sh   2011-02-24 09:29:01 +0000
>>>>> +++ packaging/create-package.sh   2011-06-09 21:23:26 +0000
>>>>> @@ -86,6 +85,7 @@
>>>>>
>>>>>   build_deb()
>>>>>   {
>>>>> +    debchange --newversion ${VERSION}-${VCS_REVISION} "entry 
>>>>> automatically added by $0"
>>>>>       dpkg-buildpackage -us -uc -I.bzr $BUILDPACKAGE_OPTS
>>>>>   }
>>>
>>> please note the related bug report:
>>>
>>> https://bugs.launchpad.net/hipl/+bug/790833

Closed.

>>>> This does have one issue though - debian/changelog is changed 
>>>> automatically,
>>>> but it is a file under revision control.  Having such a modified file in 
>>>> the
>>>> tree can be an annoyance.
>>>
>>> Agreed, this is annoying.
>>
>> In PISA, Samuel modifies the changelog in the build environment of
>> the deflated dist-tarball created by the packaging framework (dpkg).
>> This way, changes don't make it into the local working dir.
>
> This does not work for automated, nightly builds. It is also not aligned  
> with Fedora builds.

I think I found a suitable solution.

>>>> Adding debian/changelog to .bzrignore does not help.  What we could do
>>>> as an alternative is to drop that file from revision control altogether
>>>> and rely on it being generated automatically always.
>>>
>>> Works for me. If you're thinking about generating "bzr log" as the 
>>> changelog, please note that this does not work with the binary maintainer 
>>> scripts (there you'll just have the doc/ChangeLog).
>>
>> You're thinking about providing a debian/changelog.in that is updated to the 
>> actual debian/changelog by configure?
>
> bzr changelog could be the changelog contents.

debian/changelog is supposed to track packaging changes, not changes
in the software being packaged.

Diego

Other related posts: