--- maildir-utils-0.9.6.orig/debian/TODO +++ maildir-utils-0.9.6/debian/TODO @@ -0,0 +1,10 @@ +* build with --enable-gtk ??? + +* fix linking with libz etc (dh_shlibs warning): +dpkg-shlibdeps: warning: dependency on libz.so.1 could be avoided if "debian/mu/usr/bin/mu-msginfo debian/mu/usr/bin/mu-index debian/mu/usr/bin/mu-find" were not uselessly linked against it (they use none of its symbols). +dpkg-shlibdeps: warning: dependency on libdl.so.2 could be avoided if "debian/mu/usr/bin/mu-msginfo debian/mu/usr/bin/mu-index debian/mu/usr/bin/mu-find" were not uselessly linked against it (they use none of its symbols). +dpkg-shlibdeps: warning: dependency on libgmodule-2.0.so.0 could be avoided if "debian/mu/usr/bin/mu-msginfo debian/mu/usr/bin/mu-index" were not uselessly linked against it (they use none of its symbols). +dpkg-shlibdeps: warning: dependency on libgthread-2.0.so.0 could be avoided if "debian/mu/usr/bin/mu-msginfo debian/mu/usr/bin/mu-index" were not uselessly linked against it (they use none of its symbols). +dpkg-shlibdeps: warning: dependency on libnsl.so.1 could be avoided if "debian/mu/usr/bin/mu-msginfo debian/mu/usr/bin/mu-index" were not uselessly linked against it (they use none of its symbols). +dpkg-shlibdeps: warning: dependency on librt.so.1 could be avoided if "debian/mu/usr/bin/mu-msginfo debian/mu/usr/bin/mu-index" were not uselessly linked against it (they use none of its symbols). + --- maildir-utils-0.9.6.orig/debian/copyright +++ maildir-utils-0.9.6/debian/copyright @@ -0,0 +1,35 @@ +This package was debianized by Norbert Preining on +Thu Sep 25 22:38:46 CEST 2008. + +The original source was downloaded from + http://code.google.com/p/mu0/downloads/list + +The contents of the debian/ directory is released under the GNU +General Public Licence version 2 or (at your option) any later +version, unless otherwise explicitly stated in the file in question. +The files under debian/ are under Copyright by: + + Norbert Preining (2008) + +** Copyright (C) 2008 Dirk-Jan C. Binnema +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License as published by the +** Free Software Foundation; either version 3, or (at your option) any +** later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software Foundation, +** Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License v3 can be found in `/usr/share/common-licenses/GPL-3' file, +and the complete text of the GNU General Public License v2 can be found +in `/usr/share/common-licenses/GPL-2' file. + --- maildir-utils-0.9.6.orig/debian/changelog +++ maildir-utils-0.9.6/debian/changelog @@ -0,0 +1,142 @@ +maildir-utils (0.9.6-2) unstable; urgency=low + + * split of mug into its own package to reduce dependencies + (suggestion by Stephan Jänecke) + + -- Norbert Preining Tue, 26 Jul 2011 21:36:01 +0900 + +maildir-utils (0.9.6-1) unstable; urgency=low + + * new upstream release + * change build dep from libwebkit-dev to libwebkitgtk-dev (Closes: #635419) + * bump standards version to 3.9.2, no chances necessary + + -- Norbert Preining Tue, 26 Jul 2011 08:05:11 +0900 + +maildir-utils (0.9.5-1) unstable; urgency=low + + * new upstream releases + * fix build dependencies (add libgtk2.0-dev, webkit-dev, remove old + libgmime, add xdg-utils for xdg-open test) + * install mug2 as /usr/bin/mug, adapt the path of the svg in the Makefile.* + install mug.svg into /usr/share/pixmaps + + -- Norbert Preining Tue, 26 Apr 2011 11:09:04 +0900 + +maildir-utils (0.9.1-1) experimental; urgency=low + + * new upstream releases + * disable fix-clearlinks patch, included upstream + + -- Norbert Preining Tue, 21 Dec 2010 14:59:07 +0900 + +maildir-utils (0.8-1) experimental; urgency=low + + * upload to experimental to keep sid for squeeze fixes + * new upstream release + * disable patch fix-msgid-search, included upstream + + -- Norbert Preining Sat, 13 Nov 2010 22:13:58 +0900 + +maildir-utils (0.7-2) unstable; urgency=low + + * fix broken search of msgids, patch by Benjamin Mako Hill + (closes: #601072) (included upstream) + * fix clearing of symlinks, patch by Antonin Kral (upstream issue 28) + (closes: #578806) + * bump standards version to 3.9.1, no changes necessary + + -- Norbert Preining Tue, 02 Nov 2010 00:08:03 +0900 + +maildir-utils (0.7-1) unstable; urgency=low + + * Imported Upstream version 0.7 + * disable upstream included make-index-silent patch + + -- Norbert Preining Sun, 28 Feb 2010 19:30:03 +0900 + +maildir-utils (0.6-2) unstable; urgency=low + + * make mu index -q really silent, patch by Michael Guntsche + (Closes: #568668) + * bump standards version to 3.8.4, no changes necessary + * add a README.source file in debian/ + + -- Norbert Preining Thu, 11 Feb 2010 15:54:55 +0900 + +maildir-utils (0.6-1) unstable; urgency=low + + * new upstream release + * debian packaging: + - debian/patches: remove fix-maildir-check from queue, included upstream + + -- Norbert Preining Mon, 01 Feb 2010 10:06:16 +0900 + +maildir-utils (0.6~beta1-2) unstable; urgency=low + + * add a patch from Michael Guntsche to fix using ~/Maildir by default + (Closes: #566183) + * debian packaging changes: + - debian/patches: add fix-maildir-check patch and series dir + - debian/rules: add quilt stuff + - debian/control: add quilt to build-dep + + -- Norbert Preining Fri, 22 Jan 2010 11:52:11 +0900 + +maildir-utils (0.6~beta1-1) unstable; urgency=low + + * new upstream release 0.6-beta + - that merges the several different programs under one binary mu + - no sqlite storage is used anymore + * debian packaging changes: + - debian/patches + . remove all patches + - remove debian/HOWTO (upstream document) it is completely outdated + - debian/control: + . adjust build-dep for gmime-2.4 + . remove build-dep on quilt and sqlite + . adjust the description to new reality + - debian/rules: + . do not try to install doc files that are not present anymore + . disable quilt adaptions + - add debian/NEWS that explains that the separate programs are gone + + -- Norbert Preining Tue, 19 Jan 2010 20:12:43 +0900 + +maildir-utils (0.4-4) unstable; urgency=low + + [ Stefano Zacchiroli ] + * Add new patch xapian-cleanup-transaction to avoid one Xapian + transaction per delete message upon cleanup. (Closes: #535162) + + [ Norbert Preining ] + * switch to source format 3.0 (quilt) and back, I enjoy being + hindered in normal dev activity by funny proposals and new formats + * add ${misc:Depends} to the dependencies + + -- Norbert Preining Sun, 17 Jan 2010 02:58:34 +0900 + +maildir-utils (0.4-3) unstable; urgency=low + + * start using git: import 0.4-1, 0.4-2, add Vcs-{Git,Web} in debian/control + * fix debian/rules file for new quilt usage method + * add a patch by Michael Guntsche to fix mu-index -q segfault + (Closes: #542367) + * install HOWTO file from website via debian for now (Closes: #553179) + * use dh_prep instead of dh_clean -k + * pump standards version to 3.8.3 + * fix mis-behaviour of mu-find --format=p or --format=P (Closes: #537234) + + -- Norbert Preining Fri, 30 Oct 2009 03:39:18 +0900 + +maildir-utils (0.4-2) unstable; urgency=low + + * fix watch file + + -- Norbert Preining Sun, 28 Dec 2008 22:57:46 +0100 + +maildir-utils (0.4-1) unstable; urgency=low + + * First release (Closes: #500194) + + -- Norbert Preining Thu, 04 Dec 2008 19:13:08 +0100 --- maildir-utils-0.9.6.orig/debian/watch +++ maildir-utils-0.9.6/debian/watch @@ -0,0 +1,4 @@ +# watch control file for uscan +version=3 +http://code.google.com/p/mu0/downloads/list \ + http://mu0.googlecode.com/files/mu-(.*)\.tar\.gz --- maildir-utils-0.9.6.orig/debian/rules +++ maildir-utils-0.9.6/debian/rules @@ -0,0 +1,73 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 +export DH_OPTIONS + +# not needed, but reminding me helps ... +#export QUILT_PATCHES=./debian/patches +include /usr/share/quilt/quilt.make + +mu := $(CURDIR)/debian/maildir-utils +mugtk := $(CURDIR)/debian/maildir-utils-gtk + + +CFLAGS := -g -Wall +ifneq "$(findstring noopt,$(DEB_BUILD_OPTIONS))" "" +CFLAGS += -O0 +else +CFLAGS += -O2 +endif + +build: build-stamp + +build-stamp: $(QUILT_STAMPFN) + dh_testdir + CFLAGS="$(CFLAGS)" ./configure --prefix=/usr + $(MAKE) + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean install-stamp build-stamp config.log + +install: install-stamp + +install-stamp: DH_OPTIONS= +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_prep + dh_installdirs + $(MAKE) install prefix=$(mu)/usr + mkdir -p $(mugtk)/usr/bin + cp toys/mug2/mug2 $(mugtk)/usr/bin/mug + mkdir -p $(mugtk)/usr/share/pixmaps + cp toys/mug2/mug.svg $(mugtk)/usr/share/pixmaps/ + touch install-stamp + +binary-indep: +# There aren't any architecture independent packages here. + +binary-arch: DH_OPTIONS=-a +binary-arch: install + dh_testdir + dh_testroot + dh_installdocs README NEWS TODO debian/README.source + #dh_installchangelogs ChangeLog + dh_installchangelogs +ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" "" + dh_strip +endif + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch + +.PHONY: build clean binary-indep binary-arch binary install --- maildir-utils-0.9.6.orig/debian/compat +++ maildir-utils-0.9.6/debian/compat @@ -0,0 +1 @@ +7 --- maildir-utils-0.9.6.orig/debian/control +++ maildir-utils-0.9.6/debian/control @@ -0,0 +1,35 @@ +Source: maildir-utils +Section: mail +Priority: optional +Maintainer: Norbert Preining +Build-Depends: libxapian-dev, debhelper (>= 7), zlib1g-dev, libgtk2.0-dev, libwebkitgtk-dev, libgmime-2.4-dev, xdg-utils, quilt +Standards-Version: 3.9.2 +Homepage: http://www.djcbsoftware.nl/code/mu/ +Vcs-Git: git://git.debian.org/git/users/preining/maildir-utils.git +Vcs-Browser: http://git.debian.org/git/users/preining/maildir-utils.git + +Package: maildir-utils +Section: mail +Priority: optional +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Set of utilities to deal with Maildirs (upstream name mu) + mu is a set of utilities to deal with Maildirs, specifically, + indexing and searching. + - mu index - recursively scans a collection of email messages, and + stores information found in a database. + - mu find - searches for messages based on some search criteria. + - mu mkmdir - creates a new Maildir + . + mu uses libgmime2 to parse the message, and Xapian to store the message data. + +Package: maildir-utils-gtk +Section: mail +Priority: optional +Architecture: any +Depends: maildir-utils, xdg-utils, ${shlibs:Depends}, ${misc:Depends} +Replaces: maildir-utils (<= 0.9.6-1) +Description: Set of utilities to deal with Maildirs (upstream name mu) - gui + mu is a set of utilities to deal with Maildirs, specifically, + indexing and searching. + This package provides a GUI for searching wiht mu. --- maildir-utils-0.9.6.orig/debian/NEWS +++ maildir-utils-0.9.6/debian/NEWS @@ -0,0 +1,8 @@ +maildir-utils (0.6~beta1-1) unstable; urgency=low + + * From this release onward maildir utils does not ship separate programs, + but only one binary mu that allows for different commands. + So "mu-index" is not "mu index". Please see that man page of mu + for details. + + -- Norbert Preining Thu, 21 Jan 2010 14:39:49 +0900 --- maildir-utils-0.9.6.orig/debian/README.source +++ maildir-utils-0.9.6/debian/README.source @@ -0,0 +1,8 @@ + +README.source + +The source package uses quilt for the modifications of the upstream source. +If you want to change something it is best to use the quilt approach as +documented in + /usr/share/doc/quilt/README.source + --- maildir-utils-0.9.6.orig/debian/patches/fix-clearlinks +++ maildir-utils-0.9.6/debian/patches/fix-clearlinks @@ -0,0 +1,24 @@ +Fix for bug 578806 +Upstream issue 28: http://code.google.com/p/mu0/issues/detail?id=28 +patch by Antonin Kral +from the original issue: +I have problem with --clearlinks which doesn't seem to do anything. The symlinks in the result directory was never removed. I have found the same issue reported in Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=578806 + +I believe that the problem is in readdir_with_stat_fallback() function which was constantly returning DT_REG and not DT_LNK. You are using stat() call, which will follow the symlink, so the resolut will never be DT_LNK. The fix is simply to call lstat() instead: +--- + src/mu-maildir.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: maildir-utils.git/src/mu-maildir.c +=================================================================== +--- maildir-utils.git.orig/src/mu-maildir.c 2010-11-13 22:11:34.000000000 +0900 ++++ maildir-utils.git/src/mu-maildir.c 2010-11-13 22:12:46.000000000 +0900 +@@ -327,7 +327,7 @@ + + /* note, fullpath_s returns a static buffer */ + fullpath = fullpath_s (path, entry->d_name); +- if (stat (fullpath, &statbuf) != 0) { ++ if (lstat (fullpath, &statbuf) != 0) { + g_warning ("stat failed on %s: %s", fullpath, + strerror(errno)); + return FALSE; --- maildir-utils-0.9.6.orig/debian/patches/fix-mug2-build +++ maildir-utils-0.9.6/debian/patches/fix-mug2-build @@ -0,0 +1,31 @@ +--- + toys/mug2/Makefile.am | 2 +- + toys/mug2/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: maildir-utils.git/toys/mug2/Makefile.am +=================================================================== +--- maildir-utils.git.orig/toys/mug2/Makefile.am 2011-03-17 15:13:01.000000000 +0900 ++++ maildir-utils.git/toys/mug2/Makefile.am 2011-03-17 15:13:59.000000000 +0900 +@@ -20,7 +20,7 @@ + SUBDIRS= . + + INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(GTK_CFLAGS) $(WEBKIT_CFLAGS) -DICONDIR='"$(icondir)"' \ +- -DMUG2DIR='"$(abs_srcdir)"' -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE ++ -DMUG2DIR='"/usr/share/pixmaps"' -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE + + # don't use -Werror, as it might break on other compilers + # use -Wno-unused-parameters, because some callbacks may not +Index: maildir-utils.git/toys/mug2/Makefile.in +=================================================================== +--- maildir-utils.git.orig/toys/mug2/Makefile.in 2011-03-17 15:13:03.000000000 +0900 ++++ maildir-utils.git/toys/mug2/Makefile.in 2011-03-17 15:13:45.000000000 +0900 +@@ -287,7 +287,7 @@ + # enforce compiling this dir first before decending into tests/ + SUBDIRS = . + INCLUDES = -I${top_srcdir} -I${top_srcdir}/src $(GTK_CFLAGS) $(WEBKIT_CFLAGS) -DICONDIR='"$(icondir)"' \ +- -DMUG2DIR='"$(abs_srcdir)"' -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE ++ -DMUG2DIR='"/usr/share/pixmaps"' -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE + + + # don't use -Werror, as it might break on other compilers --- maildir-utils-0.9.6.orig/debian/patches/make-index-silent +++ maildir-utils-0.9.6/debian/patches/make-index-silent @@ -0,0 +1,25 @@ +As the subject says, mu index -q still outputs a newline character. If +used via cron this yields an empty mail message to the user. + +Debian bug #568668 + +Fix written by submitter Michael Guntsche + +Upstream already fixed +--- + src/mu-cmd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: maildir-utils/src/mu-cmd.c +=================================================================== +--- maildir-utils.orig/src/mu-cmd.c 2010-02-11 15:47:14.000000000 +0900 ++++ maildir-utils/src/mu-cmd.c 2010-02-11 15:47:45.000000000 +0900 +@@ -413,7 +413,7 @@ + NULL, NULL); + if (!opts->nocleanup) { + stats._processed = 0; /* start over */ +- g_print ("\n"); ++ opts->quiet ? : g_print ("\n"); + g_message ("Cleaning up missing messages"); + mu_index_cleanup (midx, &stats, + opts->quiet ? NULL : index_msg_cb, --- maildir-utils-0.9.6.orig/debian/patches/series +++ maildir-utils-0.9.6/debian/patches/series @@ -0,0 +1,5 @@ +#fix-maildir-check +#make-index-silent +#fix-msgid-search +#fix-clearlinks +fix-mug2-build --- maildir-utils-0.9.6.orig/debian/patches/fix-msgid-search +++ maildir-utils-0.9.6/debian/patches/fix-msgid-search @@ -0,0 +1,30 @@ +From Benjamin Mako Hill email: +To reproduce the bug, try to output the message-id for any message in +the system using the field option to 'mu find' like: + + mu find -f i EXAMPLE + +The result will not shown any message-ids but will just repeat the +letter "i". The problem seems to be that that message-id is being stored +as a Xapian term but not as a value. As a result, it can be searched +for, but not displayed. + +I'm attaching a patch that solves the problem on my system. I don't know +the codebase well enough to know if I've fixed in this in "the right way." +--- + src/mu-msg-fields.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: maildir-utils.git/src/mu-msg-fields.c +=================================================================== +--- maildir-utils.git.orig/src/mu-msg-fields.c 2010-10-23 16:51:22.000000000 +0900 ++++ maildir-utils.git/src/mu-msg-fields.c 2010-10-23 16:51:49.000000000 +0900 +@@ -130,7 +130,7 @@ + MU_MSG_FIELD_ID_MSGID, + MU_MSG_FIELD_TYPE_STRING, + "msgid", "i", "I", /* 'i' for Id */ +- FLAG_GMIME | FLAG_XAPIAN_TERM ++ FLAG_GMIME | FLAG_XAPIAN_TERM | FLAG_XAPIAN_VALUE + }, + + {