multisync0.90 (0.92.0~svn355-2) debian-dir only changes

--- multisync0.90-0.92.0~svn355.orig/debian/multisync-tools.docs
+++ multisync0.90-0.92.0~svn355/debian/multisync-tools.docs
@@ -0,0 +1 @@
+build-tree/msynctool-*[0-9]/README
--- multisync0.90-0.92.0~svn355.orig/debian/control
+++ multisync0.90-0.92.0~svn355/debian/control
@@ -0,0 +1,30 @@
+Source: multisync0.90
+Section: utils
+Priority: optional
+Maintainer: Michael Banck <mbanck@debian.org>
+Build-Depends: debhelper (>= 4.0.0), quilt, automake, autoconf, libtool, python, libopensync0-dev (>= 0.22-1), libgnomeui-dev, evolution-data-server-dev, libglade2-dev
+Standards-Version: 3.7.3
+
+Package: multisync0.90
+Architecture: any
+Section: gnome
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: PIM Synchronization Tool
+ MultiSync is a program to synchronize calendars, addressbooks and other
+ PIM databetween programs on your computer and other computers, mobile
+ devices, PDAs or cell phones. It relies on the OpenSync framework to do
+ the actual synchronisation.
+ .
+ This package contains the GTK graphical user interface.
+
+Package: multisync-tools
+Architecture: any
+Section: utils
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: PIM Synchronization Command Line Tools
+ MultiSync is a program to synchronize calendars, addressbooks and other
+ PIM databetween programs on your computer and other computers, mobile
+ devices, PDAs or cell phones. It relies on the OpenSync framework to do
+ the actual synchronisation.
+ .
+ This package contains the msynctool command-line utility.
--- multisync0.90-0.92.0~svn355.orig/debian/changelog
+++ multisync0.90-0.92.0~svn355/debian/changelog
@@ -0,0 +1,119 @@
+multisync0.90 (0.92.0~svn355-2) unstable; urgency=low
+
+  * debian/control (Build-Depends): Added libglade2-dev; Closes: #536984. 
+  * debian/control (Uploaders): Removed Robert Collins and Andrew Mitchell.
+  * debian/control (Build-Depends): Replaced automake1.9 with automake.
+  * debian/rules (configure-stamp): Run libtoolize and autoreconf.
+  * debian/rules (configure-stamp): Added --disable-rpath.
+  * debian/patches/08_disable_rpath.patch: New patch, disables RPATH in
+    Makefile.am.
+
+ -- Michael Banck <mbanck@debian.org>  Sat, 28 Nov 2009 20:22:03 +0100
+
+multisync0.90 (0.92.0~svn355-1) unstable; urgency=low
+
+  * New upstream development snapshot, from the multisync-gui-0.2X
+    branch.
+  * Acknowledge NMUs; Closes: #437679, #441720.
+  * debian/patches/02_no_rpath.patch: Removed, applied upstream.
+  * debian/patches/04_revert_0.20_version_check.patch: Updated.
+  * debian/control (Build-Depends): Updated libopensync0-dev to 0.22-1.
+  * debian/control (Uploaders): Removed Andrew Mitchell.
+  * debian/control (Standards-Version): Bumped to 3.7.3.
+  * debian/rules (configure-stamp): Run aclocal as well.
+  * debian/patches/06_force_multisync_legacy.patch: New patch, define
+    MULTISYNC_LEGACY to support buildling against opensync-0.2x.
+
+ -- Michael Banck <mbanck@debian.org>  Wed, 27 Feb 2008 15:37:26 +0100
+
+multisync0.90 (0.91.0-4.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules: fix bashism, thanks Michael Bienia (Closes: #437679).
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sun, 20 Jan 2008 13:14:09 +0100
+
+multisync0.90 (0.91.0-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Make sure .deb contains the same files when built twice (Closes: #441720)
+
+ -- Mike O'Connor <stew@vireo.org>  Tue, 13 Nov 2007 13:12:30 -0500
+
+multisync0.90 (0.91.0-4) unstable; urgency=low
+
+  * debian/patches/05_fix_desktop_file.patch: New file, fixes binary
+    location in .desktop file; Closes: #417650.
+  * debian/patches/series: Updated.
+
+ -- Michael Banck <mbanck@debian.org>  Tue,  3 Apr 2007 21:43:17 +0200
+
+multisync0.90 (0.91.0-3) unstable; urgency=low
+
+  * debian/rules (build-stamp): Pass WAF_HOME=/tmp to $(MAKE) as well.
+  * debian/rules (install-stamp): Likewise; Closes: #408431.
+
+ -- Michael Banck <mbanck@debian.org>  Sat, 27 Jan 2007 02:31:26 +0100
+
+multisync0.90 (0.91.0-2) unstable; urgency=low
+
+  * debian/rules (configure-stamp): Pass WAF_HOME=/tmp to configure's
+    environment to prevent waf from trying to create cache directories in
+    $HOME.  Fixes FTBFS on various autobuilders.
+
+ -- Michael Banck <mbanck@debian.org>  Thu, 25 Jan 2007 19:14:46 +0100
+
+multisync0.90 (0.91.0-1) unstable; urgency=low
+
+  * New upstream multisync-gui rewrite, which is now somewhat usable; 
+    Closes: #381637.
+  * debian/control (Build-Depends): Added python.
+  * debian/copyright: License is now GPLv2only.
+  * debian/rules (install-stamp): Rename multisync-gui to multisync0.90.
+  * debian/patches/04_revert_0.20_version_check.patch: New file.
+  * debian/patches/series (04_revert_0.20_version_check.patch): Added.
+
+ -- Michael Banck <mbanck@debian.org>  Mon, 22 Jan 2007 23:19:53 +0100
+
+multisync0.90 (0.90.19-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control (Build-Depends) Bump libopensync0-dev build dependency
+    to 0.19-1.
+  * debian/rules: Partly rewritten to support multiple tarballs.
+    + (tarballs-stamp): New rule.
+    + (configure-stamp): Depend on it.
+    + (configure-stamp): Do not run autoreconf anymore, run automake in
+      msynctool sub-directory.
+    + (configure-stamp): Adjusted for multiple tarballs.
+    + (patch-stamp): Likewise.
+    + (build-stamp): Likewise.
+    + (install-stamp): Likewise.
+  * debian/patches/02_no_rpath.patch: Rediffed.
+  * debian/patches/02_no_rpath.patch: Adjusted for multiple tarballs.
+  * debian/patches/03_disable_-Werror.patch: Likewise.
+  * debian/patches/series: Likewise. 
+  * debian/docs: Renamed to ...
+  * debian/multisync-tools.docs: ... here, and adjusted for multiple
+    tarballs.
+
+ -- Michael Banck <mbanck@debian.org>  Sun, 15 Oct 2006 13:54:28 +0200
+
+multisync0.90 (0.90.18+svn20060730-1) unreleased; urgency=low
+
+  * New upstream development snapshot.
+  * debian/control (Build-Depends): Added automake1.9, autoconf and libtool.
+  * debian/rules (configure-stamp): Autoreconf.
+  * debian/patches/01_silence_gcc_warning.patch: Updated from upstream 
+    ticket #104.
+  * debian/patches/02_no_rpath.patch: Remove Makefile.in hunk.
+  * debian/patches/03_disable_-Werror.patch: New file.
+  * debian/patches/series (03_disable_-Werror.patch): Added.
+
+ -- Michael Banck <mbanck@debian.org>  Sun, 30 Jul 2006 18:19:03 +0200
+
+multisync0.90 (0.90.18-1) unstable; urgency=low
+
+  * Initial Upload.
+
+ -- Michael Banck <mbanck@debian.org>  Sat, 22 Jul 2006 19:35:52 +0200
--- multisync0.90-0.92.0~svn355.orig/debian/copyright
+++ multisync0.90-0.92.0~svn355/debian/copyright
@@ -0,0 +1,26 @@
+This package was debianized by Michael Banck <mbanck@debian.org> on
+Sat, 17 Dec 2005 13:35:39 +0100.
+
+It was downloaded from http://www.opensync.org/wiki/download
+
+Copyright Holder: Armin Bauer <armin.bauer@opensync.org>
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of version 2 of the GNU General Public License as
+   published by the Free Software Foundation.
+
+   This package 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 package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02111-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- multisync0.90-0.92.0~svn355.orig/debian/compat
+++ multisync0.90-0.92.0~svn355/debian/compat
@@ -0,0 +1 @@
+4
--- multisync0.90-0.92.0~svn355.orig/debian/rules
+++ multisync0.90-0.92.0~svn355/debian/rules
@@ -0,0 +1,94 @@
+#!/usr/bin/make -f
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+export CFLAGS
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+	dh_testdir
+	cd build-tree/msynctool-*[0-9] && libtoolize -i && autoreconf -i
+	cd build-tree/msynctool-*[0-9] && CFLAGS='-O2 -Wall' ./configure --prefix=/usr
+	cd build-tree/multisync-gui-*[0-9] && WAF_HOME=/tmp ./configure --prefix=/usr --disable-rpath
+	touch configure-stamp
+
+tarballs-stamp:
+	mkdir -p build-tree
+	cd build-tree && for i in ../*.tar.gz; do tar zxvf $$i; done
+	touch tarballs-stamp
+
+patch: patch-stamp
+patch-stamp: tarballs-stamp debian/patches/series 
+	dh_testdir
+	cd build-tree && QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a
+	touch patch-stamp
+
+unpatch: 
+	dh_testdir
+	-cd build-tree && QUILT_PATCHES=$(CURDIR)/debian/patches quilt pop -a
+	rm -rf .pc/
+	rm -f patch-stamp
+
+build: configure-stamp build-stamp
+build-stamp: 
+	dh_testdir
+	cd build-tree/msynctool-*[0-9] && $(MAKE) 
+	cd build-tree/multisync-gui-*[0-9] && WAF_HOME=/tmp $(MAKE)
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f configure-stamp build-stamp patch-stamp tarballs-stamp install-stamp
+	-rm -r build-tree
+	dh_clean
+
+install: build install-stamp
+install-stamp:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cd build-tree/msynctool-*[0-9] && $(MAKE) DESTDIR=$(CURDIR)/debian/multisync-tools install
+	cd build-tree/multisync-gui-*[0-9] && WAF_HOME=/tmp $(MAKE) DESTDIR=$(CURDIR)/debian/multisync0.90 install
+	mv $(CURDIR)/debian/multisync0.90/usr/bin/multisync-gui $(CURDIR)/debian/multisync0.90/usr/bin/multisync0.90
+	touch install-stamp
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installcatalogs
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installman
+#	dh_installcron
+#	dh_installinfo
+	dh_strip
+	dh_link
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+	dh_makeshlibs 
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary-indep: build install
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- multisync0.90-0.92.0~svn355.orig/debian/patches/06_force_multisync_legacy.patch
+++ multisync0.90-0.92.0~svn355/debian/patches/06_force_multisync_legacy.patch
@@ -0,0 +1,15 @@
+--- multisync-gui-0.92.0/src/multisync.h.orig	2008-02-24 14:55:10.000000000 +0100
++++ multisync-gui-0.92.0/src/multisync.h	2008-02-24 14:55:17.000000000 +0100
+@@ -27,9 +27,9 @@
+ #define MULTISYNC_ICON "../misc/multisync.png"
+ #endif /*MULTISYNC_ICON*/
+ 
+-//#ifndef MULTISYNC_LEGACY
+-//#define MULTISYNC_LEGACY
+-//#endif /*MULTISYNC_LEGACY*/
++#ifndef MULTISYNC_LEGACY
++#define MULTISYNC_LEGACY
++#endif /*MULTISYNC_LEGACY*/
+ 
+ #ifndef MULTISYNC_LEGACY_FILTERFILE
+ #define MULTISYNC_LEGACY_FILTERFILE "filter.conf"
--- multisync0.90-0.92.0~svn355.orig/debian/patches/series
+++ multisync0.90-0.92.0~svn355/debian/patches/series
@@ -0,0 +1,4 @@
+03_disable_-Werror.patch -p0
+04_revert_0.20_version_check.patch -p0
+05_fix_desktop_file.patch -p0
+08_disable_rpath.patch -p0
--- multisync0.90-0.92.0~svn355.orig/debian/patches/08_disable_rpath.patch
+++ multisync0.90-0.92.0~svn355/debian/patches/08_disable_rpath.patch
@@ -0,0 +1,19 @@
+--- msynctool-0.22/tools/Makefile.am.orig	2009-11-28 20:20:21.206156950 +0100
++++ msynctool-0.22/tools/Makefile.am	2009-11-28 20:20:24.942158252 +0100
+@@ -7,13 +7,13 @@
+ bin_PROGRAMS = msynctool convcard convtest
+ 
+ msynctool_SOURCES = msynctool.c
+-msynctool_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++msynctool_LDFLAGS = @PACKAGE_LIBS@
+ 
+ convcard_SOURCES = convcard.c
+-convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++convcard_LDFLAGS = @PACKAGE_LIBS@
+ 
+ convtest_SOURCES = convtest.c
+-convtest_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++convtest_LDFLAGS = @PACKAGE_LIBS@
+ 
+ man_MANS = convcard.1 msynctool.1
+ 
--- multisync0.90-0.92.0~svn355.orig/debian/patches/03_disable_-Werror.patch
+++ multisync0.90-0.92.0~svn355/debian/patches/03_disable_-Werror.patch
@@ -0,0 +1,10 @@
+--- msynctool-0.22/tools/Makefile.am.orig	2006-07-30 19:09:49.000000000 +0200
++++ msynctool-0.22/tools/Makefile.am	2006-07-30 19:09:55.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
++AM_CFLAGS = -Wall -I$(top_srcdir)
+ 
+ INCLUDES = @PACKAGE_CFLAGS@
+ 
--- multisync0.90-0.92.0~svn355.orig/debian/patches/05_fix_desktop_file.patch
+++ multisync0.90-0.92.0~svn355/debian/patches/05_fix_desktop_file.patch
@@ -0,0 +1,11 @@
+--- multisync-gui-0.92.0/misc/multisync-gui.desktop.in.orig	2007-04-03 21:41:30.000000000 +0200
++++ multisync-gui-0.92.0/misc/multisync-gui.desktop.in	2007-04-03 21:41:45.000000000 +0200
+@@ -3,7 +3,7 @@
+ Name=Multisync-qad
+ Comment=Synchronization program for personal information such as calendars, addressbooks etc.
+ Comment[de]=Synchronisation von Organizern, PIMs und Mobiltelefonen
+-Exec=@PREFIX@/bin/multisync-gui
++Exec=@PREFIX@/bin/multisync0.90
+ Terminal=false
+ Type=Application
+ Icon=@MULTISYNC_ICON_DIR@/multisync.png
--- multisync0.90-0.92.0~svn355.orig/debian/patches/04_revert_0.20_version_check.patch
+++ multisync0.90-0.92.0~svn355/debian/patches/04_revert_0.20_version_check.patch
@@ -0,0 +1,17 @@
+--- multisync-gui-0.92.0/wscript.orig	2008-02-25 01:14:39.000000000 +0100
++++ multisync-gui-0.92.0/wscript	2008-02-25 01:32:46.000000000 +0100
+@@ -62,12 +62,12 @@
+ 	pkgconf = conf.create_pkgconfig_configurator()
+ 	pkgconf.uselib = 'OPENSYNC'
+ 	pkgconf.name = 'opensync-1.0'
+-	pkgconf.version = '0.19'
++	pkgconf.version = '0.22'
+ 	pkgconf.variables = "configdir plugindir formatsdir"
+ 	if not pkgconf.run():
+ 		fatal("you need opensync http://www.opensync.org/ (libopensync0-dev)")
+ 
+-	if not conf.check_pkg('osengine-1.0', vnum='0.19', destvar='OPENSYNCENGINE'):
++	if not conf.check_pkg('osengine-1.0', vnum='0.22', destvar='OPENSYNCENGINE'):
+ 		fatal("you need opensync http://www.opensync.org/ (libopensync0-dev)")
+ 
+ 	if not P.os_develop_mode :
--- multisync0.90-0.92.0~svn355.orig/debian/patches/07_backport_to_0.2x.patch
+++ multisync0.90-0.92.0~svn355/debian/patches/07_backport_to_0.2x.patch
@@ -0,0 +1,16 @@
+--- multisync-gui-0.92.0/src/multisync.h.orig	2008-02-24 15:11:42.000000000 +0100
++++ multisync-gui-0.92.0/src/multisync.h	2008-02-24 15:11:52.000000000 +0100
+@@ -9,11 +9,11 @@
+ #include <glade/glade.h>
+ #include <libxml/parser.h>
+ #include <opensync/opensync.h>
+-#include <opensync/opensync-group.h>
++/*#include <opensync/opensync-group.h>
+ #include <opensync/opensync-format.h>
+ #include <opensync/opensync-plugin.h>
+ #include <opensync/opensync-engine.h>
+-#include <opensync/opensync-data.h>
++#include <opensync/opensync-data.h>*/
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"