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 5070B431FC2 for ; Sat, 6 Mar 2010 00:46:49 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.952 X-Spam-Level: X-Spam-Status: No, score=-0.952 tagged_above=-999 required=5 tests=[AWL=-0.953, BAYES_50=0.001] 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 ZGB0B8ggFJlw for ; Sat, 6 Mar 2010 00:46:48 -0800 (PST) Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36]) by olra.theworths.org (Postfix) with ESMTP id 49325431FBF for ; Sat, 6 Mar 2010 00:46:48 -0800 (PST) Received: from localhost (unknown [192.168.200.4]) by max.feld.cvut.cz (Postfix) with ESMTP id 4C5C019F3438; Sat, 6 Mar 2010 09:46:33 +0100 (CET) X-Virus-Scanned: IMAP AMAVIS Received: from max.feld.cvut.cz ([192.168.200.1]) by localhost (styx.feld.cvut.cz [192.168.200.4]) (amavisd-new, port 10044) with ESMTP id XGDP65Rgg2sJ; Sat, 6 Mar 2010 09:46:32 +0100 (CET) Received: from wimap.feld.cvut.cz (wimap.feld.cvut.cz [147.32.192.127]) by max.feld.cvut.cz (Postfix) with ESMTP id B3AFE19F33ED; Sat, 6 Mar 2010 09:46:31 +0100 (CET) Message-ID: <20100306094634.72252af0kjjot5re@wimap.feld.cvut.cz> Date: Sat, 06 Mar 2010 09:46:34 +0100 From: sojkam1@fel.cvut.cz To: Xavier Maillard References: <87eijzxiy3.fsf@steelpick.localdomain> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-2; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.3.6) 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: Sat, 06 Mar 2010 08:46:49 -0000 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-*. Cheers, Michal