kiwix: upstream code cleanup

[Mike Gabriel]

Hi Renaud,

another issue for upstream...

The kiwix package now builds once with git-buildpackage. But on a  
second build on the same working copy I get this after make clean / DH  
clean has run...

I will comment inline...

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)
#
#       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

Are these files build cruft, as well? They get removed by upstream  
clean rules in one of the upstream Makfiles. Maybe you should remove  
them from the upstream source tarball, as well?

#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       ChangeLog
#       INSTALL
#       NEWS
#       config.guess
#       config.sub

Those five files above have to be removed by debhelper as they get  
created during auto_configure override. ToDo -> Mike

#       kiwix/chrome/content.jar
#       kiwix/chrome/locale.jar
#       kiwix/chrome/skin.jar

These should be removed by upstream's clean stanza in one of the Makefiles...

#       src/dependencies/Makefile

This one also...

no changes added to commit (use "git add" and/or "git commit -a")
gbp:error: Use --git-ignore-new to ignore.

Mike

-- 

DAS-NETZWERKTEAM
mike gabriel, rothenstein 5, 24214 neudorf-bornstein
fon: +49 (1520) 1976 148

GnuPG Key ID 0xB588399B
mail: mike.gabriel at das-netzwerkteam.de, http://das-netzwerkteam.de

freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: Digitale PGP-Unterschrift
URL: <http://lists.alioth.debian.org/pipermail/debian-edu-pkg-team/attachments/20120608/4050a158/attachment-0001.pgp>