On Mon, 11 Mar 2013 13:46:56 +0100, Michael Tautschnig wrote:

> To be honest, I'm not entirely sure what is going wrong
> here. Reproducing the problem, however, is trivial:

For some value of "trivial" :)
 
> dget -x 
> http://http.debian.net/debian/pool/main/s/service-wrapper-java/service-wrapper-java_3.5.3-4.dsc
> cd service-wrapper-java-3.5.3
> dpkg-buildpackage
> (well, I used pdebuild --use-pdebuild-internal instead)

Works fine here (with pdebuild --use-pdebuild-internal).

Hu, but something's fishy:

% dget -x 
http://http.debian.net/debian/pool/main/s/service-wrapper-java/service-wrapper-java_3.5.3-4.dsc
[..]
dpkg-source: info: extracting service-wrapper-java in service-wrapper-java-3.5.3
dpkg-source: info: unpacking service-wrapper-java_3.5.3.orig.tar.gz
dpkg-source: info: unpacking service-wrapper-java_3.5.3-4.debian.tar.gz
dpkg-source: info: applying 03_ld_as_needed.patch
% cd service-wrapper-java-3.5.3
% ls debian/patches 
01_disable_buildtime_in_buildfile.patch  02_update_buildtime.patch  
03_ld_as_needed.patch  series
% cat debian/patches/series 
01_disable_buildtime_in_buildfile.patch
02_update_buildtime.patch
03_ld_as_needed.patch
% quilt applied
debian-changes-3.5.3-1
debian-changes-3.5.3-1
03_ld_as_needed.patch

% find .pc 
.pc
.pc/applied-patches
.pc/debian-changes-3.5.3-1
.pc/debian-changes-3.5.3-1/src
.pc/debian-changes-3.5.3-1/src/c
.pc/debian-changes-3.5.3-1/src/c/wrapperinfo.c
.pc/debian-changes-3.5.3-1/src/java
.pc/debian-changes-3.5.3-1/src/java/org
.pc/debian-changes-3.5.3-1/src/java/org/tanukisoftware
.pc/debian-changes-3.5.3-1/src/java/org/tanukisoftware/wrapper
.pc/debian-changes-3.5.3-1/src/java/org/tanukisoftware/wrapper/WrapperInfo.java
.pc/.version
.pc/.quilt_series
.pc/.quilt_patches
.pc/03_ld_as_needed.patch
.pc/03_ld_as_needed.patch/src
.pc/03_ld_as_needed.patch/src/c
.pc/03_ld_as_needed.patch/src/c/Makefile-linux-x86-32.make
.pc/03_ld_as_needed.patch/src/c/Makefile-linux-ppc-32.make
.pc/03_ld_as_needed.patch/src/c/Makefile-linux-ia-64.make
.pc/03_ld_as_needed.patch/src/c/Makefile-linux-x86-64.make


After quilt pop and rm -r .pc I get the error:
dpkg-source: info: local changes detected, the modified files are:
 service-wrapper-java-3.5.3/build.xml
 service-wrapper-java-3.5.3/src/c/wrapperinfo.c
 service-wrapper-java-3.5.3/src/java/org/tanukisoftware/wrapper/WrapperInfo.java

[some time later.]

So we have _two_ debian-changes-3.5.3-1 applied ...

Unpacking service-wrapper-java_3.5.3-4.debian.tar.gz and
service-wrapper-java_3.5.3.orig.tar.gz manually shows:
% quilt applied
debian-changes-3.5.3-1
% find .pc
.pc
.pc/applied-patches
.pc/debian-changes-3.5.3-1
.pc/debian-changes-3.5.3-1/src
.pc/debian-changes-3.5.3-1/src/c
.pc/debian-changes-3.5.3-1/src/c/wrapperinfo.c
.pc/debian-changes-3.5.3-1/src/java
.pc/debian-changes-3.5.3-1/src/java/org
.pc/debian-changes-3.5.3-1/src/java/org/tanukisoftware
.pc/debian-changes-3.5.3-1/src/java/org/tanukisoftware/wrapper
.pc/debian-changes-3.5.3-1/src/java/org/tanukisoftware/wrapper/WrapperInfo.java
.pc/.version

[some time later.]

I think I found something -- the .orig.tar.gt contain a .pc directory
with debian-changes-3.5.3-1. D'oh.

Ok, I assume for today that this is the problem ...


Cheers,
gregor

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Tote Hosen: Guantanamera

Attachment: signature.asc
Description: Digital signature

Reply via email to