kiwix: upstream code cleanup (was: Re: IRC ?)

[Mike Gabriel]

Hi Renaud,

On Mi 06 Jun 2012 19:30:08 CEST Mike Gabriel wrote:

> Hi
>
> On Mi 06 Jun 2012 15:38:01 CEST renaud gaudin wrote:
>
>> On 06/06/2012 06:46 AM, Mike Gabriel wrote:
>>
>>> First thing: please provide a download link for the /debian folder you
>>> use when building the package. You said earlier, that you have such a
>>> folder maintained upstream.
>>
>> http://download.kiwix.org/src/nightly/2012-06-06/kiwix-20120606_r3619-debian.tar.gz
>
> Ok, thanks. Will take a look later...
>
>>> Recend Debian packages use source format 3.0 (quilt), that means we have
>>> to provide an orig.tar.<comp> file with the package. The neatest tool
>>> for that is git-buildpackage (a wrapper around dpkg-buildpackage).
>>
>> OK, that's what Vasudev proposed also.
>>
>>> The goal is to get the source tree on git.debian.org/git/collab-maint
>>> build with ,,git-buildpackage -uc -us''.
>>
>> OK, I'll work towards this.
>>
>>> This currently does not work as the upstream tarball contains build
>>> cruft...
>>
>> http://download.kiwix.org/src/nightly/2012-06-06/kiwix-20120606_r3619.tar.gz
>>
>> This version should be cleaner.
>
> Updated upstream import on packaging repos.

Gets further now, but still... Here is more build cruft that should  
get removed from upstream...

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.

Greets,
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/20120606/f5e099d0/attachment.pgp>