diff -Nru polkit-kde-1-0.95.1/debian/changelog polkit-kde-1-0.95.1/debian/changelog
--- polkit-kde-1-0.95.1/debian/changelog	2010-04-11 09:23:59.000000000 -0400
+++ polkit-kde-1-0.95.1/debian/changelog	2010-04-11 09:13:21.000000000 -0400
@@ -1,3 +1,25 @@
+polkit-kde-1 (0.95.1-2ubuntu1) lucid; urgency=low
+
+  * Merge with Debian Testing, remaining changes:
+    - Don't touch the build dependency stack so close to release
+    - Keep Provides on policykit-1-kde
+    - Don't update the long description, since we are so close to release and
+      this might affect translations
+
+ -- Jonathan Thomas <echidnaman@kubuntu.org>  Sun, 11 Apr 2010 09:11:43 -0400
+
+polkit-kde-1 (0.95.1-2) unstable; urgency=low
+
+  * Update debian/control: add policykit-1 dependency.
+
+ -- Fathi Boudra <fabo@debian.org>  Mon, 22 Mar 2010 09:08:17 +0100
+
+polkit-kde-1 (0.95.1-1) unstable; urgency=low
+
+  * Initial release. (Closes: #571531)
+
+  -- Fathi Boudra <fabo@debian.org>  Thu, 25 Feb 2010 20:43:18 +0100
+
 polkit-kde-1 (0.95.1-0ubuntu1) lucid; urgency=low

   * New upstream release
diff -Nru polkit-kde-1-0.95.1/debian/control polkit-kde-1-0.95.1/debian/control
--- polkit-kde-1-0.95.1/debian/control	2010-04-11 09:23:59.000000000 -0400
+++ polkit-kde-1-0.95.1/debian/control	2010-04-11 09:11:12.000000000 -0400
@@ -1,16 +1,17 @@
 Source: polkit-kde-1
-Section: libs
-Priority: extra
+Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: Jonathan Thomas <echidnaman@kubuntu.org>
-Build-Depends: debhelper (>= 7.3.16), pkg-kde-tools (>= 0.5.0), kdelibs5-dev (>= 4:4.3.85-0ubuntu5),
- libpolkit-agent-1-dev (>= 0.95), libpolkit-gobject-1-dev (>= 0.95),
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Fathi Boudra <fabo@debian.org>
+Build-Depends: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.6.4),
+ kdelibs5-dev, libpolkit-agent-1-dev (>= 0.95), libpolkit-gobject-1-dev (>= 0.95),
  libpolkit-qt-1-dev (>= 0.95.1)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
+Section: libs

 Package: polkit-kde-1
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, policykit-1
 Provides: policykit-1-kde
 Description: KDE dialogs for PolicyKit
  PolicyKit-Kde provides a D-Bus session bus service that is used to
diff -Nru polkit-kde-1-0.95.1/debian/copyright polkit-kde-1-0.95.1/debian/copyright
--- polkit-kde-1-0.95.1/debian/copyright	2010-04-11 09:23:59.000000000 -0400
+++ polkit-kde-1-0.95.1/debian/copyright	2010-03-22 04:01:25.000000000 -0400
@@ -1,57 +1,47 @@
-This package was debianised by Jonathan Thomas <echidnaman@kubuntu.org> on
-Sun, 13 Dec 2009 10:33:24 -0500.
+This work was packaged for Debian by:

-It was downloaded from svn co svn://anonsvn.kde.org/home/kde/trunk/kdereview/polkit-kde/
+    Fathi Boudra <fabo@debian.org> on Fri, 15 Jan 2010 12:50:13 +0100

-Upstream Authors:
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/

-   Gökçen Eraslan <gokcen@pardus.org.tr>
-   Adrien Bustany <madcat@mymadcat.com>
-   Alessandro Diaferia <alediaferia@gmail.com>
-   Daniel Nicoletti <dantti85-pk@yahoo.com.br>
-   Dario Freddi <drf54321@gmail.com>
-   Dirk Mueller <mueller@kde.org>
-   Fredrik Höglund <fredrik@kde.org>
-   Lubos Lunak <l.lunak@kde.org>
-   Lukas Appelhans <l.appelhans@gmx.de>
-   Trever Fischer <wm161@wm161.net>
-
-Copyright:
-
-   Copyright © 2007-2008 Gökçen Eraslan <gokcen@pardus.org.tr>
-   Copyright © 2007-2008 Adrien Bustany <madcat@mymadcat.com>
-   Copyright © 2008 Alessandro Diaferia <alediaferia@gmail.com>
-   Copyright © 2008 Daniel Nicoletti <dantti85-pk@yahoo.com.br>
-   Copyright © 2008 Dario Freddi <drf54321@gmail.com>
-   Copyright © 2008 Dirk Mueller <mueller@kde.org>
-   Copyright © 2008 Fredrik Höglund <fredrik@kde.org>
-   Copyright © 2008 Lubos Lunak <l.lunak@kde.org>
-   Copyright © 2008 Lukas Appelhans <l.appelhans@gmx.de>
-   Copyright © 2008 Trever Fischer <wm161@wm161.net>
+Upstream Authors:
+
+    Jaroslav Reznik <jreznik@redhat.com>
+    Gökçen Eraslan <gokcen@pardus.org.tr>
+    Dario Freddi <drf@kde.org>
+    Daniel Nicoletti <dantti85-pk@yahoo.com.br>
+    Dirk Mueller <mueller@kde.org>
+
+Copyright:
+
+    Copyright (C) 2009 Jaroslav Reznik
+    Copyright (C) 2007-2008 Gökçen Eraslan
+    Copyright (C) 2008-2009 Dario Freddi
+    Copyright (C) 2008 Daniel Nicoletti
+    Copyright (C) 2008 Dirk Mueller

 License:
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 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 General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the
-   Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-   On Debian systems, the complete text of the GNU General
-   Public License can be found in `/usr/share/common-licenses/GPL-2'.
+    This package is free software; 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.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2' and
+`/usr/share/common-licenses/GPL-3'.

 The Debian packaging is:

-    Copyright © 2009 Jonathan Thomas <echidnaman@kubuntu.org>
-
-and is licensed under upstream license term:
-the GNU General Public License version 2 or any later version.
+    Copyright (C) 2010 Fathi Boudra <fabo@debian.org>

+and is licensed under the GPL version 2 or any later version.
diff -Nru polkit-kde-1-0.95.1/debian/rules polkit-kde-1-0.95.1/debian/rules
--- polkit-kde-1-0.95.1/debian/rules	2010-04-11 09:23:59.000000000 -0400
+++ polkit-kde-1-0.95.1/debian/rules	2010-02-25 14:42:47.000000000 -0500
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f

-include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1

 %:
-	dh --with kde $@
+	dh --parallel --with kde $@
+
+.PHONY: override_dh_auto_test
diff -Nru polkit-kde-1-0.95.1/debian/source/format polkit-kde-1-0.95.1/debian/source/format
--- polkit-kde-1-0.95.1/debian/source/format	1969-12-31 19:00:00.000000000 -0500
+++ polkit-kde-1-0.95.1/debian/source/format	2010-04-11 09:23:59.930384727 -0400
@@ -0,0 +1 @@
+3.0 (quilt)