Commit graph

125 commits

Author SHA1 Message Date
Uwe Kleine-König
f01b8d1331 debian: strictly depend on the same version of libnotmuch
It took quite some time to debug why folder: searches didn't work for me
though I had notmuch 0.6~rc1 installed. amdragon in #notmuch found out
that I still had libnotmuch1 0.5+nmu3 installed.

To prevent the same problem in the future let notmuch depend on the same
version of libnotmuch1.

Reviewed-By: David Bremner <david@tethera.net>

  The underlying issue is that the libnotmuch interface is not
  entirely captured by the set of exported symbols. In particular the
  query syntax can change without being visible to the linker at all.
2011-07-10 09:32:40 -03:00
David Bremner
7e3cb13a05 debian: start new changelog stanza for post 0.6 bugfix release
The version numbering scheme of n.n.n is chosen so as not to confuse
tools that rely on the presence of a dash to detect non-native
packages.
2011-07-07 22:41:59 -03:00
David Bremner
2e7956e884 debian: install README.Debian files for notmuch-vim and notmuch-emacs.
The notmuch-vim README.Debian in particular is quite important since
it discussions the need to install the package with vim-addons
2011-07-07 22:36:04 -03:00
David Bremner
8c5129bb51 debian: add changelog stanza for release 0.6, install upstream docs referred to.
This perhaps breaks the "one thing at a time rule", but seems better
than leaving the changelog pointing to nothing.
2011-07-01 11:48:01 -03:00
David Bremner
65bf14d59e debian: move vim directory creation to notmuch-vim binary package
This step was missed during the package split of notmuch to notmuch,
notmuch-emacs, and notmuch-vim.

It seems mostly harmless in this case, but it is silly for non-vim
users to have those directories.
(cherry picked from commit 4b5875d81e)
2011-07-01 09:58:08 -03:00
David Bremner
5d53226005 debian: changelog stanza for first "official" release candidate
The last upload to experimental was really a release candidate too.
Switch versioning to ~rc1 as counting commits is confusing when
building from the release branch.
(cherry picked from commit 117852a5f1)
2011-06-30 10:09:00 -03:00
David Bremner
3f777b2ac2 debian: don't install zsh completion files into /usr/share/zsh
as of version 4.3.12, perhaps earlier, the Debian zsh package now
ships /usr/share/zsh/functions/Completion/Unix/_notmuch, so we
shouldn't install that ourselves anymore.

My understanding is that letting zsh ship the completion scripts is
the standard thing to do.

The script is still shipped in /usr/share/doc/notmuch/examples
(cherry picked from commit 0a0f5f1bbe)
2011-06-30 09:33:34 -03:00
Carl Worth
dd544f5dc6 debian/changelog: Add note that notmuch-vim description is in (bug #631974)
This note will automatically cause the bug entry to be closed as fixed when
the next package (including this change) is uploaded.
(cherry picked from commit 04b9ffa56f)
2011-06-29 22:02:58 -03:00
David Bremner
d6f05fde23 debian: fix installation of notmuch-vim README
There was a leftover override, installing it into the wrong package.
2011-06-23 20:39:29 -03:00
David Bremner
9acdabfe73 start new changelog stanza 2011-06-23 19:42:15 -03:00
David Bremner
3381ae4176 Revert "debian: Override RPATH_LDFLAGS"
This reverts commit fc126d89b2.

This override of the make variable RPATH_LDFLAGS should no longer
be required since the auto-configuration was fixed
2011-06-23 19:35:35 -03:00
David Bremner
1c396673f3 debian: Set conflicts from package split to point to an existing version.
The previous version was harmless, since there were no versions
uploaded between ~237 and ~254, but this is less confusing.
2011-06-23 14:42:15 -03:00
David Bremner
9e7c40543b debian: fix typo in short description of notmuch-vim
Thanks to Dirk Eddelbuettel for noticing.
2011-06-23 14:37:29 -03:00
David Bremner
1126732ece debian: update changelog for upload 0.6~254, bump standards version to 3.9.2 2011-06-23 07:58:31 -03:00
David Bremner
19f0ca7ee2 debian: remove Xapian exceptions symbols from libnotmuch1.symbols
These were never intended to be public, since the library exports only
a C API.
2011-06-23 07:58:27 -03:00
David Bremner
33330dc050 debian: split off vim interface to its own package
So far the package does notthing fancy with vim-addon-manager.
2011-06-23 07:54:40 -03:00
David Bremner
6f3d3c68a0 debian: split off emacs interface into its own package.
- rename emacsen-install/remove files, and change embedded package
  name

- split notmuch.install, notmuch.dirs

- add Breaks/Replaces for previous notmuch packages with overlapping
  files.
2011-06-23 07:54:40 -03:00
David Bremner
ffa88554d5 debian: Build depend on emacs-nox instead of emacs.
Nothing in the build process needs X, and the number of dependencies
that need to be installed is much smaller.
2011-06-23 07:13:32 -03:00
David Bremner
0fdc28cd6b debian: build package for python-bindings.
This uses dh_python2 (included with sufficiently recent versions of
the python/python-all packages). python-all brings in all of the
supported versions of python. The double calls to dh_auto_install and
friends are to avoid looping over python versions ourselves.
2011-06-23 07:13:32 -03:00
David Bremner
de35a0e7f9 debian: add changlog stanza for new snapshot 0.6~237
(cherry picked from commit 17daa480e435ad4c1d8f4f18447eff1ff36dbe00)
2011-06-22 22:45:33 -03:00
David Bremner
b2f0b8a186 debian: Changelog stanza for new git snapshot 0.6~215
(cherry picked from commit b85a415a7bd91c360c0acd453ead39be854f63f7)
2011-06-22 22:45:12 -03:00
David Bremner
a411eb4d1c debian: update symbols file for libnotmuch1
One of the Xapian exception symbols has gone missing.  Hopefully this
doesn't mean we should be bumping the SONAME.
(cherry picked from commit e8260d63f1f5a37094801ecd5d110bf48f22ee45)
2011-06-22 22:44:50 -03:00
David Bremner
bd35e57052 debian: Changelog stanza for new snapshot 0.6~180
(cherry picked from commit 54a3983d3c38830e2b609be0a96c5cf6dc6de054)
2011-06-22 22:44:34 -03:00
David Bremner
e4e72cfd49 debian: update symbols file for libnotmuch1
This re-exports three symbols from Xapian.
(cherry picked from commit f36c36ddd13486d1e38b4dd0efa717108f56c4f9)
2011-06-22 22:44:13 -03:00
David Bremner
fc126d89b2 debian: Override RPATH_LDFLAGS
Probably there is a nicer way to do this; perhaps it should be a
configure option.
(cherry picked from commit 387dc520dd68cc805e390f3a1399f85b5d5bd83a)
2011-06-22 22:43:21 -03:00
David Bremner
933ef53411 debian: Add changelog stanza for new snapshot 0.6~171
After some debate, we settled on 0.6~$num as a snapshot version
number, at least until 0.6 is released. This has the needed property
of sorting after 0.5+nmu$num.
(cherry picked from commit 54f7766febc3fa3c9dc475f6ec6718c5e87a189e)
2011-06-22 22:43:01 -03:00
David Bremner
fcbf21587c debian: Add myself (David Bremner) as an uploader
This avoids having to mark every upload as a non-maintainer upload.
(cherry picked from commit e849851d2d38cbf985f3fd884226100b93f3044f)
2011-06-22 22:42:44 -03:00
David Bremner
6eec8d02e3 debian: Incorporate changelog entries from post 0.5 uploads
These uploads added the timeout to the tests to fix build failures.
(cherry picked from commit 0901faabd90a689728d8079b3163bd76b29d29aa)
2011-06-22 22:41:46 -03:00
David Bremner
2b76283b52 debian: Generate version from debian/changelog
This avoids patching the version file once per Debian upload.
Original version file is saved and restored.
(cherry picked from commit 2938a98bf4c4abe0426caee4555d889d655bc0df)
2011-06-22 08:11:54 -03:00
Carl Worth
2a318d3714 debian: Update list of symbols for libnotmuch
This release adds three new functions to the library interface.
2010-11-11 20:51:29 -08:00
Carl Worth
0369c00ed6 debian: Add changelog entry for 0.5
Just pulling things from NEWS as usual.
2010-11-11 20:51:25 -08:00
Carl Worth
dddd3b723d debian: Add a file stating the intended symbols to appear in the library
This is almost totally clearn. The (mangled) names of the Xapian
exception classes appear here. That's not actually desired, as the
notmuch library is never intended to throw any exceptions. But Xapian
does not currently provide a mechanism for us to avoid these.
2010-11-01 23:24:44 -07:00
Carl Worth
71ff704149 debian: Use the correct maintainer address for the package upload.
Otherwise, Debian tools think this is an NMU.
2010-11-01 16:55:13 -07:00
Carl Worth
0ac7e59aa1 debian: Declare conformance with Standard-Version 3.9.1.0
I ran through the upgrading-checklist and found nothing needing to be
changed for this package.
2010-11-01 16:54:27 -07:00
Carl Worth
77548f01d9 debian: Add changelog entry for the 0.4 release.
Which is just about to be made.
2010-11-01 16:24:07 -07:00
Carl Worth
bec47efeeb debian: Add emacs autoloads for all top-level notmuch functions.
With this, users will be able to simply "apt-get install emacs" and
then "emacs -f notmuch" without having to edit ~/.emacs to add a
("require 'notmuch)".
2010-10-29 15:28:18 -07:00
Carl Worth
417274d698 Merge branch '0.3.x' immediately after the 0.3.1 release
This brings one bug fix into master that was originally applied
directly to the 0.3.x branch.
2010-04-27 17:13:47 -07:00
Carl Worth
e9e1466b44 debian: Instruct git-buildpackage that it's OK to build from this branch
I wish I had something with better support for a native Debian package
here. I shouldn't ever have to configure any branch---I just want it
to build a package from the current branch. Instead it makes me tell
it (twice!) what the current branch actually is.
2010-04-27 17:04:52 -07:00
Carl Worth
f635a0177b debian/changelog: Copy in content from the NEWS file.
Someday we'll automate this step.
2010-04-27 17:02:17 -07:00
Carl Worth
3d64993586 debian/changelog: Fix email address to avoid lintian complaint.
Otherwise lintian thinks this is an NMU. I definitely need to figure
out how to get the emacs mode for debian/changelog to write the
correct address into this file in the first place.
2010-04-27 02:10:17 -07:00
Carl Worth
9138cdd68b debian/changelog: Add notes for the 0.3 release
Again, just taking the one-line entries from the NEWS entry for 0.3.
2010-04-27 02:07:45 -07:00
Carl Worth
f7c957f4de debian: Make git ignore several intermediate files.
The "make release" target doesn't cause these to be left around, but
manually doing something like ./debian/rules/build can.
2010-04-19 10:13:29 -07:00
Carl Worth
533b02945d debian: Remove watch file.
We're switching to a native package, where we build the upstream and
debian releases simultaneously, so there's no need for a watch file.
2010-04-16 11:35:33 -07:00
Carl Worth
c75ab298d0 debian: Switch to "3.0 (native)" source format.
To keep lintian happy.
2010-04-16 11:34:48 -07:00
Carl Worth
4b52b918d3 debian/changelog: Create an entry for the 0.2 release.
A (very slightly filtered) version of what already appears in NEWS.
2010-04-16 11:34:38 -07:00
Carl Worth
7029c52ca7 debian: Don't auto-generate debian/changelog.
David Bremner informs me that shoving everything from the notmuch "git
log" into the debian/changelog is a bit excessive. Instead, we'll
start manually updating this file, (which feels a bit redundant with
NEWS, but perhaps makes us a better Debian-comunity member).
2010-04-16 10:00:11 -07:00
Carl Worth
2608bfe95f debian: Add a gbp.conf to start using git-buildpackage
On Bdale Garbee's recommendation I'm switching from gitpkg, (which
constructed a source tree but still required me to go run debuild), to
git-buildpackage. I hadn't originally used git-buildpackage because it
didn't seem to work without a configuration file, (where gitpkg was
fine).

Bdale was kind enough to point me to his fw/altos source at
git.gag.com where I found an example gpb.conf file as well as a target
in debian/rules to automatically update debian/changelog with the new
version number.
2010-04-16 09:32:46 -07:00
Carl Worth
f5640eb144 debian: Unbreak the build.
I had the wrong syntax for the dh_auto_configure override.
2010-04-07 16:00:20 -07:00
Carl Worth
a7a961c510 Makefile: Install emacs code to site-lisp, not site-lisp/notmuch
And just make the Debian packaging request site-lisp/notmuch like it
wants. Otherwise, the installed files won't appear on the load-path
so won't be found by emacs.
2010-04-07 10:09:35 -07:00
Carl Worth
e7837ace18 debian: Add a watch file.
To help people pester me in the case of uploading a new upstream
release without a corresponding Debian package.
2010-04-06 18:30:43 -07:00
Carl Worth
66f00ab35a debian: Modify each package description slightly.
This avoids a lintian complaint about several packages with identical
package descriptions.
2010-04-06 18:30:43 -07:00
Carl Worth
248e6f8c04 debian: Update standards version to 3.8.4.
No changes needed.
2010-04-06 18:30:43 -07:00
Carl Worth
a1f67f28d7 debian: Split into multiple packages.
The library goes into libnotmuch1 and the headers into libnotmuch-dev.
2010-04-06 18:30:43 -07:00
Carl Worth
33d8ecd859 debian: Fix Vcs-Browser link
We're doing debian packaging in the primary repository now.
2010-04-06 18:30:43 -07:00
Carl Worth
ffd274e135 debian: Don't try compiling emacs bytecode for emacs < 21
It just doesn't work.
2010-04-06 18:30:43 -07:00
Carl Worth
ba8ee48dcb debian: Fix broken symlinking of emacs lisp files.
This broke when we changed from a single notmuch.el file
to multiple notmuch-foo.el files.
2010-04-06 18:30:43 -07:00
Carl Worth
dfbec15b23 Install emacs lisp files into a notmuch sub-directory of site-lisp.
Now that we have multiple emacs-lisp source files, it's just more
polite this way.
2010-04-06 18:30:43 -07:00
Carl Worth
bd5987ce39 Update Debian package version to 0.1-1.
To make a Debian package for the recent 0.1 release of notmuch.
2010-04-06 18:30:43 -07:00
Carl Worth
43c9c11389 control: Update package description to follow upstream README.
Justin B Rye pointed out (in Debian bug #566282) that a user with mail
in mbox format can spend a lot of time investigating notmuch before
realizing that mbox is not supported. Head that off with a more
detailed mention in the package description.
2010-02-25 11:16:41 -08:00
martin f. krafft
c2904e9842 Add suggestion to vim-addon-manager.
Signed-off-by: martin f. krafft <madduck@debian.org>
2010-01-26 09:52:58 +13:00
martin f. krafft
b416d7e6b9 builddep on dh must be versioned due to overrides
Signed-off-by: martin f. krafft <madduck@debian.org>
2010-01-21 14:58:32 +13:00
martin f. krafft
6e4be17ab8 Install vim plugin with vim-addons
Signed-off-by: martin f. krafft <madduck@debian.org>
2010-01-21 14:58:19 +13:00
martin f. krafft
9a66a8f877 add myself to uploaders
Signed-off-by: martin f. krafft <madduck@debian.org>
2010-01-21 14:40:35 +13:00
martin f. krafft
cd9778c967 put cworth as maintainer per his own request
Signed-off-by: martin f. krafft <madduck@debian.org>
2010-01-21 14:40:17 +13:00
martin f. krafft
814d2887ae Build-depend on emacs23
Signed-off-by: martin f. krafft <madduck@debian.org>
2010-01-21 14:19:16 +13:00
martin f. krafft
38f1bf18c3 add ITP bug number to changelog entry about upload
Signed-off-by: martin f. krafft <madduck@debian.org>
2010-01-21 14:09:00 +13:00
martin f. krafft
76ba495696 no need to create /usr/share dirs
Signed-off-by: martin f. krafft <madduck@debian.org>
2010-01-21 14:08:08 +13:00
martin f. krafft
1551c35925 Put debian/* under separate copyright.
Signed-off-by: martin f. krafft <madduck@debian.org>
2010-01-21 14:07:41 +13:00
martin f. krafft
cf72677e34 Fix suggestions/enhancements for vim+emacs
Signed-off-by: martin f. krafft <madduck@debian.org>
2010-01-21 14:06:09 +13:00
martin f. krafft
61209b5d65 Start new changelog stanza pending upload
Signed-off-by: martin f. krafft <madduck@debian.org>
2010-01-21 14:05:45 +13:00
martin f. krafft
9cef26de47 add Vcs-Browser field
Signed-off-by: martin f. krafft <madduck@debian.org>
2010-01-21 13:59:40 +13:00
martin f. krafft
994e46845d Add build-dependency on emacs
Signed-off-by: martin f. krafft <madduck@debian.org>
2010-01-09 11:50:12 +13:00
Jameson Graef Rollins
4989ef3d87 rework Debian emacsen-startup script. 2009-12-23 21:42:04 -05:00
Jameson Graef Rollins
4edf37a1d5 fix debian packaging emacsen installation 2009-11-29 08:48:46 -05:00
Jameson Graef Rollins
3cb3d2c021 first crack at debian packaging (using git-buildpackage) 2009-11-28 21:11:47 -05:00