package qcam
tag 347045 patch
thanks
I intend to NMU a fix for this bug sponsored by some member of the QA
group; patch attached. My pbuild result of this patch was clean, and
produced a binary package with expected debdiff output from the most
recent version in sid. Build logs and debdiff output are attached.
Please note that maintainer uploads are preferred to NMUs! If you are
able to upload, then please do so.
diff -u qcam-0.91/debian/changelog qcam-0.91/debian/changelog
--- qcam-0.91/debian/changelog
+++ qcam-0.91/debian/changelog
@@ -1,3 +1,10 @@
+qcam (0.91-11.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update build-deps for xlibs-dev removal; closes: #347045.
+
+ -- Justin Pryzby <[EMAIL PROTECTED]> Tue, 17 Jan 2006 20:25:41 -0500
+
qcam (0.91-11.1) unstable; urgency=low
* Non-maintainer upload, with permission.
diff -u qcam-0.91/debian/control qcam-0.91/debian/control
--- qcam-0.91/debian/control
+++ qcam-0.91/debian/control
@@ -2,7 +2,7 @@
Section: graphics
Priority: extra
Maintainer: Paul Slootman <[EMAIL PROTECTED]>
-Build-Depends: xlibs-dev, svgalibg1-dev [i386], libjpeg62-dev
+Build-Depends: libx11-dev, libxext-dev, x-dev, svgalibg1-dev [i386],
libjpeg62-dev
Standards-Version: 3.5.0
Package: qcam
W: /home/pryzbyj/.pbuilderrc does not exist
dpkg-buildpackage: source package is qcam
dpkg-buildpackage: source version is 0.91-11.2
dpkg-buildpackage: source changed by Justin Pryzby <[EMAIL PROTECTED]>
fakeroot debian/rules clean
test -f debian/rules
rm -f build
make clean
make[1]: Entering directory `/home/pryzbyj/bd/qcam-0.91'
rm -f *.o qcam xqcam probeqcam qcam-simple make.darkmask sqcam *.pgm *~
qcam-os.[ch] *.a tkqcam
make[1]: Leaving directory `/home/pryzbyj/bd/qcam-0.91'
rm `find . -name "*~"`
rm: too few arguments
Try `rm --help' for more information.
make: [clean] Error 1 (ignored)
rm -rf debian/tmp debian/files* core debian/substvars
dpkg-source -b qcam-0.91
dpkg-source: building qcam using existing qcam_0.91.orig.tar.gz
dpkg-source: building qcam in qcam_0.91-11.2.diff.gz
dpkg-source: warning: file README.sqcam has no final newline (either original
or modified version)
dpkg-source: warning: file sqcam.c has no final newline (either original or
modified version)
dpkg-source: building qcam in qcam_0.91-11.2.dsc
dpkg-genchanges -S
dpkg-genchanges: not including original source code in upload
dpkg-buildpackage: source only, diff-only upload (original source NOT included)
W: /home/pryzbyj/.pbuilderrc does not exist
I: using fakeroot in build.
pbuilder-buildpackage/i386 $Id: pbuilder-buildpackage-funcs,v 1.28 2005/12/21
11:57:29 dancer Exp $
$Id: pbuilder-buildpackage,v 1.118 2005/12/21 11:57:29 dancer Exp $
Current time: Tue Jan 17 20:25:42 EST 2006
pbuilder-time-stamp: 1137547542
Building the build Environment
-> extracting base tarball [/var/cache/pbuilder/base.tgz]
-> creating local configuration
-> copying local configuration
-> mounting /proc filesystem
ln: `/var/cache/pbuilder/build//15018/etc/mtab': File exists
-> mounting /dev/pts filesystem
-> policy-rc.d already exists
-> created buildresult dir :/var/cache/pbuilder/result
Obtaining the cached apt archive contents
Installing the build-deps
-> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.22
2005/12/04 05:16:40 dancer Exp $
-> Considering libx11-dev
-> Trying libx11-dev
-> Considering libxext-dev
-> Trying libxext-dev
-> Considering x-dev
-> Trying x-dev
-> Considering svgalibg1-dev [i386]
-> Trying svgalibg1-dev
-> Considering libjpeg62-dev
-> Trying libjpeg62-dev
-> Installing libx11-dev libxext-dev x-dev svgalibg1-dev libjpeg62-dev
Reading package lists...
Building dependency tree...
The following extra packages will be installed:
libjpeg62 libsvga1 libsvga1-dev libx11-6 libxext6 libxi-dev libxi6
libxkbfile-dev libxkbfile1 x11-common xlibs-data
Suggested packages:
x-window-system-core x-window-system
The following NEW packages will be installed:
libjpeg62 libjpeg62-dev libsvga1 libsvga1-dev libx11-6 libx11-dev
libxext-dev libxext6 libxi-dev libxi6 libxkbfile-dev libxkbfile1
svgalibg1-dev x-dev x11-common xlibs-data
0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
Need to get 0B/7026kB of archives.
After unpacking 22.1MB of additional disk space will be used.
WARNING: The following packages cannot be authenticated!
libjpeg62 libjpeg62-dev libsvga1 libsvga1-dev x11-common xlibs-data libx11-6
libxext6 x-dev libxext-dev libxi6 libxi-dev libxkbfile1 libxkbfile-dev
libx11-dev svgalibg1-dev
debconf: delaying package configuration, since apt-utils is not installed
Selecting previously deselected package libjpeg62.
(Reading database ... 10062 files and directories currently installed.)
Unpacking libjpeg62 (from .../libjpeg62_6b-11_i386.deb) ...
Selecting previously deselected package libjpeg62-dev.
Unpacking libjpeg62-dev (from .../libjpeg62-dev_6b-11_i386.deb) ...
Selecting previously deselected package libsvga1.
Unpacking libsvga1 (from .../libsvga1_1%3a1.4.3-22_i386.deb) ...
Selecting previously deselected package libsvga1-dev.
Unpacking libsvga1-dev (from .../libsvga1-dev_1%3a1.4.3-22_i386.deb) ...
Selecting previously deselected package x11-common.
Unpacking x11-common (from .../x11-common_6.9.0.dfsg.1-4_all.deb) ...
Selecting previously deselected package xlibs-data.
Unpacking xlibs-data (from .../xlibs-data_6.9.0.dfsg.1-4_all.deb) ...
Selecting previously deselected package libx11-6.
Unpacking libx11-6 (from .../libx11-6_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxext6.
Unpacking libxext6 (from .../libxext6_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package x-dev.
Unpacking x-dev (from .../x-dev_6.9.0.dfsg.1-4_all.deb) ...
Selecting previously deselected package libxext-dev.
Unpacking libxext-dev (from .../libxext-dev_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxi6.
Unpacking libxi6 (from .../libxi6_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxi-dev.
Unpacking libxi-dev (from .../libxi-dev_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxkbfile1.
Unpacking libxkbfile1 (from .../libxkbfile1_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxkbfile-dev.
Unpacking libxkbfile-dev (from .../libxkbfile-dev_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libx11-dev.
Unpacking libx11-dev (from .../libx11-dev_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package svgalibg1-dev.
Unpacking svgalibg1-dev (from .../svgalibg1-dev_1%3a1.4.3-22_all.deb) ...
Setting up libjpeg62 (6b-11) ...
Setting up libjpeg62-dev (6b-11) ...
Setting up libsvga1 (1.4.3-22) ...
Setting up libsvga1-dev (1.4.3-22) ...
Setting up x11-common (6.9.0.dfsg.1-4) ...
Adding system startup for /etc/init.d/x11-common ...
/etc/rcS.d/S70x11-common -> ../init.d/x11-common
Setting up xlibs-data (6.9.0.dfsg.1-4) ...
Setting up libx11-6 (6.9.0.dfsg.1-4) ...
Setting up libxext6 (6.9.0.dfsg.1-4) ...
Setting up x-dev (6.9.0.dfsg.1-4) ...
Setting up libxext-dev (6.9.0.dfsg.1-4) ...
Setting up libxi6 (6.9.0.dfsg.1-4) ...
Setting up libxkbfile1 (6.9.0.dfsg.1-4) ...
Setting up libxkbfile-dev (6.9.0.dfsg.1-4) ...
Setting up svgalibg1-dev (1.4.3-22) ...
Setting up libxi-dev (6.9.0.dfsg.1-4) ...
Setting up libx11-dev (6.9.0.dfsg.1-4) ...
-> Finished parsing the build-deps
Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
fakeroot
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Need to get 0B/93.2kB of archives.
After unpacking 307kB of additional disk space will be used.
WARNING: The following packages cannot be authenticated!
fakeroot
debconf: delaying package configuration, since apt-utils is not installed
Selecting previously deselected package fakeroot.
(Reading database ... 11669 files and directories currently installed.)
Unpacking fakeroot (from .../fakeroot_1.5.6_i386.deb) ...
Setting up fakeroot (1.5.6) ...
Copying back the cached apt archive contents
/var/cache/pbuilder/build/15018/etc/passwd
/var/cache/pbuilder/build/15018/etc/group
Copying source file
-> copying [../qcam_0.91-11.2.dsc]
-> copying [../qcam_0.91.orig.tar.gz]
-> copying [../qcam_0.91-11.2.diff.gz]
Extracting source
su: Authentication service cannot retrieve authentication info.
(Ignored)
dpkg-source: warning: no utmp entry available and LOGNAME not defined; using
uid of process (1234)
dpkg-source: extracting qcam in qcam-0.91
dpkg-source: unpacking qcam_0.91.orig.tar.gz
dpkg-source: applying ./qcam_0.91-11.2.diff.gz
-> Building the package
su: Authentication service cannot retrieve authentication info.
(Ignored)
dpkg-parsechangelog: warning: no utmp entry available and LOGNAME not defined;
using uid of process (1234)
debian: warning: no utmp entry available and LOGNAME not defined; using uid of
process (1234)
dpkg-buildpackage: source package is qcam
dpkg-parsechangelog: warning: no utmp entry available and LOGNAME not defined;
using uid of process (1234)
debian: warning: no utmp entry available and LOGNAME not defined; using uid of
process (1234)
dpkg-buildpackage: source version is 0.91-11.2
dpkg-parsechangelog: warning: no utmp entry available and LOGNAME not defined;
using uid of process (1234)
debian: warning: no utmp entry available and LOGNAME not defined; using uid of
process (1234)
dpkg-buildpackage: source changed by Justin Pryzby <[EMAIL PROTECTED]>
dpkg-architecture: warning: no utmp entry available and LOGNAME not defined;
using uid of process (1234)
dpkg-architecture: warning: no utmp entry available and LOGNAME not defined;
using uid of process (1234)
dpkg-buildpackage: host architecture i386
dpkg-checkbuilddeps: warning: no utmp entry available and LOGNAME not defined;
using uid of process (1234)
dpkg-architecture: warning: no utmp entry available and LOGNAME not defined;
using uid of process (1234)
dpkg-architecture: warning: no utmp entry available and LOGNAME not defined;
using uid of process (1234)
fakeroot debian/rules clean
dpkg-architecture: warning: no utmp entry available and LOGNAME not defined;
using uid of process (0)
test -f debian/rules
rm -f build
make clean
make[1]: Entering directory `/tmp/buildd/qcam-0.91'
rm -f *.o qcam xqcam probeqcam qcam-simple make.darkmask sqcam *.pgm *~
qcam-os.[ch] *.a tkqcam
make[1]: Leaving directory `/tmp/buildd/qcam-0.91'
rm `find . -name "*~"`
rm: missing operand
Try `rm --help' for more information.
make: [clean] Error 1 (ignored)
rm -rf debian/tmp debian/files* core debian/substvars
dpkg-source -b qcam-0.91
dpkg-source: warning: no utmp entry available and LOGNAME not defined; using
uid of process (1234)
dpkg-parsechangelog: warning: no utmp entry available and LOGNAME not defined;
using uid of process (1234)
debian: warning: no utmp entry available and LOGNAME not defined; using uid of
process (1234)
dpkg-source: building qcam using existing qcam_0.91.orig.tar.gz
dpkg-source: building qcam in qcam_0.91-11.2.diff.gz
dpkg-source: warning: file README.sqcam has no final newline (either original
or modified version)
dpkg-source: warning: file sqcam.c has no final newline (either original or
modified version)
dpkg-source: building qcam in qcam_0.91-11.2.dsc
debian/rules build
dpkg-architecture: warning: no utmp entry available and LOGNAME not defined;
using uid of process (1234)
test -f debian/rules
make qcam xqcam probeqcam make.darkmask sqcam
make[1]: Entering directory `/tmp/buildd/qcam-0.91'
cc -Wall -O6 -c -o qcam.o qcam.c
ln -sf qcam-`uname`.h qcam-os.h
ln -sf qcam-`uname`.c qcam-os.c
cc -Wall -O6 -DCONFIG_FILE=\"/etc/qcam.conf\" -c -o qcam-lib.o qcam-lib.c
rm -f libqcam.a
ar rcs libqcam.a qcam-lib.o
cc -Wall -O6 -c -o exposure.o exposure.c
exposure.c:53: warning: type defaults to 'int' in declaration of
'luminance_target'
exposure.c:54: warning: type defaults to 'int' in declaration of
'luminance_tolerance'
exposure.c:55: warning: type defaults to 'int' in declaration of
'luminance_std_target'
exposure.c:56: warning: type defaults to 'int' in declaration of
'luminance_std_tolerance'
exposure.c:57: warning: type defaults to 'int' in declaration of 'ae_mode'
exposure.c: In function 'qcip_autoexposure':
exposure.c:202: warning: 'lum_std' may be used uninitialized in this function
cc -Wall -O6 -c -o histogram.o histogram.c
ar rcs libqcamip.a exposure.o histogram.o
cc -Wall -O6 -DCONFIG_FILE=\"/etc/qcam.conf\" -c dark.c
cc -Wall -O6 -c -o edge.o edge.c
edge.c: In function 'qc_edge_detect':
edge.c:115: warning: implicit declaration of function 'abs'
cc -Wall -O6 -c -o writejpeg.o writejpeg.c
rm -f qcam
cc -Wall -O6 -o qcam qcam.o -L. -lqcam -lqcamip dark.o edge.o writejpeg.o -ljpeg
cc -Wall -O6 -c -o xqcam.o xqcam.c
rm -f xqcam
cc -Wall -O6 -o xqcam xqcam.o dark.o edge.o -L. -lqcam -lqcamip
-L/usr/X11R6/lib -lXext -lX11 -lc
cc -Wall -O6 -c -o probeqcam.o probeqcam.c
rm -f probeqcam
cc -Wall -O6 -o probeqcam probeqcam.o -L. -lqcam
cc -Wall -O6 -DCONFIG_FILE=\"/etc/qcam.conf\" -o make.darkmask make.darkmask.c
-L. -lqcam
cc -Wall -O6 -c -o sqcam.o sqcam.c
sqcam.c:184: warning: return type of 'main' is not 'int'
sqcam.c:276:3: warning: no newline at end of file
cc -Wall -O6 -c -o qcam-os.o qcam-os.c
qcam-os.c: In function 'qc_probe':
qcam-os.c:217: warning: implicit declaration of function 'exit'
qcam-os.c:217: warning: incompatible implicit declaration of built-in function
'exit'
cc -Wall -O6 -o sqcam sqcam.o -lvga -lvgagl -L. -lqcam -lqcamip
make[1]: Leaving directory `/tmp/buildd/qcam-0.91'
touch build
fakeroot debian/rules binary
dpkg-architecture: warning: no utmp entry available and LOGNAME not defined;
using uid of process (0)
test -f debian/rules
test root = "`whoami`"
test -f debian/rules
test -f debian/rules
chmod a+x debian/mk-binary
./debian/mk-binary svgalib
#! /bin/bash -euv
# Convenience variables.
package=qcam
home="`pwd`"
pwd
dest=debian/tmp
pkgdocdir=$dest/usr/share/doc/$package
if [ "$1" = svgalib ]; then
svgalib=yes
else
svgalib=
fi
# Make dir.
rm -rf $dest
install -d -m755 $dest
# Install binary.
install -d $dest/usr/bin
install -s probeqcam qcam make.darkmask $dest/usr/bin
[ "$svgalib" ] && install -s sqcam $dest/usr/bin
install -d $dest/usr/X11R6/bin
install -s xqcam $dest/usr/X11R6/bin
# Install configuration files.
install -d -m755 $dest/etc
install -m644 qcam.conf $dest/etc/qcam.conf
# Install manpages.
install -d $dest/usr/X11R6/man/man1 $dest/usr/share/man/man1
install -m644 qcam.1 make.darkmask.1 probeqcam.1 $dest/usr/share/man/man1
[ "$svgalib" ] && install -m644 sqcam.1 $dest/usr/share/man/man1
gzip -9v $dest/usr/share/man/man1/*
debian/tmp/usr/share/man/man1/make.darkmask.1: 45.5% -- replaced with
debian/tmp/usr/share/man/man1/make.darkmask.1.gz
debian/tmp/usr/share/man/man1/probeqcam.1: 34.7% -- replaced with
debian/tmp/usr/share/man/man1/probeqcam.1.gz
debian/tmp/usr/share/man/man1/qcam.1: 57.4% -- replaced with
debian/tmp/usr/share/man/man1/qcam.1.gz
debian/tmp/usr/share/man/man1/sqcam.1: 47.9% -- replaced with
debian/tmp/usr/share/man/man1/sqcam.1.gz
(cd $dest/usr/X11R6/man/man1; ln -s ../../../share/man/man1/qcam.1.gz
xqcam.1.gz)
# Copy docs.
install -d -m755 $pkgdocdir
install -m644 BUGS INFO README README.JPEG $pkgdocdir
[ "$svgalib" ] && install -m644 BUGS.sqcam README.sqcam $pkgdocdir
install -m644 debian/changelog $pkgdocdir/changelog.Debian
install -m644 CHANGES $pkgdocdir/changelog
gzip -9v $pkgdocdir/*
debian/tmp/usr/share/doc/qcam/BUGS: 41.8% -- replaced with
debian/tmp/usr/share/doc/qcam/BUGS.gz
debian/tmp/usr/share/doc/qcam/BUGS.sqcam: 30.6% -- replaced with
debian/tmp/usr/share/doc/qcam/BUGS.sqcam.gz
debian/tmp/usr/share/doc/qcam/INFO: 37.9% -- replaced with
debian/tmp/usr/share/doc/qcam/INFO.gz
debian/tmp/usr/share/doc/qcam/README: 40.7% -- replaced with
debian/tmp/usr/share/doc/qcam/README.gz
debian/tmp/usr/share/doc/qcam/README.JPEG: 49.6% -- replaced with
debian/tmp/usr/share/doc/qcam/README.JPEG.gz
debian/tmp/usr/share/doc/qcam/README.sqcam: 45.5% -- replaced with
debian/tmp/usr/share/doc/qcam/README.sqcam.gz
debian/tmp/usr/share/doc/qcam/changelog: 54.6% -- replaced with
debian/tmp/usr/share/doc/qcam/changelog.gz
debian/tmp/usr/share/doc/qcam/changelog.Debian: 61.5% -- replaced with
debian/tmp/usr/share/doc/qcam/changelog.Debian.gz
# Copy copyright.
install -m644 debian/copyright $pkgdocdir/copyright
# Dependencies.
install -d -m755 $dest/DEBIAN
cp debian/conffiles $dest/DEBIAN
dpkg-shlibdeps $dest/usr/bin/* $dest/usr/X11R6/bin/*
dpkg-shlibdeps: warning: no utmp entry available and LOGNAME not defined; using
uid of process (0)
# magic to enable using svgalib1-dummy...
if [ "$svgalib" ]; then
sed 's,svgalibg1,svgalibg1 | svgalib-dummyg1,' \
< debian/substvars > debian/substvars.new
mv -f debian/substvars.new debian/substvars
fi
# postinst, prerm
install -m755 debian/postinst debian/prerm $dest/DEBIAN
dpkg-gencontrol -isp
dpkg-gencontrol: warning: no utmp entry available and LOGNAME not defined;
using uid of process (0)
dpkg-architecture: warning: no utmp entry available and LOGNAME not defined;
using uid of process (0)
dpkg-parsechangelog: warning: no utmp entry available and LOGNAME not defined;
using uid of process (0)
debian: warning: no utmp entry available and LOGNAME not defined; using uid of
process (0)
dpkg-architecture: warning: no utmp entry available and LOGNAME not defined;
using uid of process (0)
# Set group, owner, and permissions.
chown -R root.root $dest
chmod -R go=rX $dest
# Make the package.
dpkg --build $dest ..
dpkg-deb: building package `qcam' in `../qcam_0.91-11.2_i386.deb'.
dpkg-genchanges
dpkg-genchanges: warning: no utmp entry available and LOGNAME not defined;
using uid of process (1234)
dpkg-architecture: warning: no utmp entry available and LOGNAME not defined;
using uid of process (1234)
dpkg-parsechangelog: warning: no utmp entry available and LOGNAME not defined;
using uid of process (1234)
debian: warning: no utmp entry available and LOGNAME not defined; using uid of
process (1234)
dpkg-genchanges: not including original source code in upload
dpkg-buildpackage: binary and diff upload (original source NOT included)
Copying back the cached apt archive contents
-> unmounting dev/pts filesystem
-> unmounting proc filesystem
Current time: Tue Jan 17 20:26:11 EST 2006
pbuilder-time-stamp: 1137547571
-> cleaning the build env
-> removing directory /var/cache/pbuilder/build//15018 and its
subdirectories
File lists identical (after any substitutions)
The following lines in the control files differ (wdiff output format):
----------------------------------------------------------------------
Version: [-0.91-11.1-] {+0.91-11.2+}
Depends: libc6 (>= [-2.3.1-1),-] {+2.3.5-1),+} libjpeg62, [-svgalibg1 |
svgalib-dummyg1, xlibs (>> 4.1.0)-] {+libsvga1, libx11-6, libxext6+}
Installed-Size: [-228-] {+236+}
