package mozplugger
tag 347033 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 mozplugger-1.7.1/debian/control mozplugger-1.7.1/debian/control
--- mozplugger-1.7.1/debian/control
+++ mozplugger-1.7.1/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Bernard Blackham <[EMAIL PROTECTED]>
 Standards-Version: 3.6.1.0
-Build-Depends: debhelper (>> 4.0.0), xlibs-dev
+Build-Depends: debhelper (>> 4.0.0), libx11-dev, libxt-dev, x-dev
 
 Package: mozplugger
 Architecture: any
diff -u mozplugger-1.7.1/debian/changelog mozplugger-1.7.1/debian/changelog
--- mozplugger-1.7.1/debian/changelog
+++ mozplugger-1.7.1/debian/changelog
@@ -1,3 +1,10 @@
+mozplugger (1.7.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update build-deps for xlibs-dev removal; closes: #347033.
+
+ -- Justin Pryzby <[EMAIL PROTECTED]>  Tue, 17 Jan 2006 21:20:16 -0500
+
 mozplugger (1.7.1-1) unstable; urgency=low
 
   * New upstream (Closes: #274652)
W: /home/pryzbyj/.pbuilderrc does not exist
dpkg-buildpackage: source package is mozplugger
dpkg-buildpackage: source version is 1.7.1-1.1
dpkg-buildpackage: source changed by Justin Pryzby <[EMAIL PROTECTED]>
 fakeroot debian/rules clean
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
/usr/bin/make clean
make[1]: Entering directory `/home/pryzbyj/bd/mozplugger-1.7.1'
rm -f *.o npapi/common/*.o
rm -f mozplugger-helper mozplugger-controller mozplugger.so
make[1]: Leaving directory `/home/pryzbyj/bd/mozplugger-1.7.1'
dh_clean
 dpkg-source -b mozplugger-1.7.1
dpkg-source: building mozplugger using existing mozplugger_1.7.1.orig.tar.gz
dpkg-source: building mozplugger in mozplugger_1.7.1-1.1.diff.gz
dpkg-source: building mozplugger in mozplugger_1.7.1-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 21:20:17 EST 2006
pbuilder-time-stamp: 1137550817
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//1994/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 (>> 4.0.0)
   -> Trying debhelper
 -> Considering  libx11-dev
   -> Trying libx11-dev
 -> Considering  libxt-dev
   -> Trying libxt-dev
 -> Considering  x-dev
   -> Trying x-dev
 -> Installing  debhelper libx11-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 libxext-dev 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/1994/etc/passwd
/var/cache/pbuilder/build/1994/etc/group
Copying source file
    -> copying [../mozplugger_1.7.1-1.1.dsc]
    -> copying [../mozplugger_1.7.1.orig.tar.gz]
    -> copying [../mozplugger_1.7.1-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 mozplugger in mozplugger-1.7.1
dpkg-source: unpacking mozplugger_1.7.1.orig.tar.gz
dpkg-source: applying ./mozplugger_1.7.1-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 mozplugger
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.7.1-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 configure-stamp
# Add here commands to clean up after the build process.
/usr/bin/make clean
make[1]: Entering directory `/tmp/buildd/mozplugger-1.7.1'
rm -f *.o npapi/common/*.o
rm -f mozplugger-helper mozplugger-controller mozplugger.so
make[1]: Leaving directory `/tmp/buildd/mozplugger-1.7.1'
dh_clean
 dpkg-source -b mozplugger-1.7.1
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 mozplugger using existing mozplugger_1.7.1.orig.tar.gz
dpkg-source: building mozplugger in mozplugger_1.7.1-1.1.diff.gz
dpkg-source: building mozplugger in mozplugger_1.7.1-1.1.dsc
 debian/rules build
dh_testdir
touch configure-stamp
dh_testdir
/usr/bin/make linux
make[1]: Entering directory `/tmp/buildd/mozplugger-1.7.1'
/usr/bin/make all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared
make[2]: Entering directory `/tmp/buildd/mozplugger-1.7.1'
gcc -c -O2 -Inpapi/include -I/usr/X11R6/include -DXP_UNIX  -DVERSION=\"1.7.1\" 
-Wall  -fPIC -o mozplugger.o mozplugger.c
gcc -c -O2 -Inpapi/include -I/usr/X11R6/include -DXP_UNIX  -DVERSION=\"1.7.1\" 
-Wall  -fPIC -o stub.o npapi/common/npunix.c
gcc -c -O2 -Inpapi/include -I/usr/X11R6/include -DXP_UNIX  -DVERSION=\"1.7.1\" 
-Wall  -fPIC -o mozplugger-common.o mozplugger-common.c
gcc -shared   -o mozplugger.so mozplugger.o mozplugger-common.o stub.o
gcc -O2 -Inpapi/include -I/usr/X11R6/include -DXP_UNIX  -DVERSION=\"1.7.1\" 
-Wall     -c -o mozplugger-helper.o mozplugger-helper.c
mozplugger-helper.c: In function 'winrecur':
mozplugger-helper.c:249: warning: pointer targets in passing argument 6 of 
'XQueryTree' differ in signedness
gcc   -o mozplugger-helper mozplugger-helper.o mozplugger-common.o -lX11 
-L/usr/X11R6/lib
gcc -O2 -Inpapi/include -I/usr/X11R6/include -DXP_UNIX  -DVERSION=\"1.7.1\" 
-Wall     -c -o mozplugger-controller.o mozplugger-controller.c
gcc -o mozplugger-controller mozplugger-controller.o mozplugger-common.o   
-lX11 -L/usr/X11R6/lib
make[2]: Leaving directory `/tmp/buildd/mozplugger-1.7.1'
make[1]: Leaving directory `/tmp/buildd/mozplugger-1.7.1'
touch build-stamp
 fakeroot debian/rules binary
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# Add here commands to install the package into debian/mozplugger.
/usr/bin/make install DESTDIR=/tmp/buildd/mozplugger-1.7.1/debian/mozplugger
make[1]: Entering directory `/tmp/buildd/mozplugger-1.7.1'
cp mozplugger-helper /tmp/buildd/mozplugger-1.7.1/debian/mozplugger/usr/bin/
cp mozplugger-controller /tmp/buildd/mozplugger-1.7.1/debian/mozplugger/usr/bin/
cp mozplugger.so 
/tmp/buildd/mozplugger-1.7.1/debian/mozplugger/usr/lib/mozilla/plugins/
cp mozpluggerrc /tmp/buildd/mozplugger-1.7.1/debian/mozplugger/etc/
cp mozplugger.7 
/tmp/buildd/mozplugger-1.7.1/debian/mozplugger/usr/share/man/man7/
cp mozplugger*.1 
/tmp/buildd/mozplugger-1.7.1/debian/mozplugger/usr/share/man/man1/
make[1]: Leaving directory `/tmp/buildd/mozplugger-1.7.1'
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
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_installdocs
dh_installexamples
dh_installman
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 `mozplugger' in `../mozplugger_1.7.1-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 21:20:51 EST 2006
pbuilder-time-stamp: 1137550851
 -> cleaning the build env 
    -> removing directory /var/cache/pbuilder/build//1994 and its subdirectories
File lists identical (after any substitutions)

The following lines in the control files differ (wdiff output format):
----------------------------------------------------------------------
Version: [-1.7.1-1-] {+1.7.1-1.1+}
Depends: m4, libc6 (>= [-2.3.2.ds1-4),-] {+2.3.5-1),+} libx11-6 [-| xlibs (>> 
4.1.0)-]

Reply via email to