package x2x
tag 346755 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 x2x-1.27/debian/control x2x-1.27/debian/control
--- x2x-1.27/debian/control
+++ x2x-1.27/debian/control
@@ -1,6 +1,6 @@
Source: x2x
Maintainer: Randolph Chung <[EMAIL PROTECTED]>
-Build-Depends: debhelper,xlibs-dev,xutils
+Build-Depends: debhelper, libx11-dev, libxtst-dev, x-dev, xutils
Section: x11
Priority: optional
Standards-Version: 3.2.1.0
diff -u x2x-1.27/debian/changelog x2x-1.27/debian/changelog
--- x2x-1.27/debian/changelog
+++ x2x-1.27/debian/changelog
@@ -1,3 +1,10 @@
+x2x (1.27-8.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update build-deps for xlibs-dev removal; closes: #346755.
+
+ -- Justin Pryzby <[EMAIL PROTECTED]> Tue, 17 Jan 2006 14:38:15 -0500
+
x2x (1.27-8) unstable; urgency=low
* Forgot to fix the maintainer in debian/control. Fixed now...
W: /home/pryzbyj/.pbuilderrc does not exist
dpkg-buildpackage: source package is x2x
dpkg-buildpackage: source version is 1.27-8.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 clean
make[1]: Entering directory `/home/pryzbyj/bd/x2x-1.27'
make[1]: *** No rule to make target `clean'. Stop.
make[1]: Leaving directory `/home/pryzbyj/bd/x2x-1.27'
make: [clean] Error 2 (ignored)
dh_clean
dh_clean: Compatibility levels before 4 are deprecated.
rm -f x2x.man
rm -f Makefile Makefile.bak
dpkg-source -b x2x-1.27
dpkg-source: building x2x using existing x2x_1.27.orig.tar.gz
dpkg-source: building x2x in x2x_1.27-8.1.diff.gz
dpkg-source: building x2x in x2x_1.27-8.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:38:17 EST 2006
pbuilder-time-stamp: 1137526697
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//17317/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 libxtst-dev
-> Trying libxtst-dev
-> Considering x-dev
-> Trying x-dev
-> Considering xutils
-> Trying xutils
-> Installing debhelper libx11-dev libxtst-dev x-dev xutils
Reading package lists...
Building dependency tree...
The following extra packages will be installed:
debconf-utils file gettext gettext-base html2text intltool-debian
libfreetype6 libfs6 libmagic1 libx11-6 libxext-dev libxext6 libxi-dev libxi6
libxkbfile-dev libxkbfile1 libxtst6 po-debconf x11-common xlibs-data
Suggested packages:
dh-make cvs gettext-doc libfreetype6-dev x-window-system-core
x-window-system ssh rsh-server
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
libfreetype6 libfs6 libmagic1 libx11-6 libx11-dev libxext-dev libxext6
libxi-dev libxi6 libxkbfile-dev libxkbfile1 libxtst-dev libxtst6 po-debconf
x-dev x11-common xlibs-data xutils
0 upgraded, 25 newly installed, 0 to remove and 0 not upgraded.
Need to get 0B/10.6MB of archives.
After unpacking 33.2MB 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 libfreetype6 libfs6 x11-common xlibs-data libx11-6
libxext6 x-dev libxext-dev libxi6 libxi-dev libxkbfile1 libxkbfile-dev
libx11-dev libxtst6 libxtst-dev xutils
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 libfreetype6.
Unpacking libfreetype6 (from .../libfreetype6_2.1.10-1_i386.deb) ...
Selecting previously deselected package libfs6.
Unpacking libfs6 (from .../libfs6_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 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 libxtst6.
Unpacking libxtst6 (from .../libxtst6_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package libxtst-dev.
Unpacking libxtst-dev (from .../libxtst-dev_6.9.0.dfsg.1-4_i386.deb) ...
Selecting previously deselected package xutils.
Unpacking xutils (from .../xutils_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 libfreetype6 (2.1.10-1) ...
Setting up libfs6 (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 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 libxtst6 (6.9.0.dfsg.1-4) ...
Setting up xutils (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 libxtst-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 ... 12304 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/17317/etc/passwd
/var/cache/pbuilder/build/17317/etc/group
Copying source file
-> copying [../x2x_1.27-8.1.dsc]
-> copying [../x2x_1.27.orig.tar.gz]
-> copying [../x2x_1.27-8.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 x2x in x2x-1.27
dpkg-source: unpacking x2x_1.27.orig.tar.gz
dpkg-source: applying ./x2x_1.27-8.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 x2x
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 1.27-8.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 clean
make[1]: Entering directory `/tmp/buildd/x2x-1.27'
make[1]: *** No rule to make target `clean'. Stop.
make[1]: Leaving directory `/tmp/buildd/x2x-1.27'
make: [clean] Error 2 (ignored)
dh_clean
dh_clean: Compatibility levels before 4 are deprecated.
rm -f x2x.man
rm -f Makefile Makefile.bak
dpkg-source -b x2x-1.27
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 x2x using existing x2x_1.27.orig.tar.gz
dpkg-source: building x2x in x2x_1.27-8.1.diff.gz
dpkg-source: building x2x in x2x_1.27-8.1.dsc
debian/rules build
dh_testdir
# build package here
ln -s x2x.1 x2x.man
xmkmf -a
imake -DUseInstalled -I/usr/X11R6/lib/X11/config
make Makefiles
make[1]: Entering directory `/tmp/buildd/x2x-1.27'
make[1]: Nothing to be done for `Makefiles'.
make[1]: Leaving directory `/tmp/buildd/x2x-1.27'
make includes
make[1]: Entering directory `/tmp/buildd/x2x-1.27'
make[1]: Nothing to be done for `includes'.
make[1]: Leaving directory `/tmp/buildd/x2x-1.27'
make depend
make[1]: Entering directory `/tmp/buildd/x2x-1.27'
gccmakedep -- -I/usr/X11R6/include -Dlinux -D__i386__
-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE
-D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-- lawyerese.c
x2x.c
make[1]: Leaving directory `/tmp/buildd/x2x-1.27'
make CDEBUGFLAGS="-O2 -g"
make[1]: Entering directory `/tmp/buildd/x2x-1.27'
gcc -Wall -g -O2 -c -o lawyerese.o lawyerese.c
gcc -Wall -g -O2 -c -o x2x.o x2x.c
x2x.c: In function 'InitDpyInfo':
x2x.c:740: warning: pointer targets in passing argument 6 of 'XGetGeometry'
differ in signedness
x2x.c:740: warning: pointer targets in passing argument 7 of 'XGetGeometry'
differ in signedness
x2x.c:740: warning: pointer targets in passing argument 8 of 'XGetGeometry'
differ in signedness
x2x.c:740: warning: pointer targets in passing argument 9 of 'XGetGeometry'
differ in signedness
x2x.c: In function 'ProcessEvent':
x2x.c:1014: warning: dereferencing type-punned pointer will break
strict-aliasing rules
x2x.c:1015: warning: dereferencing type-punned pointer will break
strict-aliasing rules
x2x.c: In function 'DoX2X':
x2x.c:617: warning: 'textGC' may be used uninitialized in this function
x2x.c:607: warning: 'tascent' may be used uninitialized in this function
x2x.c:612: warning: 'gravity' may be used uninitialized in this function
x2x.c:607: warning: 'theight' may be used uninitialized in this function
x2x.c:607: warning: 'twidth' may be used uninitialized in this function
rm -f x2x
gcc -o x2x -O2 -g -L/usr/X11R6/lib lawyerese.o x2x.o -lXtst -lXext
-lXext -lX11
rm -f x2x._man
if test -z "true" ; then \
cd `dirname x2x` && \
ln -s `basename x2x.man` `basename x2x._man`; \
else \
cpp -undef -traditional
-D__apploaddir__=/etc/X11/app-defaults -D__filemansuffix__=5x
-D__osfilemansuffix__=5 -D__libmansuffix__=3x -D__oslibmansuffix__=3
-D__mansuffix__=1x -D__osmansuffix__=1 -D__syscallmansuffix__=2x
-D__ossysmansuffix__=2 -D__gamemansuffix__=6x -D__osgamemansuffix__=6
-D__miscmansuffix__=7x -D__osmiscmansuffix__=7 -D__admmansuffix__=8x
-D__osadmmansuffix__=8 -D__miscmansuffix__=7x -D__osmiscmansuffix__=7
-D__drivermansuffix__=4x -D__osdrivermansuffix__=4 -D__adminmansuffix__=8
-D__projectroot__=/usr/X11R6 -D__xconfigfile__=xorg.conf
-D__xconfigdir__=/usr/X11R6/lib/X11 -D__xlogfile__=Xorg -D__xservername__=Xorg
-D__appmansuffix__=1x -D__xorgversion__="\"`echo 6 9 0 | sed -e 's/ /./g' -e
's/^/Version\\\ /'`\" \"X Version 11\"" -D__vendorversion__="`echo 6 9 0 | sed
-e 's/ /./g' -e 's/^/Version\\\ /'` X.Org" \
< x2x.man | sed -e '/^# *[0-9][0-9]* *.*$/d'
-e '/^#line *[0-9][0-9]* *.*$/d' -e '/^[
]*XCOMM$/s/XCOMM/#/' -e '/^[
]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' -e '/^[
]*XHASH/s/XHASH/#/' -e '/[EMAIL PROTECTED]@$/s/[EMAIL
PROTECTED]@$/\\/' >x2x._man; \
fi
make[1]: Leaving directory `/tmp/buildd/x2x-1.27'
touch build-stamp
fakeroot debian/rules binary
dh_testdir
dh_testroot
dh_clean -k
dh_clean: Compatibility levels before 4 are deprecated.
dh_installdirs
dh_installdirs: Compatibility levels before 4 are deprecated.
dh_testdir
dh_testroot
dh_installdebconf
dh_installdebconf: Compatibility levels before 4 are deprecated.
dh_installdirs usr/bin
dh_installdirs: Compatibility levels before 4 are deprecated.
cp x2x debian/x2x/usr/bin
dh_installmanpages
dh_installmanpages: This program is deprecated, switch to dh_installman.
dh_installmanpages: Compatibility levels before 4 are deprecated.
dh_installdocs
dh_installdocs: 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_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_builddeb
dh_builddeb: Compatibility levels before 4 are deprecated.
dpkg-deb: building package `x2x' in `../x2x_1.27-8.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:38:55 EST 2006
pbuilder-time-stamp: 1137526735
-> cleaning the build env
-> removing directory /var/cache/pbuilder/build//17317 and its
subdirectories
File lists identical (after any substitutions)
The following lines in the control files differ (wdiff output format):
----------------------------------------------------------------------
Version: [-1.27-8-] {+1.27-8.1+}
Depends: libc6 (>= [-2.2.5-13), xlibs (>> 4.1.0)-] {+2.3.5-1), libx11-6,
libxext6, libxtst6+}
