diff -Nru maildir-utils-1.0/debian/changelog maildir-utils-1.0/debian/changelog --- maildir-utils-1.0/debian/changelog 2018-05-18 04:56:28.000000000 +0000 +++ maildir-utils-1.0/debian/changelog 2018-08-08 12:18:09.000000000 +0000 @@ -1,3 +1,9 @@ +maildir-utils (1.0-6) unstable; urgency=medium + + * drop all of m-u-extra as it needs deprecated webkit1 (Closes: #905695) + + -- Norbert Preining Wed, 08 Aug 2018 21:18:09 +0900 + maildir-utils (1.0-5) unstable; urgency=medium * typos in Makefile, next round on armel diff -Nru maildir-utils-1.0/debian/control maildir-utils-1.0/debian/control --- maildir-utils-1.0/debian/control 2018-05-18 04:56:28.000000000 +0000 +++ maildir-utils-1.0/debian/control 2018-08-08 12:18:09.000000000 +0000 @@ -2,7 +2,7 @@ Section: mail Priority: optional Maintainer: Norbert Preining -Build-Depends: libxapian-dev, debhelper (>= 9), zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libgmime-2.6-dev, xdg-utils, emacsen-common (>= 2.0.8), dh-autoreconf, guile-2.2-dev [!ia64 !armel], texinfo, pmccabe +Build-Depends: libxapian-dev, debhelper (>= 9), zlib1g-dev, libgtk-3-dev, libgmime-2.6-dev, xdg-utils, emacsen-common (>= 2.0.8), dh-autoreconf, guile-2.2-dev [!ia64 !armel], texinfo, pmccabe Standards-Version: 4.1.3 Homepage: http://www.djcbsoftware.nl/code/mu/ Vcs-Git: https://salsa.debian.org/preining/maildir-utils.git @@ -36,15 +36,3 @@ mu4e (mu-for-emacs) is an e-mail client for GNU-Emacs version 23 and later, built on top of the mu e-mail search engine. mu4e is optimized for fast handling of large amounts of e-mail. - -Package: maildir-utils-extra -Section: mail -Priority: optional -Architecture: any -Depends: maildir-utils (>= ${source:Version}), maildir-utils (<< ${source:Version}.1~), xdg-utils, ${shlibs:Depends}, ${misc:Depends} -Replaces: maildir-utils (<= 0.9.6-1), maildir-utils-gtk -Conflicts: maildir-utils-gtk -Description: Extra utilities for maildir-utils - mu is a set of utilities to deal with Maildirs, specifically, - indexing and searching. This package provides extra utilities that are - under heavy development, currently only a GUI for searching with mu. diff -Nru maildir-utils-1.0/debian/rules maildir-utils-1.0/debian/rules --- maildir-utils-1.0/debian/rules 2018-05-18 04:56:28.000000000 +0000 +++ maildir-utils-1.0/debian/rules 2018-08-08 12:18:09.000000000 +0000 @@ -4,7 +4,6 @@ export DH_OPTIONS mu := $(CURDIR)/debian/maildir-utils -muextra := $(CURDIR)/debian/maildir-utils-extra mu4e := $(CURDIR)/debian/mu4e @@ -35,7 +34,7 @@ dh_testdir dh_autoreconf CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ - ./configure --prefix=/usr --docdir='$${prefix}/share/doc/maildir-utils' $(DOGUILECONFIG) + ./configure --prefix=/usr --docdir='$${prefix}/share/doc/maildir-utils' --disable-webkit $(DOGUILECONFIG) $(MAKE) touch $@ @@ -57,12 +56,6 @@ $(MAKE) install prefix=$(mu)/usr # remove wrong info/dir rm -f $(mu)/usr/share/info/dir* - # maildir-utils-extra package - mkdir -p $(muextra)/usr/bin - cp toys/mug/mug $(muextra)/usr/bin/mug - cp toys/msg2pdf/msg2pdf $(muextra)/usr/bin/msg2pdf - mkdir -p $(muextra)/usr/share/pixmaps - cp toys/mug/mug.svg $(muextra)/usr/share/pixmaps/ # mu4e package mkdir -p $(mu4e)/usr/share mv $(mu)/usr/share/emacs $(mu4e)/usr/share diff -Nru maildir-utils-1.0/debian/TODO maildir-utils-1.0/debian/TODO --- maildir-utils-1.0/debian/TODO 2018-05-18 04:56:28.000000000 +0000 +++ maildir-utils-1.0/debian/TODO 2018-08-08 12:18:09.000000000 +0000 @@ -1,3 +1,7 @@ +* switch to dh_elpa + +* fix msg2pdf call in mu4e + * 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).