diff -Nru tikiwiki-1.9.7+dfsg/debian/changelog /tmp/KBEF9h70Ls/tikiwiki-1.9.7+dfsg/debian/changelog
--- tikiwiki-1.9.7+dfsg/debian/changelog	2007-05-15 08:52:56.000000000 +0200
+++ tikiwiki-1.9.7+dfsg/debian/changelog	2007-05-15 08:52:58.000000000 +0200
@@ -1,9 +1,25 @@
+tikiwiki (1.9.7+dfsg-2ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Depends on PHP 5 packages
+    - Update maintainer field in debian/control
+  * Use dash-compliant syntax in debian/rules
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Tue,  1 May 2007 02:36:25 +0200
+
 tikiwiki (1.9.7+dfsg-2) unstable; urgency=low
 
   * Allow coexistence with PHP5. (Closes: #377683)
 
  -- Marcus Better <marcus@better.se>  Tue,  5 Dec 2006 15:15:57 +0100
 
+tikiwiki (1.9.7+dfsg-1ubuntu1) feisty; urgency=low
+
+  * Depends on PHP 5 packages (LP: 96361)
+  * Update maintainer field in debian/control
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Tue, 10 Apr 2007 23:39:00 +0200
+
 tikiwiki (1.9.7+dfsg-1) unstable; urgency=high
 
   * New upstream version.
diff -Nru tikiwiki-1.9.7+dfsg/debian/control tikiwiki-1.9.7+dfsg/debian/control
--- tikiwiki-1.9.7+dfsg/debian/control	2007-05-15 08:52:56.000000000 +0200
+++ tikiwiki-1.9.7+dfsg/debian/control	2007-05-15 08:52:58.000000000 +0200
@@ -1,7 +1,8 @@
 Source: tikiwiki
 Section: web
 Priority: optional
-Maintainer: Debian Tikiwiki team <pkg-tikiwiki-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Tikiwiki team <pkg-tikiwiki-devel@lists.alioth.debian.org>
 Uploaders: Marcus Better <marcus@better.se>
 Build-Depends: debhelper (>= 5.0.0), dpatch
 Standards-Version: 3.7.2
@@ -10,8 +11,8 @@
 
 Package: tikiwiki
 Architecture: all
-Depends: dbconfig-common, apache2 | httpd, php4 (>= 4.1.0) | php5, php-pear | php4-pear, php-date, php-db, php-http, php-http-request, php-net-socket, php-mail, php-xml-parser, php4-mysql | php4-pgsql, smarty (>= 2.6.7), libphp-adodb (>= 4.61), libphp-phplayersmenu
-Recommends: php4-gd | php5-gd, php4-imagick | php5-imagick
+Depends: dbconfig-common, apache2 | httpd, php5, php-pear, php-date, php-db, php-http, php-http-request, php-net-socket, php-mail, php-xml-parser, php5-mysql | php5-pgsql, smarty (>= 2.6.7), libphp-adodb (>= 4.61), libphp-phplayersmenu
+Recommends: php5-gd, php5-imagick
 Suggests: graphviz, cgi-mapserver
 Description: groupware and content management system
  Tiki CMS/Groupware, also known as TikiWiki, can be used to create all
diff -Nru tikiwiki-1.9.7+dfsg/debian/rules tikiwiki-1.9.7+dfsg/debian/rules
--- tikiwiki-1.9.7+dfsg/debian/rules	2007-05-15 08:52:56.000000000 +0200
+++ tikiwiki-1.9.7+dfsg/debian/rules	2007-05-15 08:52:58.000000000 +0200
@@ -38,13 +38,33 @@
 	find $(INSTALLDIR) -exec chmod g-w {} +
 	find $(INSTALLDIR) -type f ! -wholename */DEBIAN/* -exec chmod -x {} +
 	chgrp -R www-data $(INSTALLDIR)/var/lib/tikiwiki $(INSTALLDIR)/var/spool/tikiwiki
-	chmod 770 $(INSTALLDIR)/var/lib/tikiwiki/{backups,img,img/wiki,img/wiki_up,styles,templates,templates_c,whelp,galaxia,galaxia/processes} $(INSTALLDIR)/var/spool/tikiwiki/{dump,modules_cache,temp,temp/{cache,mail_attachs}}
+	chmod 770 $(INSTALLDIR)/var/lib/tikiwiki/backups
+	chmod 770 $(INSTALLDIR)/var/lib/tikiwiki/img
+	chmod 770 $(INSTALLDIR)/var/lib/tikiwiki/img/wiki
+	chmod 770 $(INSTALLDIR)/var/lib/tikiwiki/img/wiki_up
+	chmod 770 $(INSTALLDIR)/var/lib/tikiwiki/styles
+	chmod 770 $(INSTALLDIR)/var/lib/tikiwiki/templates
+	chmod 770 $(INSTALLDIR)/var/lib/tikiwiki/templates_c
+	chmod 770 $(INSTALLDIR)/var/lib/tikiwiki/whelp
+	chmod 770 $(INSTALLDIR)/var/lib/tikiwiki/galaxia
+	chmod 770 $(INSTALLDIR)/var/lib/tikiwiki/galaxia/processes
+	chmod 770 $(INSTALLDIR)/var/spool/tikiwiki/dump
+	chmod 770 $(INSTALLDIR)/var/spool/tikiwiki/modules_cache
+	chmod 770 $(INSTALLDIR)/var/spool/tikiwiki/temp
+	chmod 770 $(INSTALLDIR)/var/spool/tikiwiki/temp/cache
+	chmod 770 $(INSTALLDIR)/var/spool/tikiwiki/temp/mail_attachs
 	rm -rf $(TIKIDIR)/img/wiki $(TIKIDIR)/img/wiki_up 
 	rm -rf $(TIKIDIR)/lib/Galaxia/processes
-	rm -rf $(TIKIDIR)/lib/{adodb,phplayers,smarty}
-	rm -f $(TIKIDIR)/lib/htmlarea/{test.cgi,example.html,license.txt,readme.html}
+	rm -rf $(TIKIDIR)/lib/adodb
+	rm -rf $(TIKIDIR)/lib/phplayers
+	rm -rf $(TIKIDIR)/lib/smarty
+	rm -f $(TIKIDIR)/lib/htmlarea/test.cgi
+	rm -f $(TIKIDIR)/lib/htmlarea/example.html
+	rm -f $(TIKIDIR)/lib/htmlarea/license.txt
+	rm -f $(TIKIDIR)/lib/htmlarea/readme.html
 	rm -f $(TIKIDIR)/tiki-install.php
-	rm -f $(INSTALLDIR)/var/lib/tikiwiki/styles/{README.matrix-theme,integrator/README}
+	rm -f $(INSTALLDIR)/var/lib/tikiwiki/styles/README.matrix-theme
+	rm -f $(INSTALLDIR)/var/lib/tikiwiki/styles/integrator/README
 	rm -rf $(TIKIDIR)/modules/cache
 	install -m 644 db/tiki-1.9-mysql.sql $(INSTALLDIR)/usr/share/dbconfig-common/data/tikiwiki/install/mysql
 	install -m 644 db/tiki-1.9-pgsql.sql $(INSTALLDIR)/usr/share/dbconfig-common/data/tikiwiki/install/pgsql