Control: tags -1 + patch On Sat, Apr 04, 2015 at 03:46:24PM +0200, Christian PERRIER wrote: > Quoting Dejan Latinovic (dejan.latino...@imgtec.com): > > > > Hello, > > > > I had noticed that the gui part builds with target "all" > > even if the main target is "out". > > Beside that, in gui/Makefile OCAMLC variable is redefined and ocamlc.opt > > is used instead of > > ocamlc (defined in Makefile.inc). > > > > The patch that contains needed changes is attached, > > With this patch I was able to successfully build geneweb for both mips and > > mipsel. > > > > Could you please include this patch? > > I'm working on this but I'm having big trouble building from git, I > don't know why: > > dpkg-source: info: using source format `3.0 (quilt)' > dpkg-source: info: building geneweb using existing > ./geneweb_6.08dfsg.orig.tar.xz > dpkg-source: warning: ignoring deletion of file tools/Makefile.inc.out > dpkg-source: info: local changes detected, the modified files are: > git/Makefile > git/dag2html/dag2html.1 > git/gui/Makefile > git/hd/lang/lexicon.txt > git/man/gwc.1 > git/setup/setup.ml > git/src/gwd.ml > git/tools/Makefile.inc.win > dpkg-source: error: aborting due to unexpected upstream changes, see > /tmp/geneweb_6.08dfsg-3.diff.eKkgeY > dpkg-source: info: you can integrate the local changes with dpkg-source > --commit > dpkg-buildpackage: error: dpkg-source -b git gave error exit status 2 > gbp:error: Couldn't run 'git-pbuilder': git-pbuilder returned 2 > > This even though there are NO local changes in the git repository. I > don't understand what's happening here.... > > Anyone with a clue? > > The git repo URL: git://anonscm.debian.org/collab-maint/geneweb.git
This is caused by the (presumably inadvertent) direct modification of tools/Makefile.inc.opt in 80393e8[1]. If I remove that file with the attached patch, dpkg-source works again. #808390 will cause geneweb to be removed from testing soon as part of the perl 5.22 transition, so it would be great to get this fixed. If you're short on time, let me know and I can see if I can assist with an NMU (speaking as a perl maintainer and not a geneweb user). Cheers, Dominic. [1] <http://anonscm.debian.org/cgit/collab-maint/geneweb.git/commit/?id=80393e8b50837584715aec85a54415e2ea93cb77>
