kiwix: upstream code cleanup

[renaud gaudin]

On 06/06/2012 05:36 PM, Mike Gabriel wrote:

> gbp:error: You have uncommitted changes in your source tree:
> gbp:error: # On branch master
> # Changes not staged for commit:
> # (use "git add/rm <file>..." to update what will be committed)
> # (use "git checkout -- <file>..." to discard changes in working directory)
> #
> # modified: config.guess
> # modified: config.sub
> # deleted: desktop/Makefile
> # deleted: etc/Makefile
> # deleted: kiwix/Makefile
> # deleted: kiwix/chrome/Makefile
> # deleted: kiwix/components/Makefile
> # deleted: kiwix/defaults/Makefile
> # deleted: src/components/contentManager/IContentManager.h
> # deleted: src/components/serverManager/IServerManager.h
> # deleted: src/components/zimAccessor/IZimAccessor.h
> # deleted: src/components/zimCluceneIndexer/IZimCluceneIndexer.h
> # deleted: src/components/zimXapianIndexer/IZimXapianIndexer.h
> # modified: src/dependencies/Makefile
> # deleted: static/Makefile
> #
> no changes added to commit (use "git add" and/or "git commit -a")
> gbp:error: Use --git-ignore-new to ignore.

Those files are not distributed in our tarball. We only have Makefile.am 
and Makefile.in inside.
Those are generated by autotools.

--

I think there is anyway a problem with the branch name:

(buildbot)dev at testbian:~/kiwix$ git-buildpackage -uc -us --git-ignore-new
chmod -x kiwix/chrome.manifest
dh --with autotools-dev clean
    dh_testdir
    dh_auto_clean
    dh_autotools-dev_restoreconfig
    dh_clean
fatal: Not a valid object name upstream/0.9beta5+20120606+r3619

renaud