Hi,<br><br>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.<br><br>The short howto on the multimedia wiki says <br><br>"resolve merge conflicts, review your changes e.g. with <tt class="backtick">gitk"</tt><br>
<br>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...<br><br><br><br> done<br>dh_clean <br>rm -f debian/stamp-autotools-files<br>
rm -f debian/cdbs-install-list debian/cdbs-package-list debian/stamp-copyright-check debian/stamp-buildinfo<br> dpkg-source -i -I -b ghostess<br>dpkg-source: info: using source format `3.0 (quilt)'<br>dpkg-source: info: building ghostess using existing ./ghostess_20100905.orig.tar.bz2<br>
patching file <a href="http://config.h.in">config.h.in</a><br>Reversed (or previously applied) patch detected! Skipping patch.<br>1 out of 1 hunk ignored -- saving rejects to file config.h.in.rej<br>patching file Makefile.in<br>
Reversed (or previously applied) patch detected! Skipping patch.<br>15 out of 15 hunks ignored -- saving rejects to file Makefile.in.rej<br>patching file <a href="http://configure.ac">configure.ac</a><br>Reversed (or previously applied) patch detected! Skipping patch.<br>
1 out of 1 hunk ignored -- saving rejects to file configure.ac.rej<br>patching file config.guess<br>Reversed (or previously applied) patch detected! Skipping patch.<br>9 out of 9 hunks ignored -- saving rejects to file config.guess.rej<br>
patching file config.sub<br>Reversed (or previously applied) patch detected! Skipping patch.<br>5 out of 5 hunks ignored -- saving rejects to file config.sub.rej<br>patching file configure<br>Reversed (or previously applied) patch detected! Skipping patch.<br>
381 out of 381 hunks ignored -- saving rejects to file configure.rej<br>patching file Makefile.am<br>Reversed (or previously applied) patch detected! Skipping patch.<br>1 out of 1 hunk ignored -- saving rejects to file Makefile.am.rej<br>
patching file aclocal.m4<br>Reversed (or previously applied) patch detected! Skipping patch.<br>22 out of 22 hunks ignored -- saving rejects to file aclocal.m4.rej<br>patching file ChangeLog<br>Reversed (or previously applied) patch detected! Skipping patch.<br>
1 out of 1 hunk ignored -- saving rejects to file ChangeLog.rej<br>The next patch would create the file ghostess.1,<br>which already exists! Skipping patch.<br>1 out of 1 hunk ignored<br>patching file ltmain.sh<br>Reversed (or previously applied) patch detected! Skipping patch.<br>
8 out of 8 hunks ignored -- saving rejects to file ltmain.sh.rej<br>patching file README<br>Reversed (or previously applied) patch detected! Skipping patch.<br>1 out of 1 hunk ignored -- saving rejects to file README.rej<br>
patching file src/ghostess.c<br>Reversed (or previously applied) patch detected! Skipping patch.<br>3 out of 3 hunks ignored -- saving rejects to file src/ghostess.c.rej<br>patching file src/Makefile.in<br>Reversed (or previously applied) patch detected! Skipping patch.<br>
2 out of 2 hunks ignored -- saving rejects to file src/Makefile.in.rej<br>patching file src/gtkknob.h<br>Reversed (or previously applied) patch detected! Skipping patch.<br>2 out of 2 hunks ignored -- saving rejects to file src/gtkknob.h.rej<br>
patching file src/universal_gui.c<br>Reversed (or previously applied) patch detected! Skipping patch.<br>1 out of 1 hunk ignored -- saving rejects to file src/universal_gui.c.rej<br>patching file src/gtkknob.c<br>Reversed (or previously applied) patch detected! Skipping patch.<br>
20 out of 20 hunks ignored -- saving rejects to file src/gtkknob.c.rej<br>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<br>
dpkg-buildpackage: error: dpkg-source -i -I -b ghostess gave error exit status 2<br>/usr/local/bin/gbp-pbuilder returned 2<br>Couldn't run '/usr/local/bin/gbp-pbuilder'<br><br>