opensync (0.22-4squeeze1) debian-dir only changes

--- opensync-0.22.orig/debian/libopensync0.docs
+++ opensync-0.22/debian/libopensync0.docs
@@ -0,0 +1,2 @@
+README
+TODO
--- opensync-0.22.orig/debian/libopensync0-dev.install
+++ opensync-0.22/debian/libopensync0-dev.install
@@ -0,0 +1,16 @@
+usr/lib/libopensync.a
+usr/lib/libopensync.la
+usr/lib/libopensync.so
+usr/lib/libosengine.a
+usr/lib/libosengine.la
+usr/lib/libosengine.so
+usr/lib/libopensync-xml.a
+usr/lib/libopensync-xml.la
+usr/lib/libopensync-xml.so
+usr/lib/opensync/formats/*.a
+usr/lib/opensync/formats/*.la
+usr/lib/pkgconfig/opensync-1.0.pc
+usr/lib/pkgconfig/osengine-1.0.pc
+usr/include/opensync-1.0/opensync/*.h
+usr/include/opensync-1.0/osengine/*.h
+
--- opensync-0.22.orig/debian/pycompat
+++ opensync-0.22/debian/pycompat
@@ -0,0 +1 @@
+2
--- opensync-0.22.orig/debian/control
+++ opensync-0.22/debian/control
@@ -0,0 +1,54 @@
+Source: opensync
+Section: libs
+Priority: optional
+Maintainer: Michael Banck <mbanck@debian.org>
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), 
+ python-support (>= 0.3.9), libglib2.0-dev, libsqlite3-dev, libxml2-dev, check,
+ swig, automake1.9, autoconf (>= 2.60), libtool
+Standards-Version: 3.7.3
+
+Package: libopensync0
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Synchronisation framework for email/pdas/and more
+ A synchronisation framework for synchronising data in various format. You
+ can use libopensync from programs. See multisync for an existing X11 gui
+ program that uses opensync.
+
+Package: opensyncutils
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Command line utilities for libopensync
+ Libopensync provides a number of command line debugging and utility programs.
+ Install this package for the osyncdump, osyncstress, osyncplugin, osynctest,
+ osyncbinary programs.
+
+Package: libopensync0-dev
+Section: libdevel
+Provides: libopensync-dev
+Conflicts: libopensync-dev
+Architecture: any
+Depends: libopensync0 (= ${binary:Version}), libglib2.0-dev, libsqlite3-dev, libxml2-dev
+Description: Headers and static libraries for libopensync
+ Headers and static libraries for libopensync. These are not needed to use
+ opensync, but are needed to build plugins or programs like multisync that
+ link against libopensync.
+
+Package: libopensync0-dbg
+Architecture: any
+Priority: extra
+Depends: libopensync0 (= ${binary:Version})
+Description: Debug symbols for libopensync0
+ Debug symbols for libopensync that will allow useful tracebacks and debugging
+ on end user machines.
+
+Package: python-opensync
+Section: python
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, libopensync0 (= ${binary:Version})
+Provides: ${python:Provides}
+Replaces: python2.4-opensync (<< 0.18-2.1)
+Conflicts: python2.4-opensync (<< 0.18-2.1)
+XB-Python-Version: ${python:Versions}
+Description: Python bindings to the opensync synchronisation engine
+ Python bindings to the opensync synchronisation engine.
--- opensync-0.22.orig/debian/opensyncutils.install
+++ opensync-0.22/debian/opensyncutils.install
@@ -0,0 +1,5 @@
+usr/bin/osyncdump
+usr/bin/osyncstress
+usr/bin/osyncplugin
+usr/bin/osynctest
+usr/bin/osyncbinary
--- opensync-0.22.orig/debian/changelog
+++ opensync-0.22/debian/changelog
@@ -0,0 +1,119 @@
+opensync (0.22-4squeeze1) testing-proposed-updates; urgency=low
+
+  * Upload to testing-proposed-updates (Closes: #580867).
+  * wrapper/opensync.i: Applied patch by Mark Ellis, porting opensync.i to
+    swig-1.3.40 (Closes: #562159).
+  * wrapper/Makefile.am: Do not pass $(PYTHON_LDFLAGS) when linking the python
+    extensions (Closes: #470290).
+  * formats/vformats-xml/vformat.c: Applied upstream revision 3575 fixing an
+    infinite loop in vformat.
+
+ -- Michael Banck <mbanck@debian.org>  Mon, 04 Oct 2010 19:35:19 +0200
+
+opensync (0.22-4) unstable; urgency=low
+
+  * debian/control (Maintainer): Really remove Robert Collins now. 
+
+ -- Michael Banck <mbanck@debian.org>  Sat, 05 Dec 2009 18:55:29 +0100
+
+opensync (0.22-3) unstable; urgency=low
+
+  * opensync/opensnyc_debug.c: Set privacy for traces by default. 
+  * debian/control (Maintainer): Removed Robert Collins (Closes: #544166).
+  * debian/rules: Applied patch by Kumar Appaiah.
+    + (debian/configure-python%-stamp): Set python version explicitely
+      (Closes: #557391)
+    + (CROSS): New variable, better handle cross-building.
+  * tests/Makefile.am, wrapper/Makefile.am, osplugin/Makefile.am,
+    tools/Makefile.am, osengine/Makefile.am: Removed RPATH argument to
+    LDFLAGS.
+  * debian/rules (configure): Made PHONY.
+  * debian/rules (build): Depend on configure.
+
+ -- Michael Banck <mbanck@debian.org>  Sat, 05 Dec 2009 17:38:54 +0100
+
+opensync (0.22-2) unstable; urgency=low
+
+  * debian/libopensync0-dev.install: Do not install python stuff.
+  * debian/control (Standards-Version): Bump to 3.7.3.
+  * debian/control: Replaced ${Source:Version} with ${binary:Version}.
+
+ -- Michael Banck <mbanck@debian.org>  Sun, 02 Mar 2008 12:39:41 +0100
+
+opensync (0.22-1) unstable; urgency=low
+
+  * New upstream release (Closes: #404856, #442827)
+  * debian/control (Uploaders): Added myself.
+  * debian/rules (debian/build-stamp): Added --enable-tracing.
+  * opensync/opensync_user.c: Change user config dir to ~/.opensync-0.22.
+  * debian/rules (debian/configure-stamp): New target.
+  * debian/rules (debian/build-stamp): Move configuring to it.
+  * debian/copyright: Added download location and clarified copyright and
+    licensing (Closes: #439876, #455827).
+  * debian/pyversions: Set 2.4 as minimum version (Closes: #445394).
+  * debian/rules: Ported generic python handling from experimental branch.
+  * debian/python-opensync: Wildcard python directory.
+  * acinclude.m4: Add python2.5 to list of python interpreters.
+  * Reran aclocal and autoconf.
+  * debian/control (libopensync0-dbg): Set Priority to extra.
+  * debian/control (python-opensync): Set Section to python.
+  * debian/rules (binary-arch): Tighten shlibs to dh_makeshlibs -V.
+
+ -- Michael Banck <mbanck@debian.org>  Fri, 29 Feb 2008 00:45:57 +0100
+
+opensync (0.19-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use CURDIR instead of PWD to fix FTBFS with sudo (Closes: #396818).
+  * Install osplugin binary in usr/lib (Closes: #396006).
+
+ -- Luk Claes <luk@debian.org>  Sun,  5 Nov 2006 18:32:05 +0100
+
+opensync (0.19-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * FTBFS: /opensync-0.19/tests/check_ipc.c:2062: warning: passing
+    argument 3 of 'create_case' from incompatible pointer type 
+    (Closes: #393720)
+
+ -- Neil Williams <codehelp@debian.org>  Sun, 22 Oct 2006 00:37:28 +0100
+
+opensync (0.19-1) unstable; urgency=low
+
+  * New upstream release (Closes: #392162).
+  * Remove autoreconf dependency on the debian/rules timestamp, developers can
+    still run 'debian/rules configure' to recreate configure, but buildds should
+    no longer randomly autoreconf (Closes: #387576).
+  * Move libopensync0-dev to section libdevel (Closes: #367705).
+  * Update python bindings short description (Closes: #377564).
+
+ -- Robert Collins <robertc@robertcollins.net>  Mon, 16 Oct 2006 08:38:33 +1000
+
+opensync (0.18-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rebuild opensync against python-support 0.3.9 that will fix the stupid
+    versionned soname for a python module (this *is* an upstream bug).
+    (Closes: #378049).
+
+ -- Pierre Habouzit <madcoder@debian.org>  Mon,  7 Aug 2006 09:56:08 +0200
+
+opensync (0.18-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Uppdate package to the last python policy (Closes: #373470).
+
+ -- Pierre Habouzit <madcoder@debian.org>  Sun,  2 Jul 2006 00:39:36 +0200
+
+opensync (0.18-2) unstable; urgency=low
+
+  * Build-depend on libtool.
+  * Loosen the debhelper build-dep to allow building on sarge and breezy.
+
+ -- Robert Collins <robertc@robertcollins.net>  Sun, 18 Dec 2005 00:59:13 +1100
+
+opensync (0.18-1) unstable; urgency=low
+
+  * Initial upload. closes: #342179
+
+ -- Robert Collins <robertc@robertcollins.net>  Sun, 11 Dec 2005 20:52:35 +1100
--- opensync-0.22.orig/debian/libopensync0.install
+++ opensync-0.22/debian/libopensync0.install
@@ -0,0 +1,5 @@
+usr/lib/libopensync*.so.*
+usr/lib/libosengine*.so.*
+usr/lib/libopensync-xml*.so.*
+usr/lib/opensync/formats/*.so
+usr/lib/opensync/osplugin
--- opensync-0.22.orig/debian/copyright
+++ opensync-0.22/debian/copyright
@@ -0,0 +1,33 @@
+This package was debianized by Robert Collins <robertc@debian.org> on
+Sun, 11 Dec 2005 20:52:35 +1100
+
+It was downloaded from http://www.opensync.org/download/releases/
+
+Upstream Author: Armin Bauer <armin.bauer@desscon.com>
+
+Copyright:
+		Copyright (C) 2004-2005  Armin Bauer <armin.bauer@opensync.org>
+		Copyright (C) 2006 Daniel Gollub <dgollub@suse.de>
+
+License:
+
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+The vformats-xml module is published under the GPL-2, which can be found in
+/usr/share/common-licenses/GPL-2.
+
--- opensync-0.22.orig/debian/compat
+++ opensync-0.22/debian/compat
@@ -0,0 +1 @@
+5
--- opensync-0.22.orig/debian/pyversions
+++ opensync-0.22/debian/pyversions
@@ -0,0 +1 @@
+2.4-
--- opensync-0.22.orig/debian/python-opensync.install
+++ opensync-0.22/debian/python-opensync.install
@@ -0,0 +1 @@
+usr/lib/python*
--- opensync-0.22.orig/debian/README.Debian
+++ opensync-0.22/debian/README.Debian
@@ -0,0 +1,9 @@
+Debian packages of opensync
+---------------------------
+
+There are 3 primary packages at this point:
+libopensync0, libopensync0-dev and libopensync0-dbg, which respectively
+provide the library, static and headers for the library, and debug symbols for
+the shared library.
+
+- Robert Collins.
--- opensync-0.22.orig/debian/rules
+++ opensync-0.22/debian/rules
@@ -0,0 +1,142 @@
+#!/usr/bin/make -f
+# Based on the multi2 sample debian/rules file:
+# ---
+# Sample debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess.
+#
+# This version is for a multibinary package. It also allows you to build any
+# of the binary packages independantly, via binary-<package> targets.
+# ---
+
+# Uncomment this to turn on verbose mode. 
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+CFLAGS = -Werror -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+export CFLAGS
+
+SRC	:= $(CURDIR)
+BUILD	:= $(CURDIR)/build
+TARGET	:= $(CURDIR)/debian/tmp
+
+PYVERS  := $(shell pyversions -vs)
+
+configure: debian/rules
+	dh_testdir
+	autoreconf -i
+
+debian/configure-stamp: $(PYVERS:%=debian/configure-python%-stamp)
+	touch $@
+
+debian/configure-python%-stamp:
+	dh_testdir
+	chmod u+x configure
+	chmod u+x py-compile
+	[ -d $(BUILD)-python$* ] || mkdir $(BUILD)-python$*
+	cd $(BUILD)-python$* && PYTHON=/usr/bin/python$* CFLAGS="$(CFLAGS)" $(SRC)/configure $(CROSS) \
+	   --prefix=/usr \
+	   --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+	   --enable-static --enable-python=$* --libexecdir=\$${prefix}/lib/opensync \
+	   --enable-tracing
+	touch $@
+
+build: configure debian/build-stamp
+
+debian/build-stamp: debian/configure-stamp $(PYVERS:%=debian/build-python%-stamp)
+	touch $@
+
+debian/build-python%-stamp: 
+	dh_testdir
+	$(MAKE) -C $(BUILD)-python$*
+	# FIXME invoke this once upstream decide on the right fix.
+	#$(MAKE) -C $(BUILD)-python$* check
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f debian/configure*stamp debian/build*stamp
+	rm -rf build-*
+	dh_clean
+
+install: DH_OPTIONS=
+install: debian/build-stamp install-common $(PYVERS:%=install-python%)
+install-common: 
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+install-python%:
+	$(MAKE) -C $(BUILD)-python$* install DESTDIR=$(TARGET)
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+	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_install --sourcedir=$(TARGET) --fail-missing
+	dh_strip --dbg-package=libopensync0-dbg
+	dh_link
+	dh_compress
+	dh_fixperms
+#	dh_perl
+	dh_pysupport
+	dh_python
+	dh_makeshlibs -Xformats -V 
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build install
+# (Uncomment this next line if you have such packages.)
+#	 $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build install
+	$(MAKE) -f $(SRC)/debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+	make -f $(SRC)/debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build configure clean binary-indep binary-arch binary-common binary install install-common