diff -Nru gosa-2.5.16.1/debian/changelog gosa-2.5.16.1/debian/changelog
--- gosa-2.5.16.1/debian/changelog	2008-05-16 08:18:12.000000000 +0200
+++ gosa-2.5.16.1/debian/changelog	2008-05-26 12:26:21.000000000 +0200
@@ -1,9 +1,31 @@
+gosa (2.5.16.1-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #234945)
+   + debian/control
+    - Switch Maintainer to Ubuntu Motu Developers
+  + debian/rules
+    - Fixed fatal error on Call function get_template_patch() in
+     /usr/share/gosa/include
+
+ -- Emanuele Gentili <emgent@emanuele-gentili.com>  Mon, 26 May 2008 12:25:48 +0200
+
 gosa (2.5.16.1-1) unstable; urgency=low
 
   * Fixed typo in printer class 
 
  -- Cajus Pollmeier <cajus@debian.org>  Fri, 16 May 2008 08:16:42 +0200
 
+gosa (2.5.16-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #229763)
+   + debian/control
+    - Switch Maintainer to Ubuntu Motu Developers
+  + debian/rules
+    - Fixed fatal error on Call function get_template_patch() in
+     /usr/share/gosa/include
+
+ -- Emanuele Gentili <emgent@emanuele-gentili.com>  Tue, 13 May 2008 00:18:06 +0200
+
 gosa (2.5.16-1) unstable; urgency=low
 
   * Included spanish debconf translation (Closes #472271)
@@ -15,6 +37,23 @@
 
  -- Cajus Pollmeier <cajus@debian.org>  Fri, 09 May 2008 14:12:03 +0200
 
+gosa (2.5.15-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #226858)
+   + debian/control
+    - Switch Maintainer to Ubuntu Motu Developers
+  + debian/rules
+    - Fixed fatal error on Call function get_template_patch() in
+     /usr/share/gosa/include
+
+ -- Emanuele Gentili <emgent@emanuele-gentili.com>  Mon, 05 May 2008 13:10:44 +0200
+
+gosa (2.5.15-2) unstable; urgency=low
+
+  * Cleaned up non javascript usage for the setup. Closes #469915.
+
+ -- Cajus Pollmeier <cajus@debian.org>  Sat,  8 Mar 2008 11:16:45 +0100
+
 gosa (2.5.15-1) unstable; urgency=low
 
   * Removed bashisms from desktop package (Closes #464988)
@@ -29,6 +68,16 @@
 
  -- Cajus Pollmeier <cajus@debian.org>  Mon,  3 Dec 2007 10:26:02 +0100
 
+gosa (2.5.13-1ubuntu1) hardy; urgency=low
+
+  * debian/control
+   - Switch Maintainer to Ubuntu Motu Developers
+  * debian/rules (LP: #157406)
+   - Fixed fatal error on Call function get_template_patch() in
+     /usr/share/gosa/include
+
+ -- Emanuele Gentili <emgent@emanuele-gentili.com>  Thu, 20 Mar 2008 14:39:14 +0100
+
 gosa (2.5.13-1) unstable; urgency=low
 
   * New upstream release
@@ -275,3 +324,4 @@
 Local variables:
 mode: debian-changelog
 End:
+
diff -Nru gosa-2.5.16.1/debian/control gosa-2.5.16.1/debian/control
--- gosa-2.5.16.1/debian/control	2008-04-04 12:33:38.000000000 +0200
+++ gosa-2.5.16.1/debian/control	2008-05-19 23:44:34.000000000 +0200
@@ -1,7 +1,8 @@
 Source: gosa
 Section: web
 Priority: optional
-Maintainer: Cajus Pollmeier <cajus@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Cajus Pollmeier <cajus@debian.org>
 Build-Depends: debhelper(>= 4.2.32), dpatch
 Standards-Version: 3.7.2.2
 
diff -Nru gosa-2.5.16.1/debian/rules gosa-2.5.16.1/debian/rules
--- gosa-2.5.16.1/debian/rules	2008-05-12 11:56:45.000000000 +0200
+++ gosa-2.5.16.1/debian/rules	2008-05-19 23:44:33.000000000 +0200
@@ -98,7 +98,7 @@
 	mv debian/gosa/usr/share/gosa/include/functions.inc.new debian/gosa/usr/share/gosa/include/functions.inc;
 	-if [ -z "${SARGE_PACKAGE}" ]; then \
 		rm -rf debian/gosa/usr/share/gosa/include/smarty; \
-		sed 's%require("smarty/Smarty.class.php");%require("/usr/share/php/smarty/libs/Smarty.class.php");%g' debian/gosa/usr/share/gosa/include/php_setup.inc > debian/gosa/usr/share/gosa/include/php_setup.inc.new; \
+		sed 's%require("smarty/Smarty.class.php");%require("/usr/share/php/smarty/Smarty.class.php");%g' debian/gosa/usr/share/gosa/include/php_setup.inc > debian/gosa/usr/share/gosa/include/php_setup.inc.new; \
 		mv debian/gosa/usr/share/gosa/include/php_setup.inc.new debian/gosa/usr/share/gosa/include/php_setup.inc; \
 	fi
 	install -D -m 644 debian/overrides-lintian debian/gosa/usr/share/lintian/overrides/gosa