Debian package

Debian package

[Xavier Maillard]

Hi,

I am using Debian GNU/linux SID and notmuch and I'd like to be
bleading edge with notmuch. So I am trying to figure out whether
someone is maintaining a Debian package against notmuch git
repository or not. If the former, that's nice.

Xavier

Re: Debian package

[martin f krafft]

[-- Attachment #1: Type: text/plain, Size: 623 bytes --]

also sprach Xavier Maillard <xma@gnu.org> [2010.03.05.0611 +0100]:
> I am using Debian GNU/linux SID and notmuch and I'd like to be
> bleading edge with notmuch. So I am trying to figure out whether
> someone is maintaining a Debian package against notmuch git
> repository or not. If the former, that's nice.

http://packages.debian.org/search?keywords=notmuch

-- 
martin | http://madduck.net/ | http://two.sentenc.es/
 
"ah, but a man's reach should exceed his grasp,
 or what's a heaven for?"
                                                    -- robert browning
 
spamtraps: madduck.bogus@madduck.net

[-- Attachment #2: Digital signature (see http://martin-krafft.net/gpg/) --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: Debian package

[Michal Sojka]

On Fri, 05 Mar 2010, Xavier Maillard wrote:
> Hi,
> 
> I am using Debian GNU/linux SID and notmuch and I'd like to be
> bleading edge with notmuch. So I am trying to figure out whether
> someone is maintaining a Debian package against notmuch git
> repository or not. If the former, that's nice.

Hi,

I do not know the current plans for Debian package, but what I do for
myself is to merge together current master, debian and seveal topic
branches (based on patches sent to the mailing list) to produce a
bleeding edge package. I use the following script to build the package.

Cheers,
 Michal

#!/bin/sh

set -e

ref=$(git symbolic-ref HEAD)
branch=${ref##refs/heads/}
test "$ref" != "$branch" || die "You're on a strange branch"
export branch

die()
{
	echo >&2 "fatal: $*"
	exit 1
}

merge() {
    git branch -D integration/all
    git checkout -b integration/all
    trap "git checkout $branch
git checkout -- debian/changelog
" 0
    git merge `cat wsh-topic-branches|grep -v ^#`
}

case "$1" in
    -m|--merge)
	merge
	exit
	;;
esac

git diff-index --quiet HEAD || die "Working directory is not clean"

merge

read version sha1 < version

if [ "$sha1" != `git rev-parse HEAD` ]; then
    version=`expr $version + 1`
    sha1=`git rev-parse HEAD`
fi

git-dch --snapshot --snapshot-number=$version --debian-branch=integration/all
git-buildpackage --git-ignore-new \
		 --git-debian-branch=integration/all \
		 --git-upstream-branch=master \
    		 -i -us -uc -b	# see the example in debuild(1)

git checkout $branch
echo $version $sha1 > version
git commit -m "snapshot #$version" version

Re: Debian package

[Xavier Maillard]

Hi Michal,

On Fri, 05 Mar 2010 09:37:40 +0100, Michal Sojka <sojkam1@fel.cvut.cz> wrote:
> On Fri, 05 Mar 2010, Xavier Maillard wrote:
> > Hi,
> > 
> > I am using Debian GNU/linux SID and notmuch and I'd like to be
> > bleading edge with notmuch. So I am trying to figure out whether
> > someone is maintaining a Debian package against notmuch git
> > repository or not. If the former, that's nice.
> 
> Hi,
> 
> I do not know the current plans for Debian package, but what I do for
> myself is to merge together current master, debian and seveal topic
> branches (based on patches sent to the mailing list) to produce a
> bleeding edge package. I use the following script to build the package.

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 ?

Currently, I just cloned official notmuch git repository.

Thanks,

Xavier

Re: Debian package

[sojkam1]

Cituji Xavier Maillard <xma@gnu.org>:
> 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

Re: Debian package

[Xavier Maillard]

Hi,

On Sat, 06 Mar 2010 09:46:34 +0100, sojkam1@fel.cvut.cz wrote:
> Cituji Xavier Maillard <xma@gnu.org>:
> > 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

Re: Debian package

[Michal Sojka]

On Sun, 07 Mar 2010, Xavier Maillard wrote:
> 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.

I tested that for beginning you can omit the $version and use
  git checkout -b mydebian debian
  git merge master
  git-dch --snapshot --debian-branch=mydebian
  
  
> Also, while at it, could you send your wsh-topic-branches file
> and the relevant git repositories ?

OK. I have published my repository at
git://rtime.felk.cvut.cz/notmuch.git and you can browse it online at
http://rtime.felk.cvut.cz/gitweb/notmuch.git. The current content of
wsh-topic-branches is at
http://rtime.felk.cvut.cz/gitweb/notmuch.git/blob/HEAD:/wsh-topic-branches

Use the repository only at your risk. I have there patches such as
http://rtime.felk.cvut.cz/gitweb/notmuch.git/shortlog/refs/heads/reply-pandora-hack
or
http://rtime.felk.cvut.cz/gitweb/notmuch.git/shortlog/refs/heads/fix-pandora.cz-addresses
which change notmuch behavior for mails from pandora.cz mailing lists.

Regards,
Michal