Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id BC551431FD2 for ; Sat, 6 Mar 2010 22:18:45 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.888 X-Spam-Level: X-Spam-Status: No, score=-0.888 tagged_above=-999 required=5 tests=[AWL=-0.703, BAYES_40=-0.185] autolearn=ham Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R7GphY0TjiF2 for ; Sat, 6 Mar 2010 22:18:44 -0800 (PST) Received: from xhlj.maillard.im (xhlj.maillard.im [82.244.211.40]) by olra.theworths.org (Postfix) with ESMTP id 7B4E2431FBF for ; Sat, 6 Mar 2010 22:18:44 -0800 (PST) Received: from xhlj.maillard.im (xhlj [127.0.0.1]) by xhlj.maillard.im (Postfix) with ESMTP id 21BC120001; Sun, 7 Mar 2010 07:18:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=maillard.im; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type; s=postfix; bh=liFRy9SY2a39mvAqCgM595ZJhcg=; b=HOt jNgLS38GsZULrYXDcKhitKfQiKihWys/8v35mxFG4nf/nbwWTYhea2Eu0h3ctJnf wpWNg5Pw4idHtcclQoRvxbkK/D0AlmTuHiFAgSpkngBB6zNoBN7kt/9s+/TR7kHC umkT8PUP9Pz3Fyc8JgST3PENmTNJ+Z4KZePvWweI= Received: from maillard.im (unknown [192.168.0.254]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by xhlj.maillard.im (Postfix) with ESMTPSA; Sun, 7 Mar 2010 07:18:29 +0100 (CET) From: Xavier Maillard To: sojkam1@fel.cvut.cz In-Reply-To: <20100306094634.72252af0kjjot5re@wimap.feld.cvut.cz> References: <87eijzxiy3.fsf@steelpick.localdomain> <20100306094634.72252af0kjjot5re@wimap.feld.cvut.cz> Date: Sun, 07 Mar 2010 07:19:05 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: notmuch@notmuchmail.org Subject: Re: [notmuch] Debian package X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Mar 2010 06:18:45 -0000 Hi, On Sat, 06 Mar 2010 09:46:34 +0100, sojkam1@fel.cvut.cz wrote: > Cituji Xavier Maillard : > > That's a good start but it does not work out of the box for > > me. What is the integration/all branch ? Do I need something > > special in order to use your script ? > > Hi, > > I use the script in the following way. I have a branch mydebian, which > is the debian branch with this script and a file called > wsh-topic-branches added. wsh-topic-branches contains one branch name > per line and to start, it is sufficient to have there only "master". > To build the package, I checkout the mydebian branch I run the script. > It merges all the branches I want to use (the result is called > integration/all) and builds the package from the result of the merge. > > If you only want to use master branch, it is probably easier to do > something like: > > git checkout debian > git merge master > git-dch ... > git-buildpackage ... > > Instead of ... write the parameters from the script and replace > "integration/all" by "debian". > > I write this email from a comuter where I don't have notmuch sources, > so I cannot test the above. It is possible it will be necessary to > tweak some parameters of git-*. There are probably things to tweak but there is also something not working for me. Apparentely, you have a special file named 'version' in which you store a version string and its sha1 as taken from the rev HEAD. I do not have one and thus, I can't find this file in my checkouts. Also, while at it, could you send your wsh-topic-branches file and the relevant git repositories ? Regards, Xavier