[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc3++final-0ubuntu2

[Reinhard Tartler]

On Do, Jun 03, 2010 at 17:04:56 (CEST), Felipe Sateler wrote:

> On Thu, Jun 3, 2010 at 09:26, Reinhard Tartler <siretart at tauware.de> wrote:
>> On Do, Jun 03, 2010 at 15:05:04 (CEST), siretart at users.alioth.debian.org wrote:
>>
>>> +clean:
>>>       dh_testdir
>>>       dh_testroot
>>>       [ ! -f config.mak ] || $(MAKE) distclean
>>>       dh_clean build-arch-stamp configure-arch-stamp snapshot_version
>>> +     ! test -d .git || quilt pop -a || test $$? = 2
>>
>> This line expects that if we are building in a git repo, that quilt is
>> installed on the developer system. I guess this to is a reasonable
>> assumption.
>
> I agree, but may be confusing in the case that it does fail. Maybe a
> note in README.source would be useful?

good idea. done.

>>
>>>  # Build architecture-independent packages
>>>  binary-indep: install-indep
>>> diff --git a/debian/source/format b/debian/source/format
>>> index d3827e7..163aaf8 100644
>>> --- a/debian/source/format
>>> +++ b/debian/source/format
>>> @@ -1 +1 @@
>>> -1.0
>>> +3.0 (quilt)
>>> diff --git a/debian/source/options b/debian/source/options
>>> new file mode 100644
>>> index 0000000..98a0c1a
>>> --- /dev/null
>>> +++ b/debian/source/options
>>> @@ -0,0 +1,2 @@
>>> +single-debian-patch
>>
>> this fixes the filename of the generated patch.
>
> I'm not quite sure this is correct... You already have
> debian/patches/*. What is your intended purpose with this flag?

,----[From the dpkg-source(1):
|
|  --single-debian-patch
| 
|         Use debian/patches/debian-changes instead of
|         debian/patches/debian-changes-version for the name of the
|         automatic patch generated during build. This option is
|         particularly useful when the package is maintained in a VCS
|         and a patch set can't reliably be generated. Instead the
|         current diff with upstream should be stored in a single
|         patch. When using this option, it is recommended to create a
|         debian/source/patch-header file explaining how the Debian
|         changes can be best reviewed, for example in the VCS that is
|         used.
|
`----


>>
>>> +skip-patches
>>
>> Does anyone object to this? I hoped that it would have effect on
>> building a source package, unfortunately, it has not.
>
> This options should be applied at extract time. It has no meaning at
> build time (patches are never applied when building a source package,
> they are stored in the debian.tar.gz).

Yeah, that's slightly annoying...

-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4