* [PATCH 1/5] debian: change priority to optional.
2013-01-16 12:44 david
@ 2013-01-16 12:44 ` david
2013-01-16 12:44 ` [PATCH 2/5] debian: remove Dm-Upload-Allowed field david
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: david @ 2013-01-16 12:44 UTC (permalink / raw)
To: notmuch; +Cc: David Bremner
From: David Bremner <bremner@debian.org>
The distinction between extra and optional is generally not very
important, except that being extra forces anything that depends on you
to be extra.
---
debian/changelog | 1 +
debian/control | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index dd07aa1..2fa2cf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
notmuch (0.15~rc1-1) experimental; urgency=low
* New upstream release candidate.
+ * Change priority to optional (Closes: #687217).
-- David Bremner <bremner@debian.org> Mon, 07 Jan 2013 21:40:52 -0400
diff --git a/debian/control b/debian/control
index f725276..ed026b0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
Source: notmuch
Section: mail
-Priority: extra
+Priority: optional
Maintainer: Carl Worth <cworth@debian.org>
Uploaders:
Jameson Graef Rollins <jrollins@finestructure.net>,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/5] debian: remove Dm-Upload-Allowed field.
2013-01-16 12:44 david
2013-01-16 12:44 ` [PATCH 1/5] debian: change priority to optional david
@ 2013-01-16 12:44 ` david
2013-01-16 12:44 ` [PATCH 3/5] debian/compat: upgrade to compat level 9 david
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: david @ 2013-01-16 12:44 UTC (permalink / raw)
To: notmuch; +Cc: David Bremner
From: David Bremner <bremner@debian.org>
If we have some DMs we want to upload, we have to enable it with a
signed command file to dak.
---
debian/changelog | 2 ++
debian/control | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 2fa2cf6..f4925a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ notmuch (0.15~rc1-1) experimental; urgency=low
* New upstream release candidate.
* Change priority to optional (Closes: #687217).
+ * Remove Dm-Upload-Allowed field, as this is no longer used by
+ Debian.
-- David Bremner <bremner@debian.org> Mon, 07 Jan 2013 21:40:52 -0400
diff --git a/debian/control b/debian/control
index ed026b0..d434c53 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Standards-Version: 3.9.3
Homepage: http://notmuchmail.org/
Vcs-Git: git://notmuchmail.org/git/notmuch
Vcs-Browser: http://git.notmuchmail.org/git/notmuch
-Dm-Upload-Allowed: yes
Package: notmuch
Architecture: any
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/5] debian/compat: upgrade to compat level 9
2013-01-16 12:44 david
2013-01-16 12:44 ` [PATCH 1/5] debian: change priority to optional david
2013-01-16 12:44 ` [PATCH 2/5] debian: remove Dm-Upload-Allowed field david
@ 2013-01-16 12:44 ` david
2013-01-16 12:44 ` [PATCH 4/5] debian: add python 3 bindings david
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: david @ 2013-01-16 12:44 UTC (permalink / raw)
To: notmuch; +Cc: David Bremner
From: David Bremner <bremner@debian.org>
- enable hardening
- fix dh syntax. Now that we have compat level 9, the old, wrong
syntax is no longer accepted.
- update debian/libnotmuch{3,-dev}.install for multiarch.
- update versioned dependency on debhelper.
---
debian/compat | 2 +-
debian/control | 3 ++-
debian/libnotmuch-dev.install | 2 +-
debian/libnotmuch3.install | 2 +-
debian/rules | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index d434c53..75b55a5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
martin f. krafft <madduck@debian.org>,
David Bremner <bremner@debian.org>
Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 9),
pkg-config,
libxapian-dev,
libgmime-2.6-dev (>= 2.6.7~) | libgmime-2.4-dev,
@@ -39,6 +39,7 @@ Package: libnotmuch3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Description: thread-based email index, search and tagging (runtime)
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
diff --git a/debian/libnotmuch-dev.install b/debian/libnotmuch-dev.install
index 185dba4..96bbd63 100644
--- a/debian/libnotmuch-dev.install
+++ b/debian/libnotmuch-dev.install
@@ -1,2 +1,2 @@
usr/include
-usr/lib/libnotmuch.so
+usr/lib/*/libnotmuch.so
diff --git a/debian/libnotmuch3.install b/debian/libnotmuch3.install
index da4fc25..a513b47 100644
--- a/debian/libnotmuch3.install
+++ b/debian/libnotmuch3.install
@@ -1 +1 @@
-usr/lib/libnotmuch.so.*
+usr/lib/*/libnotmuch.so.*
diff --git a/debian/rules b/debian/rules
index 603b3ab..8e30353 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh --with python2 $@
+ dh $@ --with python2
override_dh_auto_configure:
dh_auto_configure -- --emacslispdir=/usr/share/emacs/site-lisp/notmuch
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/5] debian: add python 3 bindings
2013-01-16 12:44 david
` (2 preceding siblings ...)
2013-01-16 12:44 ` [PATCH 3/5] debian/compat: upgrade to compat level 9 david
@ 2013-01-16 12:44 ` david
2013-01-16 12:51 ` David Bremner
` (2 more replies)
2013-01-16 12:44 ` [PATCH 5/5] debian: note that ical bug is fixed david
2013-01-17 10:36 ` David Bremner
5 siblings, 3 replies; 10+ messages in thread
From: david @ 2013-01-16 12:44 UTC (permalink / raw)
To: notmuch; +Cc: David Bremner
From: David Bremner <bremner@debian.org>
This patch is due to Jakub Wilk <jwilk@debian.org>.
It does add a build depend on python3 for people using the "make
debian-snapshot" target.
---
debian/changelog | 4 +++-
debian/control | 14 ++++++++++++++
debian/python-notmuch.install | 2 +-
debian/rules | 5 +++++
4 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f4925a1..40b7695 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ notmuch (0.15~rc1-1) experimental; urgency=low
* Change priority to optional (Closes: #687217).
* Remove Dm-Upload-Allowed field, as this is no longer used by
Debian.
+ * Add python3 bindings, thanks to Jakub Wilk (Closes:
+ #683515).
- -- David Bremner <bremner@debian.org> Mon, 07 Jan 2013 21:40:52 -0400
+ -- David Bremner <bremner@debian.org> Wed, 16 Jan 2013 08:25:02 -0400
notmuch (0.14-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 75b55a5..5bb0d05 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends:
libtalloc-dev,
libz-dev,
python-all (>= 2.6.6-3~),
+ python3-all (>= 3.1.2-7~),
emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |
emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
gdb,
@@ -75,6 +76,19 @@ Description: python interface to the notmuch mail search and index library
This package provides a Python interface to the notmuch
functionality, directly interfacing with a shared notmuch library.
+Package: python3-notmuch
+Architecture: all
+Section: python
+Depends: ${misc:Depends}, ${python3:Depends}, libnotmuch3
+Description: Python 3 interface to the notmuch mail search and index library
+ Notmuch is a system for indexing, searching, reading, and tagging
+ large collections of email messages in maildir or mh format. It uses
+ the Xapian library to provide fast, full-text search with a very
+ convenient search syntax.
+ .
+ This package provides a Python 3 interface to the notmuch
+ functionality, directly interfacing with a shared notmuch library.
+
Package: notmuch-emacs
Architecture: all
Section: mail
diff --git a/debian/python-notmuch.install b/debian/python-notmuch.install
index 607c065..b2cc136 100644
--- a/debian/python-notmuch.install
+++ b/debian/python-notmuch.install
@@ -1 +1 @@
-usr/lib/python*
+usr/lib/python2*
diff --git a/debian/rules b/debian/rules
index 8e30353..45e970a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {}
+
%:
dh $@ --with python2
@@ -9,13 +11,16 @@ override_dh_auto_configure:
override_dh_auto_build:
dh_auto_build
dh_auto_build --sourcedirectory bindings/python
+ cd bindings/python && $(python3_all) setup.py build
$(MAKE) -C contrib/notmuch-mutt
override_dh_auto_clean:
dh_auto_clean
dh_auto_clean --sourcedirectory bindings/python
+ cd bindings/python && $(python3_all) setup.py clean -a
$(MAKE) -C contrib/notmuch-mutt clean
override_dh_auto_install:
dh_auto_install
dh_auto_install --sourcedirectory bindings/python
+ cd bindings/python && $(python3_all) setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 4/5] debian: add python 3 bindings
2013-01-16 12:44 ` [PATCH 4/5] debian: add python 3 bindings david
@ 2013-01-16 12:51 ` David Bremner
2013-01-16 16:01 ` Tomi Ollila
2013-01-17 10:35 ` David Bremner
2 siblings, 0 replies; 10+ messages in thread
From: David Bremner @ 2013-01-16 12:51 UTC (permalink / raw)
To: notmuch
david@tethera.net writes:
> %:
> dh $@ --with python2
>
Oops. bad conflict resolution. That should read
dh $@ --with python2,python3
no idea why it seemed to produce a python 3 bindings package anyway.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 4/5] debian: add python 3 bindings
2013-01-16 12:44 ` [PATCH 4/5] debian: add python 3 bindings david
2013-01-16 12:51 ` David Bremner
@ 2013-01-16 16:01 ` Tomi Ollila
2013-01-17 10:35 ` David Bremner
2 siblings, 0 replies; 10+ messages in thread
From: Tomi Ollila @ 2013-01-16 16:01 UTC (permalink / raw)
To: david, notmuch; +Cc: David Bremner
On Wed, Jan 16 2013, david@tethera.net wrote:
> From: David Bremner <bremner@debian.org>
>
> This patch is due to Jakub Wilk <jwilk@debian.org>.
>
> It does add a build depend on python3 for people using the "make
> debian-snapshot" target.
> ---
> debian/changelog | 4 +++-
> debian/control | 14 ++++++++++++++
> debian/python-notmuch.install | 2 +-
> debian/rules | 5 +++++
> 4 files changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/debian/changelog b/debian/changelog
> index f4925a1..40b7695 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -4,8 +4,10 @@ notmuch (0.15~rc1-1) experimental; urgency=low
> * Change priority to optional (Closes: #687217).
> * Remove Dm-Upload-Allowed field, as this is no longer used by
> Debian.
> + * Add python3 bindings, thanks to Jakub Wilk (Closes:
> + #683515).
>
> - -- David Bremner <bremner@debian.org> Mon, 07 Jan 2013 21:40:52 -0400
> + -- David Bremner <bremner@debian.org> Wed, 16 Jan 2013 08:25:02 -0400
>
> notmuch (0.14-1) experimental; urgency=low
>
> diff --git a/debian/control b/debian/control
> index 75b55a5..5bb0d05 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -14,6 +14,7 @@ Build-Depends:
> libtalloc-dev,
> libz-dev,
> python-all (>= 2.6.6-3~),
> + python3-all (>= 3.1.2-7~),
> emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |
> emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
> gdb,
> @@ -75,6 +76,19 @@ Description: python interface to the notmuch mail search and index library
> This package provides a Python interface to the notmuch
> functionality, directly interfacing with a shared notmuch library.
>
> +Package: python3-notmuch
> +Architecture: all
> +Section: python
> +Depends: ${misc:Depends}, ${python3:Depends}, libnotmuch3
> +Description: Python 3 interface to the notmuch mail search and index library
> + Notmuch is a system for indexing, searching, reading, and tagging
> + large collections of email messages in maildir or mh format. It uses
> + the Xapian library to provide fast, full-text search with a very
> + convenient search syntax.
> + .
> + This package provides a Python 3 interface to the notmuch
> + functionality, directly interfacing with a shared notmuch library.
> +
> Package: notmuch-emacs
> Architecture: all
> Section: mail
> diff --git a/debian/python-notmuch.install b/debian/python-notmuch.install
> index 607c065..b2cc136 100644
> --- a/debian/python-notmuch.install
> +++ b/debian/python-notmuch.install
> @@ -1 +1 @@
> -usr/lib/python*
> +usr/lib/python2*
> diff --git a/debian/rules b/debian/rules
> index 8e30353..45e970a 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -1,5 +1,7 @@
> #!/usr/bin/make -f
>
> +python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {}
> +
This could save 1-n fork/execve pairs (depending the number of outputs
py3versions provides). Also IMHO this is a bit more self-evident:
python3_all = py3versions -s | tr ' ' '\n' | xargs -t -I {} env {}
All of the other (drop-in) replacements are more complex, like:
python3_all = exec sh -c 'for cmd in `exec py3versions -s`; do $$cmd "$$@"' 0
.. but this (untested version) uses least number of forks & execves.
Still, maybe least amount of time wasted is to stick with
the original ;) -- but by all means, play with the options
if you wish to do so, I don't think Beijing air pollution
situation will be any better ATM whatever you do ;)
LGTM for rest of the series (too).
Tomi
> %:
> dh $@ --with python2
>
> @@ -9,13 +11,16 @@ override_dh_auto_configure:
> override_dh_auto_build:
> dh_auto_build
> dh_auto_build --sourcedirectory bindings/python
> + cd bindings/python && $(python3_all) setup.py build
> $(MAKE) -C contrib/notmuch-mutt
>
> override_dh_auto_clean:
> dh_auto_clean
> dh_auto_clean --sourcedirectory bindings/python
> + cd bindings/python && $(python3_all) setup.py clean -a
> $(MAKE) -C contrib/notmuch-mutt clean
>
> override_dh_auto_install:
> dh_auto_install
> dh_auto_install --sourcedirectory bindings/python
> + cd bindings/python && $(python3_all) setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp
> --
> 1.7.10.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 4/5] debian: add python 3 bindings
2013-01-16 12:44 ` [PATCH 4/5] debian: add python 3 bindings david
2013-01-16 12:51 ` David Bremner
2013-01-16 16:01 ` Tomi Ollila
@ 2013-01-17 10:35 ` David Bremner
2 siblings, 0 replies; 10+ messages in thread
From: David Bremner @ 2013-01-17 10:35 UTC (permalink / raw)
To: notmuch
david@tethera.net writes:
> From: David Bremner <bremner@debian.org>
>
> This patch is due to Jakub Wilk <jwilk@debian.org>.
>
One more fix was needed, I added python3-notmuch.install in a followup
patch.
d
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 5/5] debian: note that ical bug is fixed
2013-01-16 12:44 david
` (3 preceding siblings ...)
2013-01-16 12:44 ` [PATCH 4/5] debian: add python 3 bindings david
@ 2013-01-16 12:44 ` david
2013-01-17 10:36 ` David Bremner
5 siblings, 0 replies; 10+ messages in thread
From: david @ 2013-01-16 12:44 UTC (permalink / raw)
To: notmuch; +Cc: David Bremner
From: David Bremner <bremner@debian.org>
This was fixed a while ago in git, but not released yet.
---
debian/changelog | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 40b7695..6c6915f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,10 @@ notmuch (0.15~rc1-1) experimental; urgency=low
* Change priority to optional (Closes: #687217).
* Remove Dm-Upload-Allowed field, as this is no longer used by
Debian.
- * Add python3 bindings, thanks to Jakub Wilk (Closes:
- #683515).
+ * Add python3 bindings, thanks to Jakub Wilk (Closes: #683515).
+ * Bug fix: ".ical attachment problem", (Closes: #688747).
- -- David Bremner <bremner@debian.org> Wed, 16 Jan 2013 08:25:02 -0400
+ -- David Bremner <bremner@debian.org> Wed, 16 Jan 2013 08:28:27 -0400
notmuch (0.14-1) experimental; urgency=low
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re:
2013-01-16 12:44 david
` (4 preceding siblings ...)
2013-01-16 12:44 ` [PATCH 5/5] debian: note that ical bug is fixed david
@ 2013-01-17 10:36 ` David Bremner
5 siblings, 0 replies; 10+ messages in thread
From: David Bremner @ 2013-01-17 10:36 UTC (permalink / raw)
To: notmuch
david@tethera.net writes:
> Hi Gang;
>
> Here are some proposed changes to the debian packaging for 0.15.
>
> Most will probably be boring to people not familiar with debian
> packaging, with the excepotion of 4/5, which has a shell pipeline with
> two xargs in it, and almost can certainly be improved by several
> readers of this list.
As Tomi suggested, I left this alone and pushed as is for now.
d
^ permalink raw reply [flat|nested] 10+ messages in thread