[Pkg-voip-commits] r7144 - /opal/trunk/debian/rules

[Eugen Dedu]

Kilian Krause wrote:
> Hi Eugen,
> 
> On Sat, May 09, 2009 at 06:34:22PM +0200, Eugen Dedu wrote:
>> Kilian Krause wrote:
>>> Hi Eugen,
>>>
>>> On Sat, May 09, 2009 at 12:39:32PM -0000, dedu-guest at alioth.debian.org 
>>> wrote:
>>>> Author: dedu-guest
>>>> Date: Sat May  9 12:39:32 2009
>>>> New Revision: 7144
>>>>
>>>> URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7144
>>>> Log:
>>>> Use +dfsg instead of ~dfsg
>>>>
>>>> Modified:
>>>>    opal/trunk/debian/rules
>>>>
>>>> Modified: opal/trunk/debian/rules
>>>> URL: 
>>>> http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=7144&op=diff
>>>> ==============================================================================
>>>> --- opal/trunk/debian/rules (original)
>>>> +++ opal/trunk/debian/rules Sat May  9 12:39:32 2009
>>>> @@ -4,10 +4,10 @@
>>>> include /usr/share/cdbs/1/class/autotools.mk
>>>> include /usr/share/cdbs/1/rules/dpatch.mk
>>>>
>>>> -UPVERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/~dfsg//')
>>>> +UPVERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+dfsg//')
>>>> REV := $(shell echo $(UPVERSION) | sed -r -e 's/^.*svn//')
>>>>
>>>> -FILENAME := opal_$(UPVERSION)~dfsg.orig.tar.gz
>>>> +FILENAME := opal_$(UPVERSION)+dfsg.orig.tar.gz
>>>> UPFILENAME := opal_$(UPVERSION).orig.tar.gz
>>>> URL := 
>>>> http://ftp.gnome.org/pub/gnome/sources/opal/3.6/opal-$(UPVERSION).tar.gz
>>> I've just reverted this change (and corrected the changelog) to ensure that
>>> the 3.6.1~dfsg remains smaller than any possible 3.6.1.1~dfsg that may
>>> eventually occur. We've had the .dfsg and +dfsg before and it was changed
>>> for this reason to ~dfsg.
>> Hi Kilian,
>>
>> Note that "+ sorts before .", cf. 
>> http://lintian.debian.org/tags/dfsg-version-with-period.html, so it 
>> seems the + is the right one, is that right?
> 
> well, according to that webpage using + is also an option. From earlier
> versions of dpkg that used to be not so clear which was why ~ was "invented"
> as delimiter that always defaults to smaller than any other character. The
> problem with that change was anyway that it would have been a new source
> version and therefore would have asked for a -1 sourceful upload.
> 
> IMHO ~dfsg is the best solution to show a release tarball has been stripped
> of something to comply with DFSG for it was specially put into dpkg for that
> reason. Using +svn is my personal style of writing i've *added* something to
> the tarball (in this case some svn patches - or full svn snapshot) which
> makes it in that sense newer than the release version it's referring to.
> 
> That was so far the style we've used throughout pkg-voip and I find the
> distinction quite handy when reading the version tag.

Hi Kilian,

1. I still do not understand why you prefer ~.  +dfsg has no drawback. 
~dfsg has: I need in ekiga to put depends opal 3.6.1~, which is awkward!

2. This comes from the fact that ~ means before (sorts before nothing), 
while + means after (sorts after nothing).  So +dfsg seems to me the 
right one (I download, *after* that I remove iLBC).

3. The fact that lintian proposes this is a reason to think that the + 
is the right character.  lintian serves as a guide for all of us.

As for svn, I have not yet thought.  Anyway, it's not about svn here.

-- 
Eugen