package xjump
tag 346771 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 xjump-2.7.5/debian/control xjump-2.7.5/debian/control
--- xjump-2.7.5/debian/control
+++ xjump-2.7.5/debian/control
@@ -2,7 +2,7 @@
Section: games
Priority: optional
Maintainer: Masato Taruishi <[EMAIL PROTECTED]>
-Build-Depends: debhelper, dpatch, xlibs-dev, libxaw7-dev
+Build-Depends: debhelper, dpatch, libx11-dev, libxpm-dev, libxt-dev, x-dev,
libxaw7-dev
Standards-Version: 3.5.10
Package: xjump
diff -u xjump-2.7.5/debian/changelog xjump-2.7.5/debian/changelog
--- xjump-2.7.5/debian/changelog
+++ xjump-2.7.5/debian/changelog
@@ -1,3 +1,10 @@
+xjump (2.7.5-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update build-deps for xlibs-dev removal; closes: #346771.
+
+ -- Justin Pryzby <[EMAIL PROTECTED]> Tue, 17 Jan 2006 13:58:45 -0500
+
xjump (2.7.5-1.2) unstable; urgency=low
* NMU, maintainer blessed - thanks Masato
W: /home/pryzbyj/.pbuilderrc does not exist
dpkg-buildpackage: source package is xjump
dpkg-buildpackage: source version is 2.7.5-1.3
dpkg-buildpackage: source changed by Justin Pryzby <[EMAIL PROTECTED]>
fakeroot debian/rules clean
dpatch deapply-all
04_makefile_respect_cflags not applied to ./ .
03_source_warnings not applied to ./ .
02_fix_repeat not applied to ./ .
01_overflow not applied to ./ .
rm -rf patch-stamp patch-stampT debian/patched
dh_testroot
dh_testdir
make clean
make[1]: Entering directory `/home/pryzbyj/bd/xjump-2.7.5'
rm -f *.o xjump *~
make[1]: Leaving directory `/home/pryzbyj/bd/xjump-2.7.5'
dh_clean
dpkg-source -b xjump-2.7.5
dpkg-source: building xjump using existing xjump_2.7.5.orig.tar.gz
dpkg-source: building xjump in xjump_2.7.5-1.3.diff.gz
dpkg-source: building xjump in xjump_2.7.5-1.3.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:58:47 EST 2006
pbuilder-time-stamp: 1137524327
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//24007/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 dpatch
-> Trying dpatch
-> Considering libx11-dev
-> Trying libx11-dev
-> Considering libxpm-dev
-> Trying libxpm-dev
-> Considering libxt-dev
-> Trying libxt-dev
-> Considering x-dev
-> Trying x-dev
-> Considering libxaw7-dev
-> Trying libxaw7-dev
-> Installing debhelper dpatch libx11-dev libxpm-dev libxt-dev x-dev
libxaw7-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 libxau-dev libxau6 libxaw7
libxext-dev libxext6 libxi-dev libxi6 libxkbfile-dev libxkbfile1 libxmu-dev
libxmu6 libxp-dev libxp6 libxpm4 libxt6 po-debconf 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 libice-dev libice6 libmagic1 libsm-dev libsm6 libx11-6
libx11-dev libxau-dev libxau6 libxaw7 libxaw7-dev libxext-dev libxext6
libxi-dev libxi6 libxkbfile-dev libxkbfile1 libxmu-dev libxmu6 libxp-dev
libxp6 libxpm-dev libxpm4 libxt-dev libxt6 po-debconf x-dev x11-common
xlibs-data
0 upgraded, 37 newly installed, 0 to remove and 0 not upgraded.
Need to get 0B/13.3MB of archives.
After unpacking 38.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 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 libxau6 libxau-dev libxt6 libxmu6
libxpm4 libxaw7 libxt-dev libxmu-dev libxp6 libxp-dev libxpm-dev libxaw7-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 dpatch.
Unpacking dpatch (from .../archives/dpatch_2.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 libxau6.
Unpacking libxau6 (from .../libxau6_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxau-dev.
Unpacking libxau-dev (from .../libxau-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 libxmu6.
Unpacking libxmu6 (from .../libxmu6_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxpm4.
Unpacking libxpm4 (from .../libxpm4_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxaw7.
Unpacking libxaw7 (from .../libxaw7_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) ...
Selecting previously deselected package libxmu-dev.
Unpacking libxmu-dev (from .../libxmu-dev_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxp6.
Unpacking libxp6 (from .../libxp6_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxp-dev.
Unpacking libxp-dev (from .../libxp-dev_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxpm-dev.
Unpacking libxpm-dev (from .../libxpm-dev_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxaw7-dev.
Unpacking libxaw7-dev (from .../libxaw7-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 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 libxau6 (6.9.0.dfsg.1-4) ...
Setting up libxau-dev (6.9.0.dfsg.1-4) ...
Setting up libxt6 (6.9.0.dfsg.1-4) ...
Setting up libxmu6 (6.9.0.dfsg.1-4) ...
Setting up libxpm4 (6.9.0.dfsg.1-4) ...
Setting up libxaw7 (6.9.0.dfsg.1-4) ...
Setting up libxp6 (6.9.0.dfsg.1-4) ...
Setting up libx11-dev (6.9.0.dfsg.1-4) ...
Setting up libxi-dev (6.9.0.dfsg.1-4) ...
Setting up libxt-dev (6.9.0.dfsg.1-4) ...
Setting up libxmu-dev (6.9.0.dfsg.1-4) ...
Setting up libxp-dev (6.9.0.dfsg.1-4) ...
Setting up libxpm-dev (6.9.0.dfsg.1-4) ...
Setting up libxaw7-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 ... 12605 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/24007/etc/passwd
/var/cache/pbuilder/build/24007/etc/group
Copying source file
-> copying [../xjump_2.7.5-1.3.dsc]
-> copying [../xjump_2.7.5.orig.tar.gz]
-> copying [../xjump_2.7.5-1.3.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 xjump in xjump-2.7.5
dpkg-source: unpacking xjump_2.7.5.orig.tar.gz
dpkg-source: applying ./xjump_2.7.5-1.3.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 xjump
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.7.5-1.3
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
04_makefile_respect_cflags not applied to ./ .
03_source_warnings not applied to ./ .
02_fix_repeat not applied to ./ .
01_overflow not applied to ./ .
rm -rf patch-stamp patch-stampT debian/patched
dh_testroot
dh_testdir
make clean
make[1]: Entering directory `/tmp/buildd/xjump-2.7.5'
rm -f *.o xjump *~
make[1]: Leaving directory `/tmp/buildd/xjump-2.7.5'
dh_clean
dpkg-source -b xjump-2.7.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 xjump using existing xjump_2.7.5.orig.tar.gz
dpkg-source: building xjump in xjump_2.7.5-1.3.diff.gz
dpkg-source: building xjump in xjump_2.7.5-1.3.dsc
debian/rules build
test -d debian/patched || install -d debian/patched
dpatch apply-all
applying patch 01_overflow to ./ ... ok.
applying patch 02_fix_repeat to ./ ... ok.
applying patch 03_source_warnings to ./ ... ok.
applying patch 04_makefile_respect_cflags to ./ ... ok.
dpatch cat-all >>patch-stampT
mv -f patch-stampT patch-stamp
dh_testdir
make CFLAGS="-O2 -g -Wall"
make[1]: Entering directory `/tmp/buildd/xjump-2.7.5'
gcc -O2 -g -Wall -c -DRECORD_ENTRY=20 main.c -I/usr/X11R6/include
main.c: In function 'set_icon':
main.c:397: warning: pointer targets in passing argument 3 of
'XCreateBitmapFromData' differ in signedness
main.c:400: warning: pointer targets in passing argument 3 of
'XCreateBitmapFromData' differ in signedness
gcc -O2 -g -Wall -c game.c -I/usr/X11R6/include
gcc -O2 -g -Wall -c key.c -I/usr/X11R6/include
gcc -O2 -g -Wall -c misc.c
gcc -O2 -g -Wall -c \
-DRECORD_ENTRY=20 \
-DRECORD_FILE=\"/var/games/xjump/record\" \
record.c
record.c: In function 'sort_record':
record.c:225: warning: passing argument 4 of 'qsort' from incompatible pointer
type
gcc -O2 -g -Wall -c resource.c
gcc -O2 -g -Wall -o xjump \
main.o game.o key.o misc.o record.o resource.o\
-lXaw -lXmu -lXt -lXpm -lXext -lX11 -L/usr/X11R6/lib
make[1]: Leaving directory `/tmp/buildd/xjump-2.7.5'
touch build
fakeroot debian/rules binary
dh_testdir
make CFLAGS="-O2 -g -Wall"
make[1]: Entering directory `/tmp/buildd/xjump-2.7.5'
make[1]: `xjump' is up to date.
make[1]: Leaving directory `/tmp/buildd/xjump-2.7.5'
touch build
dh_testdir
dh_testroot
dh_testdir
dh_clean -k
dh_installdirs
make install DESTDIR=`pwd`/debian/xjump
make[1]: Entering directory `/tmp/buildd/xjump-2.7.5'
install -g games -c -s -m 2755 xjump
/tmp/buildd/xjump-2.7.5/debian/xjump/usr/games/
make[1]: Leaving directory `/tmp/buildd/xjump-2.7.5'
install -m 644 -o root -g root xjump-icon.xpm debian/xjump/usr/share/pixmaps/
dh_installdocs README.euc
dh_installman xjump.6
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_compress
dh_installmenu
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_installdeb
dh_fixperms
chgrp games debian/xjump/var/games/xjump debian/xjump/usr/games/xjump
chmod g+s debian/xjump/usr/games/xjump
dh_builddeb
dpkg-deb: building package `xjump' in `../xjump_2.7.5-1.3_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:59:38 EST 2006
pbuilder-time-stamp: 1137524378
-> cleaning the build env
-> removing directory /var/cache/pbuilder/build//24007 and its
subdirectories
Files in second .deb but not in first
-------------------------------------
/usr/share/menu/xjump
Files in first .deb but not in second
-------------------------------------
/usr/lib/menu/xjump
The following lines in the control files differ (wdiff output format):
----------------------------------------------------------------------
Version: [-2.7.5-1.2-] {+2.7.5-1.3+}
Depends: libc6 (>= [-2.3.1-1),-] {+2.3.5-1), libx11-6,+} libxaw7 (>> 4.1.0),
[-xlibs (>> 4.1.0)-] {+libxext6, libxmu6, libxpm4, libxt6+}
