diff --git a/Makefile.am b/Makefile.am index 87774d4..5141f7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,18 +54,16 @@ log: git log --date=iso --log-size --name-only | \ perl -e '$(LOG_PL)' > ChangeLog ) -deb: - CFLAGS="-O2 -mcpu=i686" fakeroot debian/rules binary +deb: deb-clean + CFLAGS= fakeroot debian/rules binary deb-clean: - cd $(srcdir) && \ - dh_clean -Xsrc/ && \ - fakeroot debian/rules unpatch - -distdir distclean: deb-clean + dh_clean -Xsrc/ + fakeroot debian/rules clean dist-hook: - find $(distdir)/debian \( -name .git -o -name .gitignore -o -name .#\*# -o -type l \) -print0 | xargs -0r rm -rf + find $(distdir)/debian \( -name .#\*# -o -type l \) -print0 | xargs -0r rm -rf + -cd $(distdir)/debian && test -f .gitignore && rm -rf `cat .gitignore` .gitignore dist-sign: dist gpg -b -a $(PACKAGE)-$(VERSION).tar.gz diff --git a/debian/.cvsignore b/debian/.gitignore similarity index 71% rename from debian/.cvsignore rename to debian/.gitignore index 5eb561c..3a7be5b 100644 --- a/debian/.cvsignore +++ b/debian/.gitignore @@ -1,5 +1,5 @@ files isync +isync.debhelper.log isync.postrm.debhelper isync.substvars -patched diff --git a/debian/changelog b/debian/changelog index b3f03e2..efea80d 100644 --- a/debian/changelog +++ b/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 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 Wed, 17 Sep 2008 23:58:58 +0200 + +isync (1.0.4-1) unstable; urgency=low + + * The second "thanks Christian" release. * 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) + - 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 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 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 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 Sun, 17 Dec 2006 15:31:04 +0100 + +isync (1.0.3-2) unstable; urgency=low - -- Theodore Y. Ts'o Sun, 11 Jan 2004 02:38:48 -0500 + * 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 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 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 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 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 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) + * 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. + + -- Nicolas Boullis Tue, 13 Apr 2004 02:12:42 +0200 isync (0.9.1-4) unstable; urgency=low diff --git a/debian/control b/debian/control index 8ce4878..88862fc 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: isync Section: mail Priority: optional Maintainer: Nicolas Boullis -Uploaders: Nicolas Boullis , Theodore Y. Ts'o -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 +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 @@ -17,6 +17,11 @@ Description: Synchronize Maildir and IMAP4 mailboxes It is useful for working in disconnected mode, such as on a laptop or with a non-permanent internet collection (dIMAP). . + 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 diff --git a/debian/generate-deb b/debian/generate-deb index add959b..f9d1603 100755 --- a/debian/generate-deb +++ b/debian/generate-deb @@ -23,8 +23,8 @@ if [ "$OLDVERSION" != "$VERSION" ]; then sed -e s/+cvsXXXXXXXX/+cvs${DATE}/ < debian/changelog > debian/changelog.new mv debian/changelog.new debian/changelog fi -find . -name CVS -print0 | xargs -0r rm -rf -find . -name .cvsignore -print0 | xargs -0r rm +find . -name .git -print0 | xargs -0r rm -rf +find . -name .gitignore -print0 | xargs -0r rm find . -type l -print0 | xargs -0r rm find . -name .#\*# -print0 | xargs -0r rm aclocal diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index e69de29..0000000 diff --git a/debian/rules b/debian/rules index 20b97d9..6f16737 100755 --- a/debian/rules +++ b/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_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) 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,8 @@ install: build dh_clean -k dh_installdirs usr/bin usr/share/man/man1 $(MAKE) DESTDIR=$(CURDIR)/debian/isync install + rm -r $(CURDIR)/debian/isync/usr/share/doc + mv $(CURDIR)/debian/isync/usr/bin/get-cert $(CURDIR)/debian/isync/usr/bin/mbsync-get-cert binary-indep: build install @@ -53,6 +52,4 @@ binary-arch: build install 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 diff --git a/debian/watch b/debian/watch index fce4f54..6bb4e20 100644 --- a/debian/watch +++ b/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