package xdaliclock
tag 346805 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 xdaliclock-2.20/debian/changelog xdaliclock-2.20/debian/changelog
--- xdaliclock-2.20/debian/changelog
+++ xdaliclock-2.20/debian/changelog
@@ -1,3 +1,10 @@
+xdaliclock (2.20-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update build-deps for xlibs-dev removal; closes: #346805.
+
+ -- Justin Pryzby <[EMAIL PROTECTED]> Tue, 17 Jan 2006 14:16:01 -0500
+
xdaliclock (2.20-1) unstable; urgency=low
* New upstream version fixes Xinerama problems (Closes: #217684)
diff -u xdaliclock-2.20/debian/control xdaliclock-2.20/debian/control
--- xdaliclock-2.20/debian/control
+++ xdaliclock-2.20/debian/control
@@ -1,7 +1,7 @@
Source: xdaliclock
Section: x11
Priority: optional
-Build-Depends: debhelper, xlibs-dev
+Build-Depends: debhelper, libx11-dev, libxext-dev, libxt-dev, x-dev
Maintainer: Aaron Lehmann <[EMAIL PROTECTED]>
Standards-Version: 3.6.1.0
W: /home/pryzbyj/.pbuilderrc does not exist
dpkg-buildpackage: source package is xdaliclock
dpkg-buildpackage: source version is 2.20-1.1
dpkg-buildpackage: source changed by Justin Pryzby <[EMAIL PROTECTED]>
fakeroot debian/rules clean
dh_testdir
dh_testroot
rm -f build-stamp
/usr/bin/make -C X11 distclean
make[1]: Entering directory `/home/pryzbyj/bd/xdaliclock-2.20/X11'
make[1]: *** No rule to make target `distclean'. Stop.
make[1]: Leaving directory `/home/pryzbyj/bd/xdaliclock-2.20/X11'
make: [clean] Error 2 (ignored)
dh_clean Makefile
dh_clean: Compatibility levels before 4 are deprecated.
dpkg-source -b xdaliclock-2.20
dpkg-source: building xdaliclock using existing xdaliclock_2.20.orig.tar.gz
dpkg-source: building xdaliclock in xdaliclock_2.20-1.1.diff.gz
dpkg-source: warning: ignoring deletion of file Makefile
dpkg-source: building xdaliclock in xdaliclock_2.20-1.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 14:16:04 EST 2006
pbuilder-time-stamp: 1137525364
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//1849/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 debhelper
-> Trying debhelper
-> Considering libx11-dev
-> Trying libx11-dev
-> Considering libxext-dev
-> Trying libxext-dev
-> Considering libxt-dev
-> Trying libxt-dev
-> Considering x-dev
-> Trying x-dev
-> Installing debhelper libx11-dev libxext-dev libxt-dev x-dev
Reading package lists...
Building dependency tree...
The following extra packages will be installed:
debconf-utils file gettext gettext-base html2text intltool-debian libice-dev
libice6 libmagic1 libsm-dev libsm6 libx11-6 libxext6 libxi-dev libxi6
libxkbfile-dev libxkbfile1 libxt6 po-debconf x11-common xlibs-data
Suggested packages:
dh-make cvs gettext-doc x-window-system-core x-window-system
Recommended packages:
curl wget lynx libmail-sendmail-perl libcompress-zlib-perl
The following NEW packages will be installed:
debconf-utils debhelper file gettext gettext-base html2text intltool-debian
libice-dev libice6 libmagic1 libsm-dev libsm6 libx11-6 libx11-dev
libxext-dev libxext6 libxi-dev libxi6 libxkbfile-dev libxkbfile1 libxt-dev
libxt6 po-debconf x-dev x11-common xlibs-data
0 upgraded, 26 newly installed, 0 to remove and 0 not upgraded.
Need to get 0B/10.7MB of archives.
After unpacking 33.1MB 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 libice6 x-dev libice-dev libsm6 libsm-dev x11-common
xlibs-data libx11-6 libxext6 libxext-dev libxi6 libxi-dev libxkbfile1
libxkbfile-dev libx11-dev libxt6 libxt-dev
debconf: delaying package configuration, since apt-utils is not installed
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 libice6.
Unpacking libice6 (from .../libice6_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 libice-dev.
Unpacking libice-dev (from .../libice-dev_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libsm6.
Unpacking libsm6 (from .../libsm6_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libsm-dev.
Unpacking libsm-dev (from .../libsm-dev_6.9.0.dfsg.1-4_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 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 libxt6.
Unpacking libxt6 (from .../libxt6_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxt-dev.
Unpacking libxt-dev (from .../libxt-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 libice6 (6.9.0.dfsg.1-4) ...
Setting up x-dev (6.9.0.dfsg.1-4) ...
Setting up libice-dev (6.9.0.dfsg.1-4) ...
Setting up libsm6 (6.9.0.dfsg.1-4) ...
Setting up libsm-dev (6.9.0.dfsg.1-4) ...
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 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 libxt6 (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) ...
Setting up libxt-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 ... 12389 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/1849/etc/passwd
/var/cache/pbuilder/build/1849/etc/group
Copying source file
-> copying [../xdaliclock_2.20-1.1.dsc]
-> copying [../xdaliclock_2.20.orig.tar.gz]
-> copying [../xdaliclock_2.20-1.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 xdaliclock in xdaliclock-2.20
dpkg-source: unpacking xdaliclock_2.20.orig.tar.gz
dpkg-source: applying ./xdaliclock_2.20-1.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 xdaliclock
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 2.20-1.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
dh_testdir
dh_testroot
rm -f build-stamp
/usr/bin/make -C X11 distclean
make[1]: Entering directory `/tmp/buildd/xdaliclock-2.20/X11'
make[1]: *** No rule to make target `distclean'. Stop.
make[1]: Leaving directory `/tmp/buildd/xdaliclock-2.20/X11'
make: [clean] Error 2 (ignored)
dh_clean Makefile
dh_clean: Compatibility levels before 4 are deprecated.
dpkg-source -b xdaliclock-2.20
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 xdaliclock using existing xdaliclock_2.20.orig.tar.gz
dpkg-source: building xdaliclock in xdaliclock_2.20-1.1.diff.gz
dpkg-source: warning: ignoring deletion of file Makefile
dpkg-source: building xdaliclock in xdaliclock_2.20-1.1.dsc
debian/rules build
dh_testdir
cd X11/ && ./configure --prefix=/usr --mandir=/usr/share/man
current directory: /tmp/buildd/xdaliclock-2.20/X11
command line was: ./configure --prefix=/usr --mandir=/usr/share/man
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for gcc... gcc
checking for C compiler default output... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables...
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ANSI C... none needed
checking whether the compiler works on ANSI C... yes
Turning on gcc compiler warnings.
checking whether gcc accepts -std... yes
Disabling C++ comments in ANSI C code.
checking how to run the C preprocessor... gcc -Wall -Wstrict-prototypes
-Wnested-externs -std=c89 -U__STRICT_ANSI__ -E
checking for an ANSI C-conforming const... yes
checking for inline... __inline__
checking for a BSD-compatible install... /usr/bin/install -c
checking whether make sets $(MAKE)... yes
checking for egrep... grep -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking for unistd.h... (cached) yes
checking whether time.h and sys/time.h may both be included... yes
checking for sys/wait.h that is POSIX.1 compatible... yes
checking for select... yes
checking sys/select.h usability... yes
checking sys/select.h presence... yes
checking for sys/select.h... yes
checking for X... libraries /usr/X11R6/lib, headers
checking for gethostbyname... yes
checking for connect... yes
checking for remove... yes
checking for shmat... yes
checking for IceConnectionNumber in -lICE... yes
checking X11/extensions/shape.h usability... yes
checking X11/extensions/shape.h presence... yes
checking for X11/extensions/shape.h... yes
configure: creating ./config.status
config.status: creating Makefile
config.status: creating config.h
/usr/bin/make -C X11
make[1]: Entering directory `/tmp/buildd/xdaliclock-2.20/X11'
gcc -Wall -Wstrict-prototypes -Wnested-externs -std=c89 -U__STRICT_ANSI__ -c
-I. -I. -I./.. -I/usr/include -DHAVE_CONFIG_H -g -O2 xdaliclock.c
In file included from xdaliclock.c:38:
vroot.h: In function 'VirtualRootWindowOfScreen':
vroot.h:125: warning: dereferencing type-punned pointer will break
strict-aliasing rules
gcc -Wall -Wstrict-prototypes -Wnested-externs -std=c89 -U__STRICT_ANSI__ -c
-I. -I. -I./.. -I/usr/include -DHAVE_CONFIG_H -g -O2 \
-I./../numbers0 -I./../numbers1 -I./../numbers2 -I./../numbers3
./digital.c
In file included from ./digital.c:36:
./vroot.h: In function 'VirtualRootWindowOfScreen':
./vroot.h:125: warning: dereferencing type-punned pointer will break
strict-aliasing rules
gcc -Wall -Wstrict-prototypes -Wnested-externs -std=c89 -U__STRICT_ANSI__ -c
-I. -I. -I./.. -I/usr/include -DHAVE_CONFIG_H -g -O2 colors.c
gcc -Wall -Wstrict-prototypes -Wnested-externs -std=c89 -U__STRICT_ANSI__ -c
-I. -I. -I./.. -I/usr/include -DHAVE_CONFIG_H -g -O2 resources.c
gcc -Wall -Wstrict-prototypes -Wnested-externs -std=c89 -U__STRICT_ANSI__ -c
-I. -I. -I./.. -I/usr/include -DHAVE_CONFIG_H -g -O2 visual.c
gcc -Wall -Wstrict-prototypes -Wnested-externs -std=c89 -U__STRICT_ANSI__ -c
-I. -I. -I./.. -I/usr/include -DHAVE_CONFIG_H -g -O2 overlay.c
overlay.c: In function 'get_overlay_prop':
overlay.c:80: warning: dereferencing type-punned pointer will break
strict-aliasing rules
gcc -Wall -Wstrict-prototypes -Wnested-externs -std=c89 -U__STRICT_ANSI__ -c
-I. -I. -I./.. -I/usr/include -DHAVE_CONFIG_H -g -O2 hsv.c
gcc -Wall -Wstrict-prototypes -Wnested-externs -std=c89 -U__STRICT_ANSI__ -c
-I. -I. -I./.. -I/usr/include -DHAVE_CONFIG_H -g -O2 usleep.c
gcc -Wall -Wstrict-prototypes -Wnested-externs -std=c89 -U__STRICT_ANSI__
-L/usr/lib -o xdaliclock xdaliclock.o digital.o colors.o resources.o visual.o
overlay.o hsv.o usleep.o -L/usr/X11R6/lib -lSM -lICE -lXt -lX11 -lXext
make[1]: Leaving directory `/tmp/buildd/xdaliclock-2.20/X11'
touch build-stamp
fakeroot debian/rules binary
dh_testdir
dh_testroot
dh_clean -k
dh_clean: Compatibility levels before 4 are deprecated.
dh_installdirs usr/share/man/man1 usr/bin
dh_installdirs: Compatibility levels before 4 are deprecated.
/usr/bin/make -C X11 install_prefix=/tmp/buildd/xdaliclock-2.20/debian/tmp
install
make[1]: Entering directory `/tmp/buildd/xdaliclock-2.20/X11'
/usr/bin/install -c xdaliclock
/tmp/buildd/xdaliclock-2.20/debian/tmp/usr/bin/xdaliclock
/usr/bin/install -c ./xdaliclock.man
/tmp/buildd/xdaliclock-2.20/debian/tmp/usr/share/man/man1/xdaliclock.1
make[1]: Leaving directory `/tmp/buildd/xdaliclock-2.20/X11'
dh_testdir
dh_testroot
dh_installdocs README
dh_installdocs: Compatibility levels before 4 are deprecated.
# append copyright to copyright file.
head -11 X11/xdaliclock.c >> debian/tmp/usr/share/doc/xdaliclock/copyright
dh_installexamples
dh_installexamples: Compatibility levels before 4 are deprecated.
dh_installmenu
dh_installmenu: Compatibility levels before 4 are deprecated.
dh_installmanpages
dh_installmanpages: This program is deprecated, switch to dh_installman.
dh_installmanpages: Compatibility levels before 4 are deprecated.
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_installchangelogs: Compatibility levels before 4 are deprecated.
dh_link
dh_link: Compatibility levels before 4 are deprecated.
dh_strip
dh_strip: Compatibility levels before 4 are deprecated.
dh_compress
dh_compress: Compatibility levels before 4 are deprecated.
dh_fixperms
dh_fixperms: Compatibility levels before 4 are deprecated.
dh_installdeb
dh_installdeb: Compatibility levels before 4 are deprecated.
dh_shlibdeps
dh_shlibdeps: Compatibility levels before 4 are deprecated.
dpkg-shlibdeps: warning: no utmp entry available and LOGNAME not defined; using
uid of process (0)
dh_gencontrol
dh_gencontrol: Compatibility levels before 4 are deprecated.
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_md5sums: Compatibility levels before 4 are deprecated.
dh_builddeb
dh_builddeb: Compatibility levels before 4 are deprecated.
dpkg-deb: building package `xdaliclock' in `../xdaliclock_2.20-1.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 14:17:03 EST 2006
pbuilder-time-stamp: 1137525423
-> cleaning the build env
-> removing directory /var/cache/pbuilder/build//1849 and its subdirectories
Files in second .deb but not in first
-------------------------------------
/usr/share/menu/xdaliclock
Files in first .deb but not in second
-------------------------------------
/usr/lib/menu/xdaliclock
The following lines in the control files differ (wdiff output format):
----------------------------------------------------------------------
Version: [-2.20-1-] {+2.20-1.1+}
Depends: libc6 (>= [-2.3.2.ds1-4), xlibs (>> 4.1.0)-] {+2.3.5-1), libice6,
libsm6, libx11-6, libxext6, libxt6+}
Installed-Size: [-156-] {+152+}
