Update Debian files to the debian directory from isync 0.9.1-3.

debian/NEWS

@@ -0,0 +1,16 @@
+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

debian/README.Debian

@@ -0,0 +1,22 @@
+A note from isync's web site:
+
+To use this command effectively, you need a mail client that sets the T
+(trashed) flag when it deletes a message from a maildir mailbox, instead of
+just removing it altogether. Currently, only Mutt 1.3.27 supports this. Without
+such a client, isync will refetch the locally deleted messages from the server
+since they will never get expunged. Be sure to put
+
+set maildir_trash
+
+in your ~/.muttrc when using Mutt.
+
+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).

debian/changelog

@@ -4,21 +4,109 @@ isync (0.9.2-1) unstable; urgency=low
 
  -- Oswald Buddenhagen <ossi@users.sf.net>  Sun, 07 Dec 2003 16:13:00 +0100
 
-isync (0.9.1-1) unstable; urgency=medium
+isync (0.9.1-3) unstable; urgency=low
 
-  * New upstream release
+  * Do not segfault when using both tunneled end non-tunneled connections,
+    thanks to Nik A. Melchior for reporting and for his patch.
+    (Closes: #220667)
+  * Save uid of messages when interrupted, thanks to Theodore Y. Ts'o for
+    reporting and for his patch. (Closes: #220346)
+  * Do not get the sizes of the messages if unneeded (if MaxSize=0).
 
- -- Oswald Buddenhagen <ossi@users.sf.net>  Wed, 07 May 2003 01:22:00 +0200
+ -- Nicolas Boullis <nboullis@debian.org>  Thu, 18 Dec 2003 00:55:04 +0100
 
-isync (0.9-1) unstable; urgency=low
+isync (0.9.1-2) unstable; urgency=low
 
-  * New upstream release
+  * Add french debconf templates translation, thanks to Christian
+    Perrier. (Closes: #218118)
+
+ -- Nicolas Boullis <nboullis@debian.org>  Mon,  3 Nov 2003 18:50:56 +0100
+
+isync (0.9.1-1) unstable; urgency=low
+
+  * New maintainer. (Closes: #180050)
+  * New upstream release.
+    - With the new option -R, isync is now able to create non-existent
+      remote mailboxes. (Closes: #170388)
+  * Update debian/copyright to match the current copyright:
+    - Add Oswald Buddenhagen as copyright owner.
+    - Add special exception for OpenSSL.
+  * Add support for noopt in $DEB_BUILD_OPTIONS in debian/rules.
+  * Switch to po-debconf.
+  * Remove sample.isyncrc from debian/docs: no need to have it both as a
+    doc and as an example.
+  * Move package from section non-US/main (?) to mail. (Closes: #154216)
+  * Update versionned build-dependency on debhelper to >= 4.1.16.
+  * Bump Standards-Version to 3.6.1. (No change required.)
+
+ -- Nicolas Boullis <nboullis@debian.org>  Tue, 14 Oct 2003 22:02:20 +0200
+
+isync (0.8-4) unstable; urgency=low
+
+  * Orphaned the package, as I no longer use it.
+
+ -- Joey Hess <joeyh@debian.org>  Thu,  6 Feb 2003 15:46:38 -0500
+
+isync (0.8-3) unstable; urgency=low
+
+  * New upstream maintainer; updated copyright file web site address, and
+    watch file. NB: new upstream has not made any new releases yet.
+
+ -- Joey Hess <joeyh@debian.org>  Sat,  1 Feb 2003 16:03:49 -0500
+
+isync (0.8-2) unstable; urgency=low
 
- -- Oswald Buddenhagen <ossi@users.sf.net>  Mon, 05 May 2003 20:15:00 +0200
+  * Only reset debconf question if user chooses to abort upgrade.
+    Closes: #167363
+  * Don't open lock files O_EXCL. As seen in upstream cvs.
+  * Description and build-deps updates.
+  * Added README.Debian with notes on mutt integration.
+
+ -- Joey Hess <joeyh@debian.org>  Fri,  1 Nov 2002 18:02:44 -0500
 
 isync (0.8-1) unstable; urgency=low
 
-  * Initial Release.
+  * New upstream release. Closes: #134080
+  
+  **WARNING**
+    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.
+
+  * Has better support for uploading locally added messages. Closes: #120272
+  * Added a debconf queston with some info about this that lets you abort the
+    upgrade.
+  * Added NEWS.Debian with same info.
+  * New maintainer.
+  * Removed upstream debianization stuff.
+  * Updated copyright file.
+  * Updated to current policy throughout.
+  * Added uscan watch file.
+  * Updated build-deps.
+  * Now that isync needs berkeley databases, go with db4, so I don't have to
+    transition from db3 later.
+  * Fix fd leak (forgot to close tmp dir in maildir). Closes: #150762
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 29 Oct 2002 17:02:14 -0500
+
+isync (0.7-1) unstable; urgency=low
+
+  * New upstream version (Closes: #121312, #92051).
+  * Rumors say this might fix bugs #102255 and #120272,
+    but I have no test setup right now, so I'm leaving them open.
+  * Updated standards-version.
 
- -- Michael Elkins <me@mutt.org>  Wed, 16 Jan 2002 13:36:52 -0800
+ -- Tommi Virtanen <tv@debian.org>  Sat,  5 Jan 2002 16:13:35 +0200
+
+isync (0.5-1) unstable; urgency=low
+
+  * New upstream version (Closes: #98642).
+  * Install sample.isyncrc too (Closes: #90464).
+
+ -- Tommi Virtanen <tv@debian.org>  Sat, 23 Jun 2001 01:19:07 +0300
+
+isync (0.4-1) unstable; urgency=low
+
+  * Initial Release.
 
+ -- Tommi Virtanen <tv@debian.org>  Sat, 10 Mar 2001 18:43:35 +0200

debian/config

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+. /usr/share/debconf/confmodule
+if [ "$1" = "configure" -a ! -z "$2" ] && \
+   dpkg --compare-versions "$2" lt 0.8; then
+	db_input critical isync/upgrade_0.8 || true
+	db_go || true
+fi

debian/control

@@ -1,19 +1,19 @@
 Source: isync
 Section: mail
 Priority: optional
-Maintainer: Oswald Buddenhagen <ossi@users.sf.net>
-Build-Depends: debhelper (>= 3), dpkg-dev (>= 1.9.0), libdb-dev
-Standards-Version: 3.5.8
+Maintainer: Nicolas Boullis <nboullis@debian.org>
+Standards-Version: 3.6.1
+Build-Depends: libssl-dev, debhelper (>= 4.1.16), dpkg-dev (>= 1.9.0), libdb4.0-dev
 
 Package: isync
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: mutt
 Description: Synchronize a local maildir with a remote IMAP4 mailbox
  A command line application which synchronizes a local maildir-style
- mailbox with a remote IMAP4 mailbox, suitable for use in
- IMAP-disconnected mode. Multiple copies of the remote IMAP4 mailbox
- can be maintained, and all flags are synchronized.
+ 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.
  .
  Features:
   * Fast mode for fetching new mail only
@@ -21,4 +21,3 @@ Description: Synchronize a local maildir with a remote IMAP4 mailbox
   * Supports STARTTLS (RFC2595) for confidentiality
   * Supports NAMESPACE (RFC2342)
   * Supports CRAM-MD5 (RFC2095) for authentication
-

debian/copyright

@@ -1,16 +1,16 @@
-This package was debianized by Michael Elkins <melkins@debian> on
-Wed, 16 Jan 2002 13:36:52 -0800.
+This package was debianized by Tommi Virtanen <tv@debian.org> and is now
+maintained by Nicolas Boullis <nboullis@debian.org>.
 
-It was downloaded from http://isync.sf.net/
+It was downloaded from http://isync.sourceforge.net/
 
-Upstream author(s): Michael Elkins <me@mutt.org>
-Current upstream maintainer(s): Oswald Buddenhagen <ossi@users.sf.net>
+Upstream Author: Michael R. Elkins <me@mutt.org>,
+                 Oswald Buddenhagen <ossi@users.sf.net>
 
 Copyright:
 
  * isync - IMAP4 to maildir mailbox synchronizer
  * Copyright (C) 2000-2002 Michael R. Elkins <me@mutt.org>
- * Copyright (C) 2002 Oswald Buddenhagen <ossi@users.sf.net>
+ * Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@users.sf.net>
  *
  *  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
@@ -25,4 +25,9 @@ Copyright:
  *  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
+ *
+ * As a special exception, isync may be linked with the OpenSSL library,
+ * despite that library's more restrictive license.
 
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL

debian/docs

@@ -1,4 +1,3 @@
 NEWS
 README
 TODO
-isyncrc.sample

debian/po/POTFILES.in

@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates

debian/po/fr.po

@@ -0,0 +1,74 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: isync 0.9.1-1\n"
+"POT-Creation-Date: 2003-10-14 21:55+0200\n"
+"PO-Revision-Date: 2003-10-27 11:52+0100\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../templates:4
+msgid "Abort isync upgrade"
+msgstr "Interrompre la mise à jour d'isync"
+
+#. Description
+#: ../templates:4
+msgid ""
+"You are upgrading from an older version of isync that stored the UID of each "
+"message in a way that is not compatable with the new version. You need to "
+"remove all the messages in local folders downloaded with the old version of "
+"isync. Otherwise isync will get confused and upload duplicate messages to "
+"the IMAP server."
+msgstr ""
+"Vous mettez isync à jour à partir d'une version qui utilise une méthode de "
+"stockage des identifiants des messages incompatible avec la nouvelle "
+"version. Il faut supprimer des répertoires locaux tous les messages "
+"téléchargés avec l'ancienne version ; sinon, isync fonctionnera "
+"incorrectement et enverra au serveur IMAP des doublons des messages."
+
+#. Description
+#: ../templates:4
+msgid ""
+"A suggested upgrade procedure is to use the isync version 0.7 to synchronize "
+"any local changes in isync-managed mailboxes with your IMAP server (if there "
+"are any local changes to synchronise), and then remove the contents of the "
+"local mailboxes, before upgrading to version 0.8 or above. Then run isync "
+"again to pull down the mail again. You must do this manually; the Debian "
+"package will not do this for you."
+msgstr ""
+"La méthode suggérée pour la mise à jour est la suivante : en utilisant "
+"la version 0.7 d'isync, synchronisez avec le serveur IMAP les éventuelles modifications locales "
+"des boîtes aux lettres gérées par isync ; puis "
+"supprimez le contenu des boîtes aux lettres locales. Ensuite, effectuez la "
+"mise à jour vers une version supérieure ou égale à 0.8. Enfin, utilisez à "
+"nouveau isync pour récupérer les courriels. Vous devez effectuer cette "
+"opération vous-même : le paquet Debian ne la fera pas automatiquement."
+
+#. Description
+#: ../templates:4
+msgid ""
+"If you want, the upgrade of isync can be aborted to let you deal with this "
+"issue. Or you can just suspend the upgrade or switch to a different virtual "
+"console to take care of it. Do not continue past this point before manually "
+"resolving this issue!"
+msgstr ""
+"Si vous le souhaitez, la mise à jour d'isync peut être interrompue pour vous "
+"permettre d'effectuer cette opération. Vous pouvez également basculer vers "
+"une autre console virtuelle pour vous en occuper, puis reprendre la mise à jour. Ne continuez pas "
+"sans faire cette correction."

debian/po/templates.pot

@@ -0,0 +1,60 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-10-14 21:55+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../templates:4
+msgid "Abort isync upgrade"
+msgstr ""
+
+#. Description
+#: ../templates:4
+msgid ""
+"You are upgrading from an older version of isync that stored the UID of each "
+"message in a way that is not compatable with the new version. You need to "
+"remove all the messages in local folders downloaded with the old version of "
+"isync. Otherwise isync will get confused and upload duplicate messages to "
+"the IMAP server."
+msgstr ""
+
+#. Description
+#: ../templates:4
+msgid ""
+"A suggested upgrade procedure is to use the isync version 0.7 to synchronize "
+"any local changes in isync-managed mailboxes with your IMAP server (if there "
+"are any local changes to synchronise), and then remove the contents of the "
+"local mailboxes, before upgrading to version 0.8 or above. Then run isync "
+"again to pull down the mail again. You must do this manually; the Debian "
+"package will not do this for you."
+msgstr ""
+
+#. Description
+#: ../templates:4
+msgid ""
+"If you want, the upgrade of isync can be aborted to let you deal with this "
+"issue. Or you can just suspend the upgrade or switch to a different virtual "
+"console to take care of it. Do not continue past this point before manually "
+"resolving this issue!"
+msgstr ""

debian/preinst

@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt "0.8"; then
+	# Do not do debconf stuff if debconf is not there.
+	# I don't want to have to pre-depend on debconf.
+	if [ -e /usr/share/debconf/confmodule ]; then
+		. /usr/share/debconf/confmodule
+		db_get isync/upgrade_0.8
+		if [ "$RET" = true ]; then
+			echo "Aborting isync upgrade at your request so you can manually resolve upgrade issue." >&2
+			exit 1
+		fi
+	else
+		echo "WARNING: Read NEWS.Debian file about manual upgrade issues from isync 0.7." >&2
+	fi
+fi
+
+#DEBHELPER#

debian/rules

@@ -1,10 +1,17 @@
 #!/usr/bin/make -f
 
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O2
+endif
+
 build: build-stamp
 build-stamp:
 	dh_testdir
 	./configure --prefix=/usr --mandir=/usr/share/man
-	$(MAKE)
+	$(MAKE) CFLAGS="$(CFLAGS)"
 	touch build-stamp
 
 clean:
@@ -30,6 +37,7 @@ binary-arch: build install
 	dh_installdocs AUTHORS NEWS README TODO
 	dh_installexamples isyncrc.sample
 	dh_installman
+	dh_installdebconf
 	dh_strip
 	dh_compress
 	dh_fixperms

debian/templates

@@ -0,0 +1,21 @@
+Template: isync/upgrade_0.8
+Type: boolean
+Default: false
+_Description: Abort isync upgrade
+ You are upgrading from an older version of isync that stored the UID of
+ each message in a way that is not compatable with the new version. You
+ need to remove all the messages in local folders downloaded with the old
+ version of isync. Otherwise isync will get confused and upload duplicate
+ messages to the IMAP server.
+ .
+ A suggested upgrade procedure is to use the isync version 0.7 to
+ synchronize any local changes in isync-managed mailboxes with your IMAP
+ server (if there are any local changes to synchronise), and then remove
+ the contents of the local mailboxes, before upgrading to version 0.8 or
+ above. Then run isync again to pull down the mail again. You must do this
+ manually; the Debian package will not do this for you.
+ .
+ If you want, the upgrade of isync can be aborted to let you deal with this
+ issue. Or you can just suspend the upgrade or switch to a different
+ virtual console to take care of it. Do not continue past this point before
+ manually resolving this issue!

debian/watch

@@ -0,0 +1,2 @@
+version=2
+http://sourceforge.net/project/showfiles.php?group_id=69662 .*/isync-(.*).tar.gz.*