package xkbset
tag 346782 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 xkbset-0.5/debian/changelog xkbset-0.5/debian/changelog
--- xkbset-0.5/debian/changelog
+++ xkbset-0.5/debian/changelog
@@ -1,3 +1,10 @@
+xkbset (0.5-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update build-deps for xlibs-dev removal; closes: #346782.
+
+ -- Justin Pryzby <[EMAIL PROTECTED]> Tue, 17 Jan 2006 13:57:44 -0500
+
xkbset (0.5-5) unstable; urgency=low
* updated standards version
diff -u xkbset-0.5/debian/control xkbset-0.5/debian/control
--- xkbset-0.5/debian/control
+++ xkbset-0.5/debian/control
@@ -2,7 +2,7 @@
Section: x11
Priority: extra
Maintainer: Francois Gurin <[EMAIL PROTECTED]>
-Build-Depends: xlibs-dev, debhelper (>> 4.0.0), dpatch
+Build-Depends: libx11-dev, debhelper (>> 4.0.0), dpatch
Standards-Version: 3.6.1.0
Package: xkbset
W: /home/pryzbyj/.pbuilderrc does not exist
dpkg-buildpackage: source package is xkbset
dpkg-buildpackage: source version is 0.5-5.1
dpkg-buildpackage: source changed by Justin Pryzby <[EMAIL PROTECTED]>
fakeroot debian/rules clean
dpatch deapply-all
02_clarify_errors not applied to ./ .
01_fix_makefile not applied to ./ .
rm -rf patch-stamp patch-stampT debian/patched
dh_testdir
dh_testroot
rm -f build-stamp
/usr/bin/make clean
make[1]: Entering directory `/home/pryzbyj/bd/xkbset-0.5'
rm -f *.o getargs.c print.c usage.c *.core xkbset config_usage xkbset.1
make[1]: Leaving directory `/home/pryzbyj/bd/xkbset-0.5'
dh_clean
dpkg-source -b xkbset-0.5
dpkg-source: building xkbset using existing xkbset_0.5.orig.tar.gz
dpkg-source: building xkbset in xkbset_0.5-5.1.diff.gz
dpkg-source: building xkbset in xkbset_0.5-5.1.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 13:57:46 EST 2006
pbuilder-time-stamp: 1137524266
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//21817/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 debhelper (>> 4.0.0)
-> Trying debhelper
-> Considering dpatch
-> Trying dpatch
-> Installing libx11-dev debhelper dpatch
Reading package lists...
Building dependency tree...
The following extra packages will be installed:
debconf-utils file gettext gettext-base html2text intltool-debian libmagic1
libx11-6 libxext-dev libxext6 libxi-dev libxi6 libxkbfile-dev libxkbfile1
po-debconf x-dev x11-common xlibs-data
Suggested packages:
dh-make curl cvs gettext-doc x-window-system-core x-window-system
Recommended packages:
fakeroot patchutils libmail-sendmail-perl libcompress-zlib-perl
The following NEW packages will be installed:
debconf-utils debhelper dpatch file gettext gettext-base html2text
intltool-debian libmagic1 libx11-6 libx11-dev libxext-dev libxext6 libxi-dev
libxi6 libxkbfile-dev libxkbfile1 po-debconf x-dev x11-common xlibs-data
0 upgraded, 21 newly installed, 0 to remove and 0 not upgraded.
Need to get 82.5kB/8912kB of archives.
After unpacking 28.8MB of additional disk space will be used.
WARNING: The following packages cannot be authenticated!
gettext-base libmagic1 file debconf-utils html2text gettext intltool-debian
po-debconf debhelper dpatch x11-common xlibs-data libx11-6 libxext6 x-dev
libxext-dev libxi6 libxi-dev libxkbfile1 libxkbfile-dev libx11-dev
Get:1 http://ftp.debian.org sid/main dpatch 2.0.16 [82.5kB]
debconf: delaying package configuration, since apt-utils is not installed
Fetched 82.5kB in 0s (160kB/s)
Selecting previously deselected package gettext-base.
(Reading database ... 10062 files and directories currently installed.)
Unpacking gettext-base (from .../gettext-base_0.14.5-2_i386.deb) ...
Selecting previously deselected package libmagic1.
Unpacking libmagic1 (from .../libmagic1_4.15-2_i386.deb) ...
Selecting previously deselected package file.
Unpacking file (from .../archives/file_4.15-2_i386.deb) ...
Selecting previously deselected package debconf-utils.
Unpacking debconf-utils (from .../debconf-utils_1.4.67_all.deb) ...
Selecting previously deselected package html2text.
Unpacking html2text (from .../html2text_1.3.2a-3_i386.deb) ...
Selecting previously deselected package gettext.
Unpacking gettext (from .../gettext_0.14.5-2_i386.deb) ...
Selecting previously deselected package intltool-debian.
Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
Selecting previously deselected package po-debconf.
Unpacking po-debconf (from .../po-debconf_0.9.2_all.deb) ...
Selecting previously deselected package debhelper.
Unpacking debhelper (from .../debhelper_5.0.16_all.deb) ...
Selecting previously deselected package dpatch.
Unpacking dpatch (from .../archives/dpatch_2.0.16_all.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) ...
Setting up gettext-base (0.14.5-2) ...
Setting up libmagic1 (4.15-2) ...
Setting up file (4.15-2) ...
Setting up debconf-utils (1.4.67) ...
Setting up html2text (1.3.2a-3) ...
Setting up gettext (0.14.5-2) ...
Setting up intltool-debian (0.34.1+20050828) ...
Setting up po-debconf (0.9.2) ...
Setting up debhelper (5.0.16) ...
Setting up dpatch (2.0.16) ...
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 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 ... 12084 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
-> new cache content dpatch_2.0.16_all.deb added
/var/cache/pbuilder/build/21817/etc/passwd
/var/cache/pbuilder/build/21817/etc/group
Copying source file
-> copying [../xkbset_0.5-5.1.dsc]
-> copying [../xkbset_0.5.orig.tar.gz]
-> copying [../xkbset_0.5-5.1.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 xkbset in xkbset-0.5
dpkg-source: unpacking xkbset_0.5.orig.tar.gz
dpkg-source: applying ./xkbset_0.5-5.1.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 xkbset
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.5-5.1
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
dpatch deapply-all
02_clarify_errors not applied to ./ .
01_fix_makefile not applied to ./ .
rm -rf patch-stamp patch-stampT debian/patched
dh_testdir
dh_testroot
rm -f build-stamp
/usr/bin/make clean
make[1]: Entering directory `/tmp/buildd/xkbset-0.5'
rm -f *.o getargs.c print.c usage.c *.core xkbset config_usage xkbset.1
make[1]: Leaving directory `/tmp/buildd/xkbset-0.5'
dh_clean
dpkg-source -b xkbset-0.5
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 xkbset using existing xkbset_0.5.orig.tar.gz
dpkg-source: building xkbset in xkbset_0.5-5.1.diff.gz
dpkg-source: building xkbset in xkbset_0.5-5.1.dsc
debian/rules build
test -d debian/patched || install -d debian/patched
dpatch apply-all
applying patch 01_fix_makefile to ./ ... ok.
applying patch 02_clarify_errors to ./ ... ok.
dpatch cat-all >>patch-stampT
mv -f patch-stampT patch-stamp
dh_testdir
/usr/bin/make
make[1]: Entering directory `/tmp/buildd/xkbset-0.5'
perl create_getargs
cc -I/usr/X11R6/include -L/usr/X11R6/lib -c getargs.c
perl create_print
cc -I/usr/X11R6/include -L/usr/X11R6/lib -c print.c
rm -f config_usage
ln -s config_getargs config_usage
perl create_usage
cc -I/usr/X11R6/include -L/usr/X11R6/lib -c usage.c
cc -I/usr/X11R6/include -L/usr/X11R6/lib -c main.c
cc -I/usr/X11R6/include -L/usr/X11R6/lib -c misc.c
cc -I/usr/X11R6/include -L/usr/X11R6/lib getargs.o print.o usage.o main.o
misc.o -o xkbset -lX11
cp xkbset.man xkbset.1
make[1]: Leaving directory `/tmp/buildd/xkbset-0.5'
touch build-stamp
fakeroot debian/rules binary
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
/usr/bin/make install DESTDIR=/tmp/buildd/xkbset-0.5/debian/xkbset
make[1]: Entering directory `/tmp/buildd/xkbset-0.5'
install -c -s xkbset /tmp/buildd/xkbset-0.5/debian/xkbset/usr/bin
install -c xkbset-gui /tmp/buildd/xkbset-0.5/debian/xkbset/usr/bin
install -c xkbset.1 /tmp/buildd/xkbset-0.5/debian/xkbset/usr/share/man/man1
make[1]: Leaving directory `/tmp/buildd/xkbset-0.5'
dh_testdir
dh_testroot
dh_installdocs
dh_installman
dh_installchangelogs
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)
dh_link
dh_strip
dh_compress
dh_fixperms
dh_installdeb
dh_shlibdeps
dpkg-shlibdeps: warning: no utmp entry available and LOGNAME not defined; using
uid of process (0)
dh_gencontrol
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)
dh_md5sums
dh_builddeb
dpkg-deb: building package `xkbset' in `../xkbset_0.5-5.1_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 13:58:36 EST 2006
pbuilder-time-stamp: 1137524316
-> cleaning the build env
-> removing directory /var/cache/pbuilder/build//21817 and its
subdirectories
File lists identical (after any substitutions)
The following lines in the control files differ (wdiff output format):
----------------------------------------------------------------------
Version: [-0.5-5-] {+0.5-5.1+}
Depends: libc6 (>= [-2.3.2.ds1-21),-] {+2.3.5-1),+} libx11-6 [-| xlibs (>>
4.1.0)-]
Installed-Size: [-116-] {+128+}
