--- d-push-2.0.orig/debian/watch
+++ d-push-2.0/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+http://zarafa-deutschland.de/z-push-download/final/2.0/z-push-(\d+)\.(\d+)-\d+\.tar\.gz
--- d-push-2.0.orig/debian/d-push.links
+++ d-push-2.0/debian/d-push.links
@@ -0,0 +1,3 @@
+var/lib/d-push/state/ usr/share/d-push/state 
+etc/d-push/config.php usr/share/d-push/config.php
+etc/d-push/backend/searchldap/config.php usr/share/d-push/backend/searchldap/config.php
--- d-push-2.0.orig/debian/compat
+++ d-push-2.0/debian/compat
@@ -0,0 +1 @@
+7
--- d-push-2.0.orig/debian/d-push.postinst
+++ d-push-2.0/debian/d-push.postinst
@@ -0,0 +1,99 @@
+#!/bin/sh
+# postinst script for d-push
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+lighttpd_install() {
+    if [ ! -f /etc/lighttpd/conf-available/50-d-push.conf ] ; then
+	if [ ! -x /usr/sbin/lighty-enable-mod ] ; then
+	    echo "Lighttpd not installed, skipping"
+	else
+	    ln -s ../../d-push/lighttpd.conf /etc/lighttpd/conf-available/50-d-push.conf
+	    # We also need auth to protect setup.php
+	    lighty-enable-mod d-push auth
+	fi
+    fi
+}
+
+apache_install() {
+    webserver=$1
+    if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/d-push.conf ]; then
+	ln -s ../../d-push/apache.conf /etc/$webserver/conf.d/d-push.conf
+    fi
+}
+
+set_perms() {
+        USER=$1
+        GROUP=$2
+        MODE=$3
+        FILE=$4
+        if ! dpkg-statoverride --list $FILE > /dev/null 2>&1; then
+                chown $USER:$GROUP $FILE
+                chmod $MODE $FILE
+        fi
+}
+
+
+case "$1" in
+    configure)
+
+    . /usr/share/debconf/confmodule
+    db_version 2.0
+
+    # Configure Apache
+    db_get d-push/reconfigure-webserver
+
+    webservers="$RET"
+
+    for webserver in $webservers; do
+	webserver=${webserver%,}
+	if [ "$webserver" = "lighttpd" ] ; then
+	    lighttpd_install
+	else
+	    apache_install $webserver
+	fi
+	# Reload webserver in any case, configuration might have changed
+	# Redirection of 3 is needed because Debconf uses it and it might
+	# be inherited by webserver. See bug #446324.
+	if [ -x /usr/sbin/invoke-rc.d ]; then
+	    invoke-rc.d $webserver reload 3>/dev/null || true
+	else
+	    /etc/init.d/$webserver reload 3>/dev/null || true
+	fi
+    done
+
+        set_perms www-data www-data 700 /var/lib/d-push/state
+        set_perms www-data www-data 700 /var/log/d-push
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- d-push-2.0.orig/debian/d-push.templates
+++ d-push-2.0/debian/d-push.templates
@@ -0,0 +1,8 @@
+
+Template: d-push/reconfigure-webserver
+Type: multiselect
+Choices: apache2, lighttpd
+_Description: Web server to reconfigure automatically:
+ Please choose the web server that should be automatically configured
+ to run d-push.
+
--- d-push-2.0.orig/debian/README.source
+++ d-push-2.0/debian/README.source
@@ -0,0 +1,2 @@
+The d-push package uses quilt for the handling of patches. For more
+informatione please see /usr/share/doc/quilt/README.source
--- d-push-2.0.orig/debian/README.Debian
+++ d-push-2.0/debian/README.Debian
@@ -0,0 +1,120 @@
+Installing and Configuring D-Push
+======================
+
+After installing d-push, you must configure your webserver to redirect the URL
+'Microsoft-Server-ActiveSync' to the index.php file in the d-push directory.
+
+If you like the postinst script automatically configures apache or
+lighttp for you via debconf. You can rerun this configuration by issuing
+"dpkg-reconfigure d-push" as root on the command line.
+
+If you still want to do things by hand, the redirect can be achieved by adding
+the line
+
+    Alias /Microsoft-Server-ActiveSync /usr/share/d-push/index.php
+
+to your Apache httpd.conf file. Make sure that you are adding the line to the
+correct part of your Apache configuration, taking care of virtual hosts and
+other Apache configurations.
+
+Another possibility is to add this line to a d-push.conf file inside the directory
+which contents are automatically processed during the webserver start (by
+default it is conf.d inside the /etc/apache2 or /etc/httpd depending on your
+distribution).
+
+You have to reload your webserver after making these configurations.
+
+*WARNING* You CANNOT simply rename the d-push directory to
+Microsoft-Server-ActiveSync. This will cause Apache to send redirects to the
+mobile device, which will definitely break your mobile device synchronisation.
+
+Lastly, make sure that PHP has the following settings:
+
+    php_flag magic_quotes_gpc off
+    php_flag register_globals off
+    php_flag magic_quotes_runtime off
+    php_flag short_open_tag on
+
+You can set this in the httpd.conf, in php.ini or in an .htaccess file in
+the root of d-push. If you don't set this up correctly, you will not be
+able to login correctly via d-push.
+
+D-Push writes files to your file system like logs or data from the
+FileStateMachine (which is default). In order to make this possible,
+you either need to disable the php-safe-mode in php.ini or .htaccess with
+    php_admin_flag safe_mode off
+or configure it accordingly, so D-Push is allowed to write to the 
+log and state directories. 
+
+After doing this, you should be able to synchronize with your mobile device.
+
+
+Upgrading from D-Push 1.X versions
+------------------------------------
+
+The easiest way to upgrade is to follow the steps for a new installation. The states
+of D-Push 1.X are not compatible and there is no upgrade path, but as this version 
+implements a fully automatic resynchronisation of devices it should not affect the
+users and work without the user interaction.
+
+
+Update to newer D-Push versions
+-------------------------------
+
+Upgrading to a newer D-Push version follows the same path as the initial 
+installation.
+
+Please observe the published release notes of the new D-Push version.
+For some releases it is necessary to e.g. resynchronize the mobile.
+
+
+Setting up your mobile device
+-----------------------------
+
+This is simply a case of adding an 'exchange server' to your activesync
+server list, specifying the IP address of the D-Push's apache server,
+disabling SSL, unless you have already setup SSL on your Apache server,
+setting the correct username and password (the domain is ignored, you can
+simply specify 'domain' or some other random string), and then going through
+the standard activesync settings.
+
+Once you have done this, you should be able to synchronise your mobile
+simply by clicking the 'Sync' button in ActiveSync on your mobile.
+
+*NOTE* using the synchronisation without SSL is not recommended because
+your private data is transmitted in clear text over the net. Configuring
+SSL on Apache is beyond of the scope of this document. Please refer to
+Apache documention available at http://httpd.apache.org/docs/
+
+
+Troubleshooting
+---------------
+
+Most problems will be caused by incorrect Apache settings. To test whether
+your Apache setup is working correctly, you can simply type the D-Push URL
+in your browser, to see if apache is correctly redirecting your request to
+d-push. You can simply use:
+
+    http://<serverip>/Microsoft-Server-ActiveSync
+
+If correctly configured, you should see a username/password request and
+when you specify a valid username and password, you should see a D-Push
+information page, saying that this kind of requests is not supported.
+Without authentication credentials D-Push displays general information.
+
+If not then check your PHP and Apache settings and Apache error logs.
+
+If you have other synchronisation problems, you can increase the LOGLEVEL
+parameter in the config e.g. to LOGLEVEL_DEBUG or LOGLEVEL_WBXML.
+
+The d-push.log file will then collect detailed debug information from your
+synchronisation.
+
+*NOTE* This setting will set D-Push to log the detailed information for
+*every* user on the system. You can set a different log level for particular
+users by adding them comma separated to $specialLogUsers in the config.php
+ e.g. $specialLogUsers = array("user1", "user2", "user3");
+ 
+ *NOTE* Be aware that if you are using LOGLEVEL_DEBUG and LOGLEVEL_WBXML
+ D-Push will be quite talkative, so it is advisable to use log-rotate
+ on the log file.
--- d-push-2.0.orig/debian/NEWS.Debian
+++ d-push-2.0/debian/NEWS.Debian
@@ -0,0 +1,17 @@
+d-push (2.0-1) unstable; urgency=low
+
+    Upgrading from d-push 1.X versions
+
+    The easiest way to upgrade is to follow the steps for a new installation.
+    The states of d-push 1.X are not compatible and there is no upgrade path,
+    but as this version implements a fully automatic resynchronisation of
+    devices it should not affect the users and work without the user
+    interaction.
+
+    Since all devices will start a full resyncronisation after the upgrade it
+    is recommended to do the upgrade during a period with low traffic.
+
+    This version offers improved logging facilities, so please review your
+    configuration with respect to this.
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Thu, 28 Jun 2012 21:34:55 +0200
--- d-push-2.0.orig/debian/copyright
+++ d-push-2.0/debian/copyright
@@ -0,0 +1,751 @@
+This work was packaged for Debian by:
+
+    Wolfram Quester <wolfi@sigxcpu.org> on Fri, 09 Apr 2010 20:16:37 +0200
+
+It was downloaded from:
+
+    http://z-push.sourceforge.net/soswp/index.php?pages_id=39&t=Download
+
+Upstream Authors:
+
+    Zarafa Deutschland GmbH
+    http://www.zarafaserver.de/
+
+Copyright:
+
+    Copyright (C) Zarafa Deutschland GmbH
+    http://www.zarafaserver.de/
+
+License:
+Z-push is subject to the GNU AFFERO GENERAL PUBLIC LICENSE Version 3, cited
+below.
+Some files are taken from different software and thus other licenses apply, namely:
+backend/kolab/kolab.php: GPLv2, (C) 2009-2010 Free Software Foundation Europe e.V.
+On debian systems, this license can be found in /usr/share/common-licenses/GPL-2.
+
+include/mimeDecode.php: BSD, (C) Richard Heyes and PEAR <pear-group@php.net>
+include/z_RFC822.php: BSD, (C) Richard Heyes
+
+The BSD license reads as follows:
+
+Copyright (c) The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+
+Z-push itself has the following trademark statement added to its source files:
+
+* According to sec. 7 of the GNU Affero General Public License, version 3,
+* the terms of the AGPL are supplemented with the following terms:
+*
+* "Zarafa" is a registered trademark of Zarafa B.V.
+* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH
+* The licensing of the Program under the AGPL does not imply a trademark license.
+* Therefore any rights, title and interest in our trademarks remain entirely with us.
+*
+* However, if you propagate an unmodified version of the Program you are
+* allowed to use the term "Z-Push" to indicate that you distribute the Program.
+* Furthermore you may use our trademarks where it is necessary to indicate
+* the intended purpose of a product or service provided you use it in accordance
+* with honest practices in industrial or commercial matters.
+* If you want to propagate modified versions of the Program under the name "Z-Push",
+* you may only do so if you have a written permission by Zarafa Deutschland GmbH
+* (to acquire a permission please contact Zarafa at trademark@zarafa.com).
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Wolfram Quester <wolfi@sigxcpu.org>
+
+you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+
+GNU AFFERO GENERAL PUBLIC LICENSE Version 3:
+
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
+
--- d-push-2.0.orig/debian/d-push.postrm
+++ d-push-2.0/debian/d-push.postrm
@@ -0,0 +1,60 @@
+#!/bin/sh
+# postrm script for d-push
+
+set -e
+
+lighttpd_remove() {
+    if [ -f /etc/lighttpd/conf-available/50-d-push.conf ] ; then
+	rm -f /etc/lighttpd/conf-available/50-d-push.conf
+	if [ ! -x /usr/sbin/lighty-disable-mod ] ; then
+	    echo "Lighttpd not installed, skipping"
+	else
+	    lighty-disable-mod d-push
+	    # We also enabled auth in postinst, but I think it's safer to keep it there
+	fi
+	# See bug #448682
+	if [ -h /etc/lighttpd/conf-enabled/50-d-push.conf ] ; then
+	    echo 'Manually deleting lighttpd/phpMyAdmin configuration link'
+	    rm /etc/lighttpd/conf-enabled/50-d-push.conf
+	fi
+    fi
+}
+
+apache_remove() {
+    if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/d-push.conf ]; then
+	rm -f /etc/$webserver/conf.d/d-push.conf
+    fi
+}
+
+
+if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
+    if [ -f /usr/share/debconf/confmodule ]; then
+	. /usr/share/debconf/confmodule
+	db_version 2.0
+
+	db_get d-push/reconfigure-webserver
+
+	webservers="$RET"
+
+	for webserver in $webservers; do
+	    webserver=${webserver%,}
+	    if [ "$webserver" = "lighttpd" ] ; then
+		lighttpd_remove
+	    else
+		apache_remove $webserver
+	    fi
+	    # Redirection of 3 is needed because Debconf uses it and it might
+	    # be inherited by webserver. See bug #446324.
+	    if [ -x /usr/sbin/invoke-rc.d ]; then
+		invoke-rc.d $webserver reload 3>/dev/null || true
+	    else
+		/etc/init.d/$webserver reload 3>/dev/null || true
+	    fi
+	done
+    fi
+fi
+
+
+#DEBHELPER#
+
+exit 0
--- d-push-2.0.orig/debian/changelog
+++ d-push-2.0/debian/changelog
@@ -0,0 +1,211 @@
+d-push (2.0-1.1.8.201403190140) ucs4-0-0-0; urgency=low
+
+  * UCS auto build. No patches were applied to the original source package
+
+ -- Univention builddaemon <buildd@univention.de>  Wed, 19 Mar 2014 01:40:18 +0100
+
+d-push (2.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "Error when using https://myserver/Microsoft-Server-ActiveSync":
+    add missing trailing slash to STATE_DIR in
+    0005-set-proper-default-config.patch.
+    Thanks to nb for the bug report and the pointer to the solution.
+    (Closes: #685542)
+
+ -- gregor herrmann <gregoa@debian.org>  Thu, 06 Sep 2012 17:38:49 +0200
+
+d-push (2.0-1) unstable; urgency=low
+
+  * [817397a] Imported Upstream version 2.0
+  * [7e2fdca] Adapt patches to new upstream version
+  * [0b859bf] Adapt install file to new upstream version
+  * [a4fc529] Update README.Debian, introduce NEWS file
+  * [1b797bc] Raise standards version; no changes needed
+  * [9ce7720] create and ship some new directories
+  * [ee25092] adapt and enhance default config
+  * upload sponsored by Guido Günther <agx@debian.org>, many thanks to him
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Fri, 29 Jun 2012 13:59:02 +0200
+
+d-push (1.5.10-1) unstable; urgency=low
+
+  * [1dc1638] New download location
+  * [c52f63f] Imported Upstream version 1.5.10 (closes: #675269)
+  * [2ad07a3] Adapt patches to new upstream version
+  * [afe418d] actually use Vcs-* fields in control
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Tue, 19 Jun 2012 07:08:00 +0200
+
+d-push (1.5.8-3) unstable; urgency=low
+
+  * [b94739e] set d-push version automagically
+  * upload sponsored by Guido Günther <agx@debian.org>, many thanks to him
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Sun, 25 Mar 2012 13:56:18 +0200
+
+d-push (1.5.8-2) unstable; urgency=low
+
+  * [4f45a24] Add Brazilian Portuguese debconf templates translation
+    (closes: #661930)
+  * [5c3393e] Add Italian translation debconf messages (closes: #661236)
+  * [c7bf5c2] Add Slovak po-debconf translation (closes: #661142)
+  * [f0c8653] Add Polish debconf translation (closes: #660529)
+  * [6ae57cb] Imported Upstream version 1.5.8
+  * [6ef38b9] php5.4 introduced an own hex2bin function.
+    Use this if it exists, if it doesn't use the old implementation by z-push
+  * [f872e7b] rebase patches to new upstream version
+  * [d30a302] Saner sample config
+  * upload sponsored by Guido Günther <agx@debian.org>, many thanks to him
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Sat, 24 Mar 2012 15:03:11 +0100
+
+d-push (1.5.7-1) unstable; urgency=low
+
+  * [394a573] Imported Upstream version 1.5.7 (Closes: #656520)
+  * [297b0a8] add watch file (Closes: #656524)
+  * [709810b] Add dutch debconf translation (Closes: #654200)
+  * [ecddd4e] Add danish debconf translation (Closes: #658531)
+  * [4faf517] Add czech debconf translation (Closes: #660364)
+  * Upload sponsored by Christian PERRIER, many thanks to him
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Sat, 18 Feb 2012 21:32:42 +0100
+
+d-push (1.5.5-1) unstable; urgency=low
+
+  * [c733807] Imported Upstream version 1.5.5
+  * [5830366] Adapt patches to new upstream version
+  * [e0e4402] Add portuguese debconf translation (Closes: #651675)
+  * [746749f] Add swedish debconf translation (Closes: #640060)
+  * [3d588ce] Add spanish debconf translation (Closes: #640312)
+  * [6c6c922] Add german debconf translation (Closes: #653017)
+  * [af381fa] Raise standards version to 3.9.2, following changes needed:
+  * [1966bc2] include BSD license in copyright file as indicated by lintian
+  * [8f9b446] Add README.source as indicated by lintian
+  * Upload sponsored by Christian PERRIER, many thanks to him
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Tue, 27 Dec 2011 22:56:11 +0100
+
+d-push (1.5.4-1) unstable; urgency=low
+
+  * [8baa360] Imported Upstream version 1.5.4
+  * [8ab20f6] depend on php5-cli to fix lintian's
+              php-script-but-no-phpX-cli-dep
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Fri, 26 Aug 2011 19:44:08 +0200
+
+d-push (1.5.3-2) unstable; urgency=low
+
+  [ Wolfram Quester ]
+
+  * [b7c2235] fix lintian's command-with-path-in-maintainer-script
+  * [da416c8] fix lintian's debhelper-overrides-need-versioned-build-depends
+  * [c659416] fix lintian's description-synopsis-starts-with-article
+  * [e717d55] fix lintian's helper-templates-in-copyright
+  * [a2b0f6b] Add french debconf translation (Closes: #634093)
+  * [d27ae02] Add russian debconf translation (Closes: 635148)
+  * upload sponsored by Guido Günther <agx@debian.org>, many thanks to him
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Fri, 26 Aug 2011 18:28:55 +0200
+
+d-push (1.5.3-1) unstable; urgency=low
+
+  * [3fe7e81] Imported Upstream version 1.5.3 (Closes: #631115)
+  * [f95f309] update patches to new d-push-version 1.5.3
+  * [33ec05b] Drop webservers not contained in Squeeze or Wheezy (Closes: #631380)
+  * [fe4cc52] Use po-debconf (Closes: #631379)
+              Patch by Guido Günther, many thanks to him!
+  * [75752c8] Recommend to use SSL in README.Debian (Closes: #631378)
+  * upload sponsored by Guido Günther <agx@debian.org>, many thanks to him
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Thu, 30 Jun 2011 22:39:52 +0200
+
+d-push (1.5.2-1) unstable; urgency=low
+
+  * New Upstream version 1.5.2
+  * upload sponsored by Torsten Werner <twerner@debian.org>, many thanks to him
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Sat, 23 Apr 2011 16:18:31 +0200
+
+d-push (1.5.1-4) unstable; urgency=low
+
+  * Since I'm confident this version of the package passes NEW, it's not too
+    late to close the RFP (closes: 533082)
+  * [ad9f0a3] add copyright holders, correct licenses, thanks to Torsten Werner
+  * upload sponsored by Torsten Werner <twerner@debian.org>, many thanks to him
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Thu, 21 Apr 2011 07:02:02 +0200
+
+d-push (1.5.1-3) unstable; urgency=low
+
+  * [a42e561] correct license info for some files. Thanks to Alexander Reichle-Schmehl for spotting this
+  * upload sponsored by Torsten Werner <twerner@debian.org>, many thanks to him
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Wed, 20 Apr 2011 06:47:13 +0200
+
+d-push (1.5.1-2) unstable; urgency=low
+
+  * first upload to debian unstable
+  * upload sponsored by Torsten Werner <twerner@debian.org>, many thanks to him
+  * [f120357] update copyright information
+  * [cb1fea1] remove unneeded README.source
+  * [d5bc564] Rebranding: rename z-push* to d-push* and replace occurrences in
+    installation files
+  * [8ae5e00] update installation notes
+  * [8f90986] add patches for rebranding, version and config
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Sun, 17 Apr 2011 16:17:57 +0200
+
+z-push (1.5.1-1) unstable; urgency=low
+
+  * [3fbfaa5] lower dependencies on quilt to ease backports
+  * [8e9c1d0] recommend web-server and modules
+  * [e6dbeb4] add patch to autoconfigure the web server by Philipp Büttgenbach <Philipp.Buettgenbach@gmx.de>
+  * [97b2eb2] Imported Upstream version 1.5.1
+  * [b917b5b] remove patches applied upstream
+  * [e417ae6] add link to config for new backend searchldap
+  * [71d2ac8] allow installation of files under debian/
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Sun, 03 Apr 2011 10:21:28 +0200
+
+z-push (1.4-1) unstable; urgency=low
+
+  * [a423f55] Imported Upstream version 1.4
+  * [b264500] added versioned build-depends on quilt and empty series
+    file to make lintian happy, depend on libapache2-mod-php5
+  * [7eb1667] New patch 0001-apply-patch-for-correct-envelope-from-and-
+    CC-handlin.patch
+  * [628ec5f] New patch 0002-convert-line-endings-in-mails-
+    correctly.patch
+  * [aaa43aa] Remove old patch
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Wed, 11 Aug 2010 16:52:48 +0200
+
+z-push (1.3~RC3-3) unstable; urgency=low
+
+  * depend on php5-imap
+  * depend on php-mail
+  * disable envelope-from patch, since it messes up CC:
+  * rename README to install it automatically
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Thu, 27 May 2010 11:08:21 +0200
+
+z-push (1.3~RC3-2) unstable; urgency=low
+
+  * New patch 0001-use-correct-envelope-from-not-the-user-running-
+    apach.patch
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Sun, 11 Apr 2010 16:15:38 +0200
+
+z-push (1.3~RC3-1) unstable; urgency=low
+
+  * Initial release (Closes: #533082)
+  * Fix permissions to make lintian happy
+  * Install LICENSE as documentation
+  * depend on php5, php-pear
+  * add README.Debian derived from INSTALL
+  * install files into proper directories, including configs
+  * proper excludes to allow installation of statemachine.php
+  * Imported Upstream version 1.3RC3
+
+ -- Wolfram Quester <wolfi@sigxcpu.org>  Sun, 11 Apr 2010 11:00:20 +0200
--- d-push-2.0.orig/debian/d-push.install
+++ d-push-2.0/debian/d-push.install
@@ -0,0 +1,11 @@
+backend/searchldap/config.php /etc/d-push/backend/searchldap/
+config.php         /etc/d-push/
+backend            /usr/share/d-push/
+lib                /usr/share/d-push/
+include            /usr/share/d-push/
+index.php          /usr/share/d-push/
+version.php        /usr/share/d-push/
+z-push-admin.php   /usr/share/d-push/
+z-push-top.php     /usr/share/d-push/
+
+debian/conf/*   etc/d-push/
--- d-push-2.0.orig/debian/d-push.config
+++ d-push-2.0/debian/d-push.config
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+db_input high d-push/reconfigure-webserver || true
+
+db_go || true
+
--- d-push-2.0.orig/debian/control
+++ d-push-2.0/debian/control
@@ -0,0 +1,20 @@
+Source: d-push
+Section: web
+Priority: extra
+Maintainer: Wolfram Quester <wolfi@sigxcpu.org>
+Build-Depends: debhelper (>= 7.0.50~), quilt, po-debconf
+Standards-Version: 3.9.3
+Homepage: http://z-push.sourceforge.net/soswp
+Vcs-Git: git://git.debian.org/git/pkg-giraffe/d-push.git
+Vcs-Browser: http://git.debian.org/?p=git/pkg-giraffe/d-push.git;a=summary
+
+Package: d-push
+Architecture: all
+Depends: ${misc:Depends}, php5, php5-cli, php-pear, php5-imap, php-mail
+Recommends: apache2 | lighttpd | httpd-cgi, libapache2-mod-php5
+Description: open source implementation of the ActiveSync protocol
+ D-push is debian's rebranded version of zarafa's z-push.
+ It is an implementation of the ActiveSync protocol which is used
+ 'over-the-air' for multi platform ActiveSync devices, including Windows
+ Mobile, iPhone, Sony Ericsson and Nokia mobile devices. With D-push any
+ groupware can be connected and synced with these devices.
--- d-push-2.0.orig/debian/d-push.dirs
+++ d-push-2.0/debian/d-push.dirs
@@ -0,0 +1,3 @@
+var/lib/d-push/state
+var/log/d-push
+
--- d-push-2.0.orig/debian/version.php.in
+++ d-push-2.0/debian/version.php.in
@@ -0,0 +1,45 @@
+<?php
+/***********************************************
+* File      :   version.php
+* Project   :   Z-Push
+* Descr     :   version number
+*
+* Created   :   18.04.2008
+*
+* Copyright 2007 - 2011 Zarafa Deutschland GmbH
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License, version 3,
+* as published by the Free Software Foundation with the following additional
+* term according to sec. 7:
+*
+* According to sec. 7 of the GNU Affero General Public License, version 3,
+* the terms of the AGPL are supplemented with the following terms:
+*
+* "Zarafa" is a registered trademark of Zarafa B.V.
+* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH
+* The licensing of the Program under the AGPL does not imply a trademark license.
+* Therefore any rights, title and interest in our trademarks remain entirely with us.
+*
+* However, if you propagate an unmodified version of the Program you are
+* allowed to use the term "Z-Push" to indicate that you distribute the Program.
+* Furthermore you may use our trademarks where it is necessary to indicate
+* the intended purpose of a product or service provided you use it in accordance
+* with honest practices in industrial or commercial matters.
+* If you want to propagate modified versions of the Program under the name "Z-Push",
+* you may only do so if you have a written permission by Zarafa Deutschland GmbH
+* (to acquire a permission please contact Zarafa at trademark@zarafa.com).
+*
+* This program 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 Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Consult LICENSE file for details
+************************************************/
+
+define("ZPUSH_VERSION", "DPUSHVERSION");
+?>
--- d-push-2.0.orig/debian/rules
+++ d-push-2.0/debian/rules
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
+
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+
+%:
+	dh  $@
+
+override_dh_install:
+	sed -s "s/DPUSHVERSION/${DEB_VERSION}/" debian/version.php.in > version.php
+	dh_install -X LICENSE
+	mkdir -p debian/d-push/var/lib/d-push/state/
+	mkdir -p debian/d-push/var/log/d-push
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	dh_clean
+	debconf-updatepo
+
+build: patch
--- d-push-2.0.orig/debian/po/nl.po
+++ d-push-2.0/debian/po/nl.po
@@ -0,0 +1,32 @@
+# Dutch translation of d-push debconf templates.
+# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the d-push package.
+# Jeroen Schot <schot@a-eskwadraat.nl>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: d-push 1.5.5-1\n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+0200\n"
+"PO-Revision-Date: 2012-01-02 13:13+0100\n"
+"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Automatisch te configureren webserver:"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"d-push."
+msgstr ""
+"Welke webserver moet automatisch worden geconfigureerd voor d-push?"
--- d-push-2.0.orig/debian/po/de.po
+++ d-push-2.0/debian/po/de.po
@@ -0,0 +1,33 @@
+# German translation of debconf templates for d-push.
+# Copyright (C) 2010 Zarafa Deutschland GmbH.
+# This file is distributed under the same license as the d-push package.
+# Chris Leick <c.leick@vollbio.de>, 2011
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: d-push 1.5.3-1\n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+0200\n"
+"PO-Revision-Date: 2011-12-17 16:28+0100\n"
+"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Webserver, der automatisch neu konfiguriert werden soll:"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"d-push."
+msgstr ""
+"Bitte wählen Sie den Web-Server, der automatisch konfiguriert werden soll, um "
+"d-push auszuführen."
\ No newline at end of file
--- d-push-2.0.orig/debian/po/ru.po
+++ d-push-2.0/debian/po/ru.po
@@ -0,0 +1,36 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the d-push package.
+#
+# Yuri Kozlov <yuray@komyakino.ru>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: d-push 1.5.3-1\n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+0200\n"
+"PO-Revision-Date: 2011-07-23 09:23+0400\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Веб-сервер для автоматической перенастройки:"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"d-push."
+msgstr ""
+"Выберите веб-сервер, который нужно автоматически настроить для запуска "
+"d-push."
+
--- d-push-2.0.orig/debian/po/sk.po
+++ d-push-2.0/debian/po/sk.po
@@ -0,0 +1,31 @@
+# Slovak translation for d-push debconf template.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the d-push package.
+# 
+# Ivan Masár <helix84@centrum.sk>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: d-push\n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+0200\n"
+"PO-Revision-Date: 2012-02-24 13:00+0100\n"
+"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
+"Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Webový server, ktorého konfigurácia sa má automaticky upraviť:"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Please choose the web server that should be automatically configured to run d-push."
+msgstr "Prosím, vyberte webový server, ktorý sa má automaticky nakonfigurovať, aby na ňom bežal d-push."
+
--- d-push-2.0.orig/debian/po/pt.po
+++ d-push-2.0/debian/po/pt.po
@@ -0,0 +1,33 @@
+# Portuguese translation for d-push's debconf messages
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the d-push package.
+# Pedro Ribeiro <p.m42.ribeiro@gmail.com>, 2011
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: d-push 1.5.3-1\n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+0200\n"
+"PO-Revision-Date: 2011-12-08 22:16+0000\n"
+"Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"Language: Portuguese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Servidor web para reconfigurar automaticamente:"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"d-push."
+msgstr ""
+"Indique, por favor, o servidor web que deve ser automaticamente configurado "
+"para correr o d-push."
--- d-push-2.0.orig/debian/po/cs.po
+++ d-push-2.0/debian/po/cs.po
@@ -0,0 +1,33 @@
+# Czech PO debconf template translation of d-push.
+# Copyright (C) 2012 Michal Simunek <michal.simunek@gmail.com>
+# This file is distributed under the same license as the d-push package.
+# Michal Simunek <michal.simunek@gmail.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: d-push 1.5.5-1\n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+0200\n"
+"PO-Revision-Date: 2012-02-18 18:01+0100\n"
+"Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Automaticky přenastavit webový server:"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"d-push."
+msgstr ""
+"Zvolte si prosím webový server, který se má automaticky nastavit ke spuštění "
+"d-push."
--- d-push-2.0.orig/debian/po/da.po
+++ d-push-2.0/debian/po/da.po
@@ -0,0 +1,34 @@
+# Danish translation d-push.
+# Copyright (C) 2012 d-push & nedenstående oversættere.
+# This file is distributed under the same license as the d-push package.
+# Joe Hansen (joedalton2@yahoo.dk), 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: d-push\n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+0200\n"
+"PO-Revision-Date: 2012-02-03 12:42+0000\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Internetserver at rekonfigurere automatisk:"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"d-push."
+msgstr ""
+"Vælg venligst internetserveren som skal konfigureres automatisk til at køre "
+"d-push."
+
--- d-push-2.0.orig/debian/po/es.po
+++ d-push-2.0/debian/po/es.po
@@ -0,0 +1,58 @@
+# d-push po-debconf translation to Spanish
+# Copyright (C) 2011 Software in the Public Interest
+# This file is distributed under the same license as the d-push package.
+#
+# Changes:
+# - Initial translation
+# SM Baby Siabef <siabef.debian@gmail.com>, 2011
+#
+# - Updates
+#
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish/
+# especialmente las notas y normas de traducción en
+# http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: d-push 1.5.3-1\n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+0200\n"
+"PO-Revision-Date: 2011-08-16 17:18+0100\n"
+"Last-Translator: SM Baby Siabef <siabef.debian@gmail.com>\n"
+"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Servidor web a reconfigurar automáticamente:"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"d-push."
+msgstr ""
+"Seleccione el servidor web que se configurará automáticamente al ejecutar d-"
+"push."
--- d-push-2.0.orig/debian/po/templates.pot
+++ d-push-2.0/debian/po/templates.pot
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"d-push."
+msgstr ""
--- d-push-2.0.orig/debian/po/it.po
+++ d-push-2.0/debian/po/it.po
@@ -0,0 +1,34 @@
+# Italian translation of d-push debconf messages.
+# Copyright (C) 2010 Wolfram Quester <wolfi@sigxcpu.org>
+# This file is distributed under the same license as the d-push package.
+# Beatrice Torracca <beatricet@libero.it>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: d-push\n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+0200\n"
+"PO-Revision-Date: 2012-02-24 19:02+0200\n"
+"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Server web da riconfigurare automaticamente:"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"d-push."
+msgstr ""
+"Selezionare il server web che deve essere configurato automaticamente per "
+"eseguire d-push."
--- d-push-2.0.orig/debian/po/pl.po
+++ d-push-2.0/debian/po/pl.po
@@ -0,0 +1,37 @@
+# Translation of d-push debconf templates to Polish.
+# Copyright (C) 2011
+# This file is distributed under the same license as the d-push package.
+#
+# Michał Kułach <michal.kulach@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+0200\n"
+"PO-Revision-Date: 2012-02-18 18:09+0100\n"
+"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
+"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Serwer WWW do automatycznej konfiguracji:"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"d-push."
+msgstr ""
+"Proszę wybrać serwer WWW, który powinien być automatycznie skonfigurowany w "
+"celu uruchomienia d-push."
+
--- d-push-2.0.orig/debian/po/pt_BR.po
+++ d-push-2.0/debian/po/pt_BR.po
@@ -0,0 +1,34 @@
+# Debconf translations for d-push.
+# Copyright (C) 2012 THE d-push'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the d-push package.
+# Adriano Rafael Gomes <adrianorg@gmail.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: d-push 1.5.5-1\n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+0200\n"
+"PO-Revision-Date: 2012-02-27 21:38-0300\n"
+"Last-Translator: Adriano Rafael Gomes <adrianorg@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Servidor web para reconfigurar automaticamente:"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"d-push."
+msgstr ""
+"Por favor, escolha o servidor web que deve ser configurado automaticamente "
+"para executar o d-push."
--- d-push-2.0.orig/debian/po/fr.po
+++ d-push-2.0/debian/po/fr.po
@@ -0,0 +1,37 @@
+# Translation of d-push debconf templates to French
+# Copyright (C) 2011 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the d-push package.
+#
+# Translator:
+# Christian Perrier <bubulle@debian.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+0200\n"
+"PO-Revision-Date: 2011-07-16 21:12+0200\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Serveur web à reconfigurer automatiquement :"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"d-push."
+msgstr ""
+"Veuillez choisir le serveur web à reconfigurer automatiquement pour "
+"l'utilisation de d-push."
+
--- d-push-2.0.orig/debian/po/sv.po
+++ d-push-2.0/debian/po/sv.po
@@ -0,0 +1,35 @@
+# Translation of d-push debconf template to Swedish
+# Copyright (C) 2011 Martin Bagge <brother@bsnet.se>
+# This file is distributed under the same license as the d-push package.
+#
+# Martin Bagge <brother@bsnet.se>, 2011
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: d-push@packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 14:53+0200\n"
+"PO-Revision-Date: 2011-09-01 22:20+0100\n"
+"Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Webbserver att göra inställningar för automatiskt:"
+
+#. Type: multiselect
+#. Description
+#: ../d-push.templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"d-push."
+msgstr ""
+"Ange den webbserver som automatiskt ska få inställningar färdigställda för "
+"att köra d-push."
--- d-push-2.0.orig/debian/po/POTFILES.in
+++ d-push-2.0/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] d-push.templates
--- d-push-2.0.orig/debian/patches/series
+++ d-push-2.0/debian/patches/series
@@ -0,0 +1,5 @@
+0001-Rebranding.patch
+0002-set-correct-d-push-version.patch
+0003-set-IMAP-as-default-backend.patch
+0004-Use-mail-in-sample-config.patch
+0005-set-proper-default-config.patch
--- d-push-2.0.orig/debian/patches/0005-set-proper-default-config.patch
+++ d-push-2.0/debian/patches/0005-set-proper-default-config.patch
@@ -0,0 +1,58 @@
+From: Wolfram Quester <wolfi@sigxcpu.org>
+Date: Sun, 17 Apr 2011 16:05:40 +0200
+Subject: set proper default config
+
+Reviewed-by: gregor herrmann <gregoa@debian.org>
+Last-Update: 2012-09-06
+
+---
+ config.php |   17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/config.php b/config.php
+index bb219af..418c325 100644
+--- a/config.php
++++ b/config.php
+@@ -60,15 +60,20 @@
+ /**********************************************************************************
+  *  Default FileStateMachine settings
+  */
+-    define('STATE_DIR', '/var/lib/z-push/');
++    define('STATE_DIR', '/var/lib/d-push/state/');
+ 
+ 
+ /**********************************************************************************
+  *  Logging settings
+  */
+-    define('LOGFILEDIR', '/var/log/z-push/');
+-    define('LOGFILE', LOGFILEDIR . 'z-push.log');
+-    define('LOGERRORFILE', LOGFILEDIR . 'z-push-error.log');
++    define('LOGFILEDIR', '/var/log/d-push/');
++    define('LOGFILE', LOGFILEDIR . 'd-push.log');
++    define('LOGERRORFILE', LOGFILEDIR . 'd-push-error.log');
++    // Possible Loglevels are:
++    // LOGLEVEL_OFF, LOGLEVEL_FATAL, LOGLEVEL_ERROR, LOGLEVEL_WARN,
++    // LOGLEVEL_INFO, LOGLEVEL_DEBUG, LOGLEVEL_WBXML, LOGLEVEL_DEVICEID,
++    // LOGLEVEL_WBXMLSTACK, LOGLEVEL_ALL
++    // see /usr/share/d-push/lib/core/zpushdefs.php for more info
+     define('LOGLEVEL', LOGLEVEL_INFO);
+     define('LOGAUTHFAIL', false);
+ 
+@@ -145,7 +150,7 @@
+     //        'domain'    - the value of the "domain" field is used
+     //        '@mydomain.com' - the username is used and the given string will be appended
+     define('IMAP_DEFAULTFROM', '');
+-    // copy outgoing mail to this folder. If not set z-push will try the default folders
++    // copy outgoing mail to this folder. If not set d-push will try the default folders
+     define('IMAP_SENTFOLDER', '');
+     // forward messages inline (default false - as attachment)
+     define('IMAP_INLINE_FORWARD', false);
+@@ -209,7 +214,7 @@
+  *  - on Zarafa systems use backend/zarafa/listfolders.php script to get a list
+  *    of available folders
+  *
+- *  - all Z-Push users must have full writing permissions (secretary rights) so
++ *  - all D-Push users must have full writing permissions (secretary rights) so
+  *    the configured folders can be synchronized to the mobile
+  *
+  *  - this feature is only partly suitable for multi-tenancy environments,
--- d-push-2.0.orig/debian/patches/0004-Use-mail-in-sample-config.patch
+++ d-push-2.0/debian/patches/0004-Use-mail-in-sample-config.patch
@@ -0,0 +1,25 @@
+From: Wolfram Quester <wolfi@sigxcpu.org>
+Date: Sat, 24 Mar 2012 14:33:08 +0100
+Subject: Use mail() in sample config
+
+---
+ config.php |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/config.php b/config.php
+index a6c6299..bb219af 100644
+--- a/config.php
++++ b/config.php
+@@ -149,8 +149,10 @@
+     define('IMAP_SENTFOLDER', '');
+     // forward messages inline (default false - as attachment)
+     define('IMAP_INLINE_FORWARD', false);
+-    // use imap_mail() to send emails (default) - if false mail() is used
+-    define('IMAP_USE_IMAPMAIL', true);
++    // don't use imap_mail() to send emails.
++    // true (default, uses imap_mail, which is broken - false uses mail(),
++    // which handles cc and from in a more sane way)
++    define('IMAP_USE_IMAPMAIL', false);
+ 
+ 
+     // ************************
--- d-push-2.0.orig/debian/patches/0002-set-correct-d-push-version.patch
+++ d-push-2.0/debian/patches/0002-set-correct-d-push-version.patch
@@ -0,0 +1,22 @@
+From: Wolfram Quester <wolfi@sigxcpu.org>
+Date: Sun, 17 Apr 2011 15:49:03 +0200
+Subject: set correct d-push version
+
+---
+ version.php |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/version.php b/version.php
+index 43f1bad..030b21d 100644
+--- a/version.php
++++ b/version.php
+@@ -42,6 +42,6 @@
+ ************************************************/
+ 
+ 
+-define("ZPUSH_VERSION", "2.0-1346");
++define("ZPUSH_VERSION", "2.0-1 (d-push)");
+ 
+-?>
+\ No newline at end of file
++?>
--- d-push-2.0.orig/debian/patches/0001-Rebranding.patch
+++ d-push-2.0/debian/patches/0001-Rebranding.patch
@@ -0,0 +1,272 @@
+From: Wolfram Quester <wolfi@sigxcpu.org>
+Date: Sat, 16 Apr 2011 12:44:47 +0200
+Subject: Rebranding
+
+---
+ backend/kolab/kolab.php       |    6 +++---
+ backend/vcarddir.php          |    4 ++--
+ backend/zarafa/importer.php   |    2 +-
+ backend/zarafa/zarafa.php     |    6 +++---
+ index.php                     |    6 +++---
+ lib/core/interprocessdata.php |    4 ++--
+ lib/core/loopdetection.php    |    4 ++--
+ lib/core/topcollector.php     |    4 ++--
+ lib/core/zpush.php            |   10 +++++++---
+ lib/utils/timezoneutil.php    |    4 ++--
+ lib/wbxml/wbxmldecoder.php    |    4 ++--
+ 11 files changed, 29 insertions(+), 25 deletions(-)
+
+diff --git a/backend/kolab/kolab.php b/backend/kolab/kolab.php
+index 9d70726..9a7a2d4 100644
+--- a/backend/kolab/kolab.php
++++ b/backend/kolab/kolab.php
+@@ -1952,7 +1952,7 @@
+             //add header
+             $h["from"]=$this->_email;
+             $h["to"]=$this->_email; 
+-            $h["X-Mailer"]="z-push-Kolab Backend";
++            $h["X-Mailer"]="d-push-Kolab Backend";
+             $h["subject"]= $object["uid"];
+             $h["message-id"]= "<" . strtoupper(md5(uniqid(time()))) . ">";
+             $h["date"]=date(DATE_RFC2822);
+@@ -2249,7 +2249,7 @@
+             //add header
+             $h["from"]=$this->_email;
+             $h["to"]=$this->_email; 
+-            $h["X-Mailer"]="z-push-Kolab Backend";
++            $h["X-Mailer"]="d-push-Kolab Backend";
+             $h["subject"]= $object["uid"];
+             $h["message-id"]= "<" . strtoupper(md5(uniqid(time()))) . ">";
+             $h["date"]=date(DATE_RFC2822);
+@@ -2524,7 +2524,7 @@
+             //add header
+             $h["from"]=$this->_email;
+             $h["to"]=$this->_email; 
+-            $h["X-Mailer"]="z-push-Kolab Backend";
++            $h["X-Mailer"]="d-push-Kolab Backend";
+             $h["subject"]= $object["uid"];
+             $h["message-id"]= "<" . strtoupper(md5(uniqid(time()))) . ">";
+             $h["date"]=date(DATE_RFC2822);
+diff --git a/backend/vcarddir.php b/backend/vcarddir.php
+index 4f06f4f..26f62bf 100644
+--- a/backend/vcarddir.php
++++ b/backend/vcarddir.php
+@@ -524,7 +524,7 @@ class BackendVCardDir extends BackendDiff {
+             'jobtitle' => 'ROLE',
+             'webpage' => 'URL',
+         );
+-        $data = "BEGIN:VCARD\nVERSION:2.1\nPRODID:Z-Push\n";
++        $data = "BEGIN:VCARD\nVERSION:2.1\nPRODID:d-push\n";
+         foreach($mapping as $k => $v){
+             $val = '';
+             $ks = explode(';', $k);
+@@ -670,4 +670,4 @@ class BackendVCardDir extends BackendDiff {
+         return $data;
+     }
+ };
+-?>
+\ No newline at end of file
++?>
+diff --git a/backend/zarafa/importer.php b/backend/zarafa/importer.php
+index f57a130..3969679 100644
+--- a/backend/zarafa/importer.php
++++ b/backend/zarafa/importer.php
+@@ -519,7 +519,7 @@ class ImportChangesICS implements IImportChanges {
+         // In theory the parent id could change, which means that the folder was moved.
+         // It is unknown if any device supports this, so we do currently not implement it (no known device is able to do this)
+         if (bin2hex($props[PR_PARENT_SOURCE_KEY]) !== $parent)
+-            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Folder was moved to another location, which is currently not supported. Please report this to the Z-Push dev team together with the WBXML log and your device details (model, firmware etc).", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_UNKNOWNERROR);
++            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Folder was moved to another location, which is currently not supported. Please report this to the D-Push dev team together with the WBXML log and your device details (model, firmware etc).", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_UNKNOWNERROR);
+ 
+         $props = array(PR_DISPLAY_NAME => $displayname);
+         mapi_setprops($folder, $props);
+diff --git a/backend/zarafa/zarafa.php b/backend/zarafa/zarafa.php
+index 3c609b3..b245c2d 100644
+--- a/backend/zarafa/zarafa.php
++++ b/backend/zarafa/zarafa.php
+@@ -1182,7 +1182,7 @@ class BackendZarafa implements IBackend, ISearchProvider {
+                 array(
+                     FUZZYLEVEL      => FL_PREFIX,
+                     ULPROPTAG       => PR_DISPLAY_NAME,
+-                    VALUE           => array(PR_DISPLAY_NAME=>"Z-Push Search Folder ".$pid)
++                    VALUE           => array(PR_DISPLAY_NAME=>"D-Push Search Folder ".$pid)
+                 )
+             ),
+             TBL_BATCH);
+@@ -1633,7 +1633,7 @@ class BackendZarafa implements IBackend, ISearchProvider {
+      * @return mapiFolderObject
+      */
+     private function createSearchFolder($searchFolderRoot) {
+-        $folderName = "Z-Push Search Folder ".@getmypid();
++        $folderName = "D-Push Search Folder ".@getmypid();
+         $searchFolders = mapi_folder_gethierarchytable($searchFolderRoot);
+         $restriction = array(
+             RES_CONTENT,
+@@ -1704,4 +1704,4 @@ class BackendZarafa implements IBackend, ISearchProvider {
+  */
+ class BackendICS extends BackendZarafa {}
+ 
+-?>
+\ No newline at end of file
++?>
+diff --git a/index.php b/index.php
+index 0a904a2..4feacd3 100644
+--- a/index.php
++++ b/index.php
+@@ -139,7 +139,7 @@ include_once('version.php');
+ 
+         // Check required GET parameters
+         if(Request::IsMethodPOST() && (Request::GetCommandCode() === false || !Request::GetGETUser() || !Request::GetDeviceID() || !Request::GetDeviceType()))
+-            throw new FatalException("Requested the Z-Push URL without the required GET parameters");
++            throw new FatalException("Requested the d-push URL without the required GET parameters");
+ 
+         // Load the backend
+         $backend = ZPush::GetBackend();
+@@ -162,7 +162,7 @@ include_once('version.php');
+ 
+         // Do the actual processing of the request
+         if (Request::IsMethodGET())
+-            throw new NoPostRequestException("This is the Z-Push location and can only be accessed by Microsoft ActiveSync-capable devices", NoPostRequestException::GET_REQUEST);
++            throw new NoPostRequestException("This is the d-push location and can only be accessed by Microsoft ActiveSync-capable devices", NoPostRequestException::GET_REQUEST);
+ 
+         // Do the actual request
+         header(ZPush::GetServerHeader());
+@@ -277,4 +277,4 @@ include_once('version.php');
+ 
+     // end gracefully
+     ZLog::Write(LOGLEVEL_DEBUG, '-------- End');
+-?>
+\ No newline at end of file
++?>
+diff --git a/lib/core/interprocessdata.php b/lib/core/interprocessdata.php
+index 2a9845a..406c7bd 100644
+--- a/lib/core/interprocessdata.php
++++ b/lib/core/interprocessdata.php
+@@ -92,7 +92,7 @@ abstract class InterProcessData {
+     private function InitSharedMem() {
+         // shared mem general "turn off switch"
+         if (defined("USE_SHARED_MEM") && USE_SHARED_MEM === false) {
+-            ZLog::Write(LOGLEVEL_INFO, "InterProcessData::InitSharedMem(): the usage of shared memory for Z-Push has been disabled. Check your config for 'USE_SHARED_MEM'.");
++            ZLog::Write(LOGLEVEL_INFO, "InterProcessData::InitSharedMem(): the usage of shared memory for D-Push has been disabled. Check your config for 'USE_SHARED_MEM'.");
+             return false;
+         }
+ 
+@@ -294,4 +294,4 @@ abstract class InterProcessData {
+ 
+ }
+ 
+-?>
+\ No newline at end of file
++?>
+diff --git a/lib/core/loopdetection.php b/lib/core/loopdetection.php
+index e0690ae..bfb5911 100644
+--- a/lib/core/loopdetection.php
++++ b/lib/core/loopdetection.php
+@@ -258,7 +258,7 @@ class LoopDetection extends InterProcessData {
+             if (!isset($se['end']) && $se['cc'] != ZPush::COMMAND_PING) {
+                 // there is no end time
+                 ZLog::Write(LOGLEVEL_ERROR, sprintf("LoopDetection->ProcessLoopDetectionPreviousConnectionFailed(): Command '%s' at %s with pid '%d' terminated unexpectedly or is still running.", Utils::GetCommandFromCode($se['cc']), Utils::GetFormattedTime($se['time']), $se['pid']));
+-                ZLog::Write(LOGLEVEL_ERROR, "Please check your logs for this PID and errors like PHP-Fatals or Apache segmentation faults and report your results to the Z-Push dev team.");
++                ZLog::Write(LOGLEVEL_ERROR, "Please check your logs for this PID and errors like PHP-Fatals or Apache segmentation faults and report your results to the D-Push dev team.");
+             }
+         }
+     }
+@@ -875,4 +875,4 @@ class LoopDetection extends InterProcessData {
+     }
+ }
+ 
+-?>
+\ No newline at end of file
++?>
+diff --git a/lib/core/topcollector.php b/lib/core/topcollector.php
+index 84225e7..87cefb8 100644
+--- a/lib/core/topcollector.php
++++ b/lib/core/topcollector.php
+@@ -161,7 +161,7 @@ class TopCollector extends InterProcessData {
+         // end exclusive block
+ 
+         if ($this->isEnabled() === true && !$ok) {
+-            ZLog::Write(LOGLEVEL_WARN, "TopCollector::AnnounceInformation(): could not write to shared memory. Z-Push top will not display this data.");
++            ZLog::Write(LOGLEVEL_WARN, "TopCollector::AnnounceInformation(): could not write to shared memory. D-Push top will not display this data.");
+             return false;
+         }
+ 
+@@ -294,4 +294,4 @@ class TopCollector extends InterProcessData {
+     }
+ }
+ 
+-?>
+\ No newline at end of file
++?>
+diff --git a/lib/core/zpush.php b/lib/core/zpush.php
+index c4a62d6..0c3233c 100644
+--- a/lib/core/zpush.php
++++ b/lib/core/zpush.php
+@@ -553,14 +553,18 @@ class ZPush {
+         print <<<END
+         <html>
+         <header>
+-        <title>Z-Push ActiveSync</title>
++        <title>d-push ActiveSync</title>
+         </header>
+         <body>
+         <font face="verdana">
+-        <h2>Z-Push - Open Source ActiveSync</h2>
++        <h2>d-push - Open Source ActiveSync</h2>
+         <b>Version $zpush_version</b><br>
+         $message $additionalMessage
+         <br><br>
++	d-push is debians rebranding of z-push. The rebranding was done to avoid
++	possible trademark issues.<br>
++	Copyright (C) for z-push: Zarafa Deutschland GmbH <a href="http://www.zarafaserver.de/">http://www.zarafaserver.de/</a><br>
++
+         More information about Z-Push can be found at:<br>
+         <a href="http://z-push.sf.net/">Z-Push homepage</a><br>
+         <a href="http://z-push.sf.net/download">Z-Push download page at BerliOS</a><br>
+@@ -764,4 +768,4 @@ END;
+     }
+ 
+ }
+-?>
+\ No newline at end of file
++?>
+diff --git a/lib/utils/timezoneutil.php b/lib/utils/timezoneutil.php
+index e34f584..b344e2f 100644
+--- a/lib/utils/timezoneutil.php
++++ b/lib/utils/timezoneutil.php
+@@ -1195,7 +1195,7 @@ class TimezoneUtil {
+         }
+ 
+         if (!isset($tzname) || is_int($tzname)) {
+-            ZLog::Write(LOGLEVEL_ERROR, sprintf("TimezoneUtil::guessTZNameFromPHPName() no compatible timezone found for '%s'. Returning 'GMT Standard Time'. Please contact the Z-Push dev team.", $phpname));
++            ZLog::Write(LOGLEVEL_ERROR, sprintf("TimezoneUtil::guessTZNameFromPHPName() no compatible timezone found for '%s'. Returning 'GMT Standard Time'. Please contact the D-Push dev team.", $phpname));
+             return self::$mstzones["085"][0];
+         }
+ 
+@@ -1260,4 +1260,4 @@ class TimezoneUtil {
+ 
+ }
+ 
+-?>
+\ No newline at end of file
++?>
+diff --git a/lib/wbxml/wbxmldecoder.php b/lib/wbxml/wbxmldecoder.php
+index bfceb5e..2b071a4 100644
+--- a/lib/wbxml/wbxmldecoder.php
++++ b/lib/wbxml/wbxmldecoder.php
+@@ -171,7 +171,7 @@ class WBXMLDecoder extends WBXMLDefs {
+             ZLog::Write(LOGLEVEL_WBXMLSTACK, sprintf("WBXMLDecoder->getElementEndTag(): unmatched WBXML tag: '%s' type '%s' flags '%s'", ((isset($element[EN_TAG]))?$element[EN_TAG]:""), ((isset($element[EN_TYPE]))?$element[EN_TYPE]:""), ((isset($element[EN_FLAGS]))?$element[EN_FLAGS]:"")));
+ 
+             $bt = debug_backtrace();
+-            ZLog::Write(LOGLEVEL_ERROR, sprintf("WBXMLDecoder->getElementEndTag(): could not read end tag in '%s'. Please enable the LOGLEVEL_WBXML and send the log to the Z-Push dev team.", $bt[0]["file"] . ":" . $bt[0]["line"]));
++            ZLog::Write(LOGLEVEL_ERROR, sprintf("WBXMLDecoder->getElementEndTag(): could not read end tag in '%s'. Please enable the LOGLEVEL_WBXML and send the log to the D-Push dev team.", $bt[0]["file"] . ":" . $bt[0]["line"]));
+ 
+             // log the remaining wbxml content
+             $this->ungetElement($element);
+@@ -657,4 +657,4 @@ class WBXMLDecoder extends WBXMLDefs {
+     }
+ }
+ 
+-?>
+\ No newline at end of file
++?>
--- d-push-2.0.orig/debian/patches/0003-set-IMAP-as-default-backend.patch
+++ d-push-2.0/debian/patches/0003-set-IMAP-as-default-backend.patch
@@ -0,0 +1,29 @@
+From: Wolfram Quester <wolfi@sigxcpu.org>
+Date: Sun, 17 Apr 2011 16:05:40 +0200
+Subject: set IMAP as default backend
+
+---
+ config.php |    5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/config.php b/config.php
+index 344110a..a6c6299 100644
+--- a/config.php
++++ b/config.php
+@@ -122,8 +122,7 @@
+  *  Backend settings
+  */
+     // The data providers that we are using (see configuration below)
+-    define('BACKEND_PROVIDER', "BackendZarafa");
+-
++    define('BACKEND_PROVIDER', "BackendIMAP");
+ 
+     // ************************
+     //  BackendZarafa settings
+@@ -234,4 +233,4 @@
+ */
+     );
+ 
+-?>
+\ No newline at end of file
++?>
--- d-push-2.0.orig/debian/conf/lighttpd.conf
+++ d-push-2.0/debian/conf/lighttpd.conf
@@ -0,0 +1,4 @@
+# Alias for d-push directory
+alias.url += (
+    "/Microsoft-Server-ActiveSync" => "/usr/share/d-push/index.php"
+)
--- d-push-2.0.orig/debian/conf/apache.conf
+++ d-push-2.0/debian/conf/apache.conf
@@ -0,0 +1,5 @@
+# d-push default Apache configuration
+
+<IfModule mod_alias.c>
+    Alias /Microsoft-Server-ActiveSync /usr/share/d-push/index.php
+</IfModule>
--- d-push-2.0.orig/debian/source/format
+++ d-push-2.0/debian/source/format
@@ -0,0 +1 @@
+1.0
