On Thu, Aug 05, 2010 at 06:19:08PM +0200, Aurelien Jarno wrote:
> On Sun, Jan 03, 2010 at 08:24:34AM +0100, Christian PERRIER wrote:
> > Quoting Aurelien Jarno ([email protected]):
> > 
> > > If type-handling is used, as soon as support is added in dpkg 
> > > (bug#560010), the new architecture will appear in type-handling, and
> > > thus this bug can be fixed easily. There is nothing urgent in fixing it.
> > 
> > 
> > Based on this, I reverted the changes I originally made to
> > debian/control in our SVN. Moreover, adding sparc84 was triggerring a
> > lintian error:
> > "E: samba source: invalid-arch-string-in-source-relation sparc64 ".
> > 
> > So, unless that's already done, you need to point lintian maintainers
> > to #560010 so that they fix their test as well.
> > 
> 
> Policy 2.9.1 allows using architecture wildcards. This is probably the
> way to go, and it will prevent changes to be done for each new linux
> architecture. Please find a patch doing that below.
> 
> diff -Nru samba-3.4.8~dfsg/debian/control samba-3.4.8~dfsg/debian/control
> --- samba-3.4.8~dfsg/debian/control   2010-07-14 19:40:13.000000000 +0200
> +++ samba-3.4.8~dfsg/debian/control   2010-08-05 07:52:06.000000000 +0200
> @@ -5,12 +5,12 @@
>  Uploaders: Steve Langasek <[email protected]>, Christian Perrier 
> <[email protected]>, Noèl Köthe <[email protected]>, Jelmer Vernooij 
> <[email protected]>
>  Build-Depends: debhelper (>= 6.0.7~), libpam0g-dev, libreadline-dev,
>       libcups2-dev | libcupsys2-dev,
> -     libacl1-dev  [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia 
> m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
> +     libacl1-dev  [linux-any],
>       libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, uuid-dev,
>       libtalloc-dev (>= 2.0.1-1~bpo50+1),
> -     libcap2-dev  [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia 
> m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
> -     libkeyutils-dev  [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia 
> m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
> -     ctdb (>= 1.0.73) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia 
> m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
> +     libcap2-dev  [linux-any],
> +     libkeyutils-dev  [linux-any],
> +     ctdb (>= 1.0.73) [linux-any],
>       pkg-config
>  Build-Conflicts: libfam-dev
>  Standards-Version: 3.9.0
> diff -Nru samba-3.4.8~dfsg/debian/rules samba-3.4.8~dfsg/debian/rules
> --- samba-3.4.8~dfsg/debian/rules     2010-07-14 19:40:13.000000000 +0200
> +++ samba-3.4.8~dfsg/debian/rules     2010-08-05 07:50:41.000000000 +0200
> @@ -247,10 +247,4 @@
>  
>  binary: binary-indep binary-arch
>  
> -update-archs:
> -     sed -i -e "s/libacl1-dev\( ([^)]\+)\)* \[[^]]\+\]/libacl1-dev \1 
> [`type-handling any linux-gnu`]/g" \
> -            -e "s/libkeyutils-dev\( ([^)]\+)\)* \[[^]]\+\]/libkeyutils-dev 
> \1 [`type-handling any linux-gnu`]/g" \
> -            -e "s/libcap2-dev\( ([^)]\+)\)* \[[^]]\+\]/libcap2-dev \1 
> [`type-handling any linux-gnu`]/g" \
> -             debian/control
> -
> -.PHONY: build clean binary-indep binary-arch binary install configure 
> update-archs
> +.PHONY: build clean binary-indep binary-arch binary install configure
> 
> 

Now that squeeze has been released, ping?


-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net



-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to