Bug#718984: dpkg-dev: dpkg-source ingores files in include-binaries that apply to the default -I excludes

2013-08-08 Thread Frederic Van Espen

On 08/07/2013 08:01 PM, Guillem Jover wrote:

I tested now with 1.14.x just to confirm my suspicion, and there it
does not work either, so I don't really see how this has ever worked
for you. Lowering to wishlist.


Sorry, the part where it says it worked before was added automatically 
by reportbug when I chose for the option "does not build" and I had not 
seen it. It's really a new package I'm creating.



The problem is that this is slightly more involved, as the problem
comes from the --exclude option being passed to tar. I'm now reworking
the code to overcome this limitation. But you'll need to workaround it
on older dpkg-source, by for example resetting the tar-ignore option
and removing -I*.so from it, because this is only going to get fixed
in the 1.17.x series.


I guess I could easily port the patch to 1.16.10 myself. I only need it 
for the build host.


Thanks,

Frederic


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#718984: dpkg-dev: dpkg-source ingores files in include-binaries that apply to the default -I excludes

2013-08-07 Thread Guillem Jover
Control: severity -1 wishlist

Hi again!

On Wed, 2013-08-07 at 17:47:03 +0200, Guillem Jover wrote:
> Control: severity -1 normal

> On Wed, 2013-08-07 at 14:42:05 +0200, Frederic Van Espen wrote:
> > Package: dpkg-dev
> > Version: 1.16.10
> > Severity: serious
> > Justification: fails to build from source (but built successfully in the 
> > past)
> 
> I've just tested, and dpkg-source 1.15.x shows the same behavior.
> Not saying it's desirable, just that I don't see how this breaks
> stuff that used to work in the past?

I tested now with 1.14.x just to confirm my suspicion, and there it
does not work either, so I don't really see how this has ever worked
for you. Lowering to wishlist.

> > I have a package that has the following content in the
> > debian/source/include-binaries
> > 
> > debian/extra/foo.so
> > 
> > However, when running dpkg-source this file is not added to the source
> > package. dpkg-source --help tells me that a default set of -I options is
> > added when no such option is used:
> >   -I[]filter out files when building tarballs
> >(defaults to: -I*.a -I*.la -I*.o -I*.so
> >-I.*.sw? -I*~ -I,,* -I.[#~]* -I.arch-ids
> >-I.arch-inventory -I.be -I.bzr
> >-I.bzr.backup -I.bzr.tags -I.bzrignore
> >-I.cvsignore -I.deps -I.git -I.gitignore
> >-I.hg -I.hgignore -I.hgtags -I.shelf
> >-I.svn -ICVS -IDEADJOE -IRCS -I_MTN
> >-I_darcs -I{arch}).
> > 
> > Altough I understand the default set of excludes, when I specifically
> > request files to be added through the include-binaries file, the should
> > not be excluded.
> 
> Yes, I agree, and I'll fix this for either 1.17.2 or 1.17.3.

The problem is that this is slightly more involved, as the problem
comes from the --exclude option being passed to tar. I'm now reworking
the code to overcome this limitation. But you'll need to workaround it
on older dpkg-source, by for example resetting the tar-ignore option
and removing -I*.so from it, because this is only going to get fixed
in the 1.17.x series.

Thanks,
Guillem


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#718984: dpkg-dev: dpkg-source ingores files in include-binaries that apply to the default -I excludes

2013-08-07 Thread Raphael Hertzog
Hi,

On Wed, 07 Aug 2013, Guillem Jover wrote:
> I've just tested, and dpkg-source 1.15.x shows the same behavior.
> Not saying it's desirable, just that I don't see how this breaks
> stuff that used to work in the past?

Which 1.15.x have you tested? Because commit
3525f79792cff51757d99d45f51c96a15e6fa779 might be relevant to the issue
at hand... and this was added between 1.15.0 and 1.15.1.

Possible patch (untested):

--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -468,7 +468,9 @@ sub do_build {
 chdir($cwd) || syserr(_g("unable to chdir to `%s'"), $cwd);
 my @result;
 foreach my $fn (@_) {
-unless (exists $exclude{$fn} or exists $exclude{"$reldir/$fn"}) {
+if ($binaryfiles->binary_is_allowed($fn) or
+not (exists $exclude{$fn} or exists $exclude{"$reldir/$fn"}))
+{
 push @result, $fn;
 }
 }

Cheers,
-- 
Raphaël Hertzog ◈ Debian Developer

Discover the Debian Administrator's Handbook:
→ http://debian-handbook.info/get/


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#718984: dpkg-dev: dpkg-source ingores files in include-binaries that apply to the default -I excludes

2013-08-07 Thread Guillem Jover
Control: severity -1 normal

Hi!

On Wed, 2013-08-07 at 14:42:05 +0200, Frederic Van Espen wrote:
> Package: dpkg-dev
> Version: 1.16.10
> Severity: serious
> Justification: fails to build from source (but built successfully in the past)

I've just tested, and dpkg-source 1.15.x shows the same behavior.
Not saying it's desirable, just that I don't see how this breaks
stuff that used to work in the past?

> I have a package that has the following content in the
> debian/source/include-binaries
> 
> debian/extra/foo.so
> 
> However, when running dpkg-source this file is not added to the source
> package. dpkg-source --help tells me that a default set of -I options is
> added when no such option is used:
>   -I[]filter out files when building tarballs
>(defaults to: -I*.a -I*.la -I*.o -I*.so
>-I.*.sw? -I*~ -I,,* -I.[#~]* -I.arch-ids
>-I.arch-inventory -I.be -I.bzr
>-I.bzr.backup -I.bzr.tags -I.bzrignore
>-I.cvsignore -I.deps -I.git -I.gitignore
>-I.hg -I.hgignore -I.hgtags -I.shelf
>-I.svn -ICVS -IDEADJOE -IRCS -I_MTN
>-I_darcs -I{arch}).
> 
> Altough I understand the default set of excludes, when I specifically
> request files to be added through the include-binaries file, the should
> not be excluded.

Yes, I agree, and I'll fix this for either 1.17.2 or 1.17.3.

Thanks,
Guillem


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#718984: dpkg-dev: dpkg-source ingores files in include-binaries that apply to the default -I excludes

2013-08-07 Thread Frederic Van Espen
Package: dpkg-dev
Version: 1.16.10
Severity: serious
Justification: fails to build from source (but built successfully in the past)

Dear Maintainer,

I have a package that has the following content in the
debian/source/include-binaries

debian/extra/foo.so

However, when running dpkg-source this file is not added to the source
package. dpkg-source --help tells me that a default set of -I options is
added when no such option is used:
  -I[]filter out files when building tarballs
   (defaults to: -I*.a -I*.la -I*.o -I*.so
   -I.*.sw? -I*~ -I,,* -I.[#~]* -I.arch-ids
   -I.arch-inventory -I.be -I.bzr
   -I.bzr.backup -I.bzr.tags -I.bzrignore
   -I.cvsignore -I.deps -I.git -I.gitignore
   -I.hg -I.hgignore -I.hgtags -I.shelf
   -I.svn -ICVS -IDEADJOE -IRCS -I_MTN
   -I_darcs -I{arch}).

Altough I understand the default set of excludes, when I specifically
request files to be added through the include-binaries file, the should
not be excluded.

Thanks,

Frederic


-- System Information:
Debian Release: 7.1
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages dpkg-dev depends on:
ii  base-files7.1wheezy1
ii  binutils  2.22-8
ii  bzip2 1.0.6-4
ii  libdpkg-perl  1.16.10
ii  make  3.81-8.2
ii  patch 2.6.1-3
ii  xz-utils  5.1.1alpha+20120614-2

Versions of packages dpkg-dev recommends:
ii  build-essential  11.5
ii  fakeroot 1.18.4-2
ii  gcc [c-compiler] 4:4.7.2-1
ii  gcc-4.7 [c-compiler] 4.7.2-5
ii  gnupg1.4.12-7
ii  gpgv 1.4.12-7
ii  libalgorithm-merge-perl  0.08-2

Versions of packages dpkg-dev suggests:
ii  debian-keyring  2013.04.21

-- no debconf information


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org