review ghostess

[rosea grammostola]

Hi,

There is a new upstream version with manpage now. I tried to merge it, but I
do get patches related messages when running git-buildpackage.

The short howto on the multimedia wiki says

"resolve merge conflicts, review your changes e.g. with gitk"

How to check if there are conflicts and how to resolve those? When i use
gitk I get a 'crappy' GUI with letters I can't read clearly...



        done
dh_clean
rm -f debian/stamp-autotools-files
rm -f debian/cdbs-install-list debian/cdbs-package-list
debian/stamp-copyright-check debian/stamp-buildinfo
 dpkg-source -i -I -b ghostess
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building ghostess using existing
./ghostess_20100905.orig.tar.bz2
patching file config.h.in
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file config.h.in.rej
patching file Makefile.in
Reversed (or previously applied) patch detected!  Skipping patch.
15 out of 15 hunks ignored -- saving rejects to file Makefile.in.rej
patching file configure.ac
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file configure.ac.rej
patching file config.guess
Reversed (or previously applied) patch detected!  Skipping patch.
9 out of 9 hunks ignored -- saving rejects to file config.guess.rej
patching file config.sub
Reversed (or previously applied) patch detected!  Skipping patch.
5 out of 5 hunks ignored -- saving rejects to file config.sub.rej
patching file configure
Reversed (or previously applied) patch detected!  Skipping patch.
381 out of 381 hunks ignored -- saving rejects to file configure.rej
patching file Makefile.am
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file Makefile.am.rej
patching file aclocal.m4
Reversed (or previously applied) patch detected!  Skipping patch.
22 out of 22 hunks ignored -- saving rejects to file aclocal.m4.rej
patching file ChangeLog
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file ChangeLog.rej
The next patch would create the file ghostess.1,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
patching file ltmain.sh
Reversed (or previously applied) patch detected!  Skipping patch.
8 out of 8 hunks ignored -- saving rejects to file ltmain.sh.rej
patching file README
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file README.rej
patching file src/ghostess.c
Reversed (or previously applied) patch detected!  Skipping patch.
3 out of 3 hunks ignored -- saving rejects to file src/ghostess.c.rej
patching file src/Makefile.in
Reversed (or previously applied) patch detected!  Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file src/Makefile.in.rej
patching file src/gtkknob.h
Reversed (or previously applied) patch detected!  Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file src/gtkknob.h.rej
patching file src/universal_gui.c
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file src/universal_gui.c.rej
patching file src/gtkknob.c
Reversed (or previously applied) patch detected!  Skipping patch.
20 out of 20 hunks ignored -- saving rejects to file src/gtkknob.c.rej
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -g0 -E -b -B
.pc/debian-changes-20100326-1/ <
ghostess.orig.J2_mCQ/debian/patches/debian-changes-20100326-1 gave error
exit status 1
dpkg-buildpackage: error: dpkg-source -i -I -b ghostess gave error exit
status 2
/usr/local/bin/gbp-pbuilder returned 2
Couldn't run '/usr/local/bin/gbp-pbuilder'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20100906/de2d736a/attachment.htm>