isync (1.0.4-2.1) debian-dir only changes

Summary

 debian/Makefile.am   |    5 +
 debian/Makefile.in   |  248 +++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/NEWS          |   27 +++++
 debian/README.Debian |   12 ++
 debian/changelog     |  141 +++++++++++++++++++++++++++-
 debian/control       |   36 +++----
 debian/copyright     |    2 
 debian/rules         |   16 +--
 debian/watch         |    4 
 9 files changed, 453 insertions(+), 38 deletions(-)

    
download this patch

Patch contents

--- isync-1.0.4.orig/debian/watch
+++ isync-1.0.4/debian/watch
@@ -1,2 +1,2 @@
-version=2
-http://sourceforge.net/project/showfiles.php?group_id=69662 .*/isync-(.*).tar.gz.*
+version=3
+http://sf.net/isync/ isync-(.*)\.tar\.gz debian uupdate
--- isync-1.0.4.orig/debian/changelog
+++ isync-1.0.4/debian/changelog
@@ -1,13 +1,140 @@
-isync (0.9.2+cvsXXXXXXXX-1) unstable; urgency=low
+isync (1.0.4-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Drop debconf note that deals with a pre-Etch transition.
+    Closes: #492194
+
+ -- Christian Perrier <bubulle@debian.org>  Sat, 25 Oct 2008 08:40:52 +0200
+
+isync (1.0.4-2) unstable; urgency=low
+
+  * Change the libdb4.4-dev build-dependency to libdb-dev. Thanks Luk for
+    pointing this. (Closes: #499165)
+
+ -- Nicolas Boullis <nboullis@debian.org>  Wed, 17 Sep 2008 23:58:58 +0200
+
+isync (1.0.4-1) unstable; urgency=low
+
+  * The second "thanks Christian" release.
+  * New upstream release.
+    - Accept empty "* SEARCH" response. (Closes: #413336)
+    - Quote user name in generated config. (Closes: #456783)
+  * Explain the isync->mbsync change in the package description.
+    (Closes: #430648) 
+  * Fix the debian/watch file that lacked the version and action fields.
+  * Disable the upstream "deb-clean" stuff in the top-level Makefile, as
+    in breaks cleaning the build directory.
+  * Bump Standards-Version to 3.7.3. (No change required.)
+
+ -- Nicolas Boullis <nboullis@debian.org>  Sat, 03 May 2008 01:42:55 +0200
+
+isync (1.0.3-3.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix pending l10n issues.
+  * Debconf translations:
+    - Portuguese. Closes: #418283
+    - Italian. Closes: #418246
+    - Dutch. Closes: #422244
+    - Spanish. Closes: #426184
+    - Finnish. Closes: #468214
+    - Galician. Closes: #470529
+  * [Lintian] Do not include debian revision in the build dependency for
+    libssl-dev
+  * [Lintian] No longer ignore errors from "make distclean"
+
+ -- Christian Perrier <bubulle@debian.org>  Wed, 12 Mar 2008 07:24:01 +0100
+
+isync (1.0.3-3) unstable; urgency=low
+
+  * The "thanks Christian" release.
+  * Update German debconf templates translation. Thanks to Erik Schanze
+    (for the translation) and Christian Perrier (for forwarding the
+    translation). (Closes: #407615)
+
+ -- Nicolas Boullis <nboullis@debian.org>  Mon,  5 Feb 2007 00:17:15 +0100
+
+isync (1.0.3-2.1) unstable; urgency=low
+
+  * Non-maintainer upload with maintainer's permission
+  * Debconf templates translations:
+    - French updated by me
+    - Brazilian Portuguese translation added
+    - Czech translation added. Closes: #403473
+    - Russian translation added. Closes: #403510
+    - Vietnamese translation added
+    - Norwegian Bokmål translation added. Closes: #403523
+
+ -- Christian Perrier <bubulle@debian.org>  Sun, 17 Dec 2006 15:31:04 +0100
+
+isync (1.0.3-2) unstable; urgency=low
+
+  * Back to unstable, with permission from Steve Langasek. (Message-ID:
+    <20061121015225.GF28035@borges.dodds.net>)
+  * Rewrite the debconf note, thanks to the debian-l10n-english team (and
+    especially MJ Ray).
+  * Also add some information about the new version into NEWS.Debian.
+  * Remove the information about the need to set the T (trashed) flag from
+    README.Debian.
+  * Also install the isyncrc.sample sample configuration file.
+  * Bump Standards-Version to 3.7.2. (No change required.)
+
+ -- Nicolas Boullis <nboullis@debian.org>  Tue,  5 Dec 2006 00:34:54 +0100
+
+isync (1.0.3-1) experimental; urgency=low
+
+  * New upstream release. (Closes: #315423)
+    - Isync now supports breaking and linking threads. (Closes: #177280)
+    - It also supports unflagging messages. (Closes: #111286)
+    - IMAP commands are sent asynchronously. (Closes: #226222)
+  * Kill the old debconf question about upgrades from pre-0.8 versions.
+  * Use the (now obsolete) swedish and portugese translations anyway.
+    (Closes: #337771, #378891)
+  * New debconf note that warns about upgrades from pre-1.0 versions.
+  * Add a build dependency on po-debconf.
+
+ -- Nicolas Boullis <nboullis@debian.org>  Sun, 19 Nov 2006 15:04:31 +0100
+
+isync (0.9.2-4) unstable; urgency=low
+
+  * Add Czech debconf translation, thanks to Martin Šín. (Closes: #317571)
+  * Build with the newest libssl-dev.
+  * Load the debconf library in postinst to ensure that everything works
+    as expected, thanks to lintian for noticing the problem and to
+    Josselin Mouette for pointing to the right doc.
+  * Fix a bashism in the config script, thanks to lintian.
+  * Update the postal address of the FSF in the copyright file.
+  * Bump Standards-Version to 3.6.2. (No change required.)
+
+ -- Nicolas Boullis <nboullis@debian.org>  Mon, 10 Oct 2005 01:37:50 +0200
+
+isync (0.9.2-3) unstable; urgency=low
+
+  * Bump build-dependency from libdb4.0-dev to libdb4.2-dev, thanks to
+    Andreas Jochens. (Closes: #280268)
+
+ -- Nicolas Boullis <nboullis@debian.org>  Tue,  9 Nov 2004 18:21:12 +0100
+
+isync (0.9.2-2) unstable; urgency=low
+
+  * Add german debconf templates translation, thanks to Erik Schanze.
+    (Closes: #267675)
+
+ -- Nicolas Boullis <nboullis@debian.org>  Tue, 24 Aug 2004 00:32:32 +0200
+
+isync (0.9.2-1) unstable; urgency=low
 
   * New upstream release.
-       - Password prompt now includes the mailbox/server (Closes: #92893)
-  * Theodore Ts'o added as co-maintainer
-  * Added initial asynchronous flags synchronization patch (Closes: #226222)
-  * Ignore anything that does not look remotely like a maildir when
-    collecting mailboxes for OneToOne (from isync CVS)
+    - Password prompt now includes the mailbox/server. (Closes: #92893)
+  * Backported from CVS:
+    - A few prinf converted to info (disabled with -q).
+    - A few other printf converted to warn (disabled with -q -q) to be
+      able to disable the warning when SSL is not available.
+      (Closes: #228086) 
+    - Update the manpage accordingly (about -q).
+    - Improve the manpage (about using isync with mutt).
+  * Add Theodore Y. Ts'o as a co-maintainter.
 
- -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 11 Jan 2004 02:38:48 -0500
+ -- Nicolas Boullis <nboullis@debian.org>  Tue, 13 Apr 2004 02:12:42 +0200
 
 isync (0.9.1-4) unstable; urgency=low
 
--- isync-1.0.4.orig/debian/copyright
+++ isync-1.0.4/debian/copyright
@@ -24,7 +24,7 @@
  *
  *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * As a special exception, isync may be linked with the OpenSSL library,
  * despite that library's more restrictive license.
--- isync-1.0.4.orig/debian/Makefile.am
+++ isync-1.0.4/debian/Makefile.am
@@ -0,0 +1,5 @@
+EXTRA_DIST = changelog compat control copyright dirs docs rules
+DISTCLEANFILES = files isync.substvars
+
+distclean-local:
+	rm -rf isync
--- isync-1.0.4.orig/debian/Makefile.in
+++ isync-1.0.4/debian/Makefile.in
@@ -0,0 +1,248 @@
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EXEEXT = @EXEEXT@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+EXTRA_DIST = changelog compat control copyright dirs docs rules
+DISTCLEANFILES = files isync.substvars
+subdir = debian
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  debian/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-local
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distclean-local distdir dvi dvi-am info \
+	info-am install install-am install-data install-data-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-info-am
+
+
+distclean-local:
+	rm -rf isync
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
--- isync-1.0.4.orig/debian/NEWS
+++ isync-1.0.4/debian/NEWS
@@ -0,0 +1,27 @@
+isync (1.0.3-1) experimental; urgency=low
+
+    Since 1.0, isync is a wrapper around the new, more powerful, mbsync
+    program. The major rewrite leads to several improvements. Among them,
+    it is no longer needed to set the T (trash) flag to have a message be
+    deleted remotely. Simply removing the message now works. The (minor)
+    downside is that anyone expecting the old broken behavior (messaged
+    deleted locally being refetched) may lose some messages.
+
+ -- Nicolas Boullis <nboullis@debian.org>  Sun, 19 Nov 2006 15:04:31 +0100
+
+isync (0.8-1) unstable; urgency=low
+
+  IMPORTANT upgrade note:
+
+  This version includes a change to the way the UID for each message is
+  stored in the local mailbox. You need to remove all the messages in your
+  local folder if you were previously using another version of isync or else
+  you will end up with duplicate messages on your IMAP server. 
+
+  A suggested upgrade procedure is to use isync version 0.7 to synchronize
+  any local changes in isync-managed mailboxes with your IMAP server, and
+  then remove the contents of the local mailboxes, before upgrading to this
+  version. Then run isync again to pull down the mail again. You must do
+  this manually, the Debian package will not do this for you.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 29 Oct 2002 13:50:40 -0500
--- isync-1.0.4.orig/debian/README.Debian
+++ isync-1.0.4/debian/README.Debian
@@ -0,0 +1,12 @@
+A note from isync's web site:
+
+isync can be integrated into Mutt fairly easily with a few hooks:
+
+	folder-hook ~A bind index $ <sync-mailbox>
+	folder-hook +maildir 'macro index $ "<sync-mailbox>!isync -e maildir\n"'
+
+where maildir is the name of the local mailbox (or its alias). This works well
+so long as you are not modifying the IMAP mailbox outside of Mutt. However, if
+you are using another mail program simultaneously Mutt will have the wrong idea
+of the local mailbox flags and messages will start disappearing from its index
+display (don't worry, they are still on disk).
--- isync-1.0.4.orig/debian/control
+++ isync-1.0.4/debian/control
@@ -2,28 +2,28 @@
 Section: mail
 Priority: optional
 Maintainer: Nicolas Boullis <nboullis@debian.org>
-Uploaders: Nicolas Boullis <nboullis@debian.org>, Theodore Y. Ts'o <tytso@mit.edu>
-Standards-Version: 3.6.1
-Build-Depends: libssl-dev, debhelper (>= 4.1.16), dpkg-dev (>= 1.9.0), libdb4.2-dev, dpatch
+Uploaders: Theodore Y. Ts'o <tytso@mit.edu>
+Standards-Version: 3.7.3
+Build-Depends: libssl-dev (>= 0.9.8), debhelper (>= 4.1.16), dpkg-dev (>= 1.9.0), libdb-dev
 
 Package: isync
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: mutt
-Description: Synchronize Maildir and IMAP4 mailboxes
- A command line application which synchronizes mailboxes; currently
- Maildir and IMAP4 mailboxes are supported.
- New messages, message deletions and flag changes can be propagated both ways.
- It is useful for working in disconnected mode, such as on a laptop or with a
- non-permanent internet collection (dIMAP).
+Description: Synchronize a local maildir with a remote IMAP4 mailbox
+ Command line applications which synchronize a local maildir-style
+ mailbox with a remote IMAP4 mailbox, suitable for use in disconnected
+ mode. Multiple copies of the remote IMAP4 mailbox can be maintained,
+ and all flags and messages are synchronized.
+ .
+ The main application was much improved in version 1.0. Those
+ improvements lead to interface changes and the application being
+ renamed to mbsync. The application isync is now only a wrapper to
+ keep compatibility with earlier versions.
  .
  Features:
-  * Fine-grained selection of synchronization operations to perform
-  * Synchronizes single mailboxes or entire mailbox collections
-  * Partial mirrors possible: keep only the latest messages locally
-  * Trash functionality: backup messages before removing them
-  * IMAP features:
-    * Supports TLS/SSL via imaps: (port 993) and STARTTLS (RFC2595)
-    * Supports CRAM-MD5 (RFC2195) for authentication
-    * Supports NAMESPACE (RFC2342) for simplified configuration
-    * Pipelining for maximum speed (currently only partially implemented)
+  * Fast mode for fetching new mail only
+  * Supports imaps: (port 993) TLS/SSL connections
+  * Supports STARTTLS (RFC2595) for confidentiality
+  * Supports NAMESPACE (RFC2342)
+  * Supports CRAM-MD5 (RFC2095) for authentication
--- isync-1.0.4.orig/debian/rules
+++ isync-1.0.4/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-PACKAGE=isync
-
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -O0
@@ -13,18 +11,17 @@
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
 	dh_testdir
-	./configure --disable-maintainer-mode --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) --prefix=/usr --mandir=/usr/share/man 
+	./configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) --prefix=/usr --mandir=/usr/share/man 
 	$(MAKE) CFLAGS="$(CFLAGS)"
 	touch build-stamp
 
-clean: clean1 unpatch
-clean1:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean Makefile config.log config.status
 
 install: build
@@ -33,6 +30,7 @@
 	dh_clean -k
 	dh_installdirs usr/bin usr/share/man/man1
 	$(MAKE) DESTDIR=$(CURDIR)/debian/isync install
+	mv $(CURDIR)/debian/isync/usr/bin/get-cert $(CURDIR)/debian/isync/usr/bin/mbsync-get-cert
 
 binary-indep: build install
 
@@ -53,6 +51,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install clean1
-
-include /usr/share/dpatch/dpatch.make
+.PHONY: build clean binary-indep binary-arch binary install