diff -Nru phpmyadmin-2.9.1.1/debian/changelog phpmyadmin-2.9.1.1/debian/changelog --- phpmyadmin-2.9.1.1/debian/changelog 2007-05-19 18:30:07.000000000 +0200 +++ phpmyadmin-2.9.1.1/debian/changelog 2007-05-19 18:30:09.000000000 +0200 @@ -1,3 +1,11 @@ +phpmyadmin (4:2.9.1.1-2ubuntu2) gutsy; urgency=low + + * Depends on php5-mcrypt to fix access on AMD64 machines (LP: 114044) + * Remove PHP 4 dependencies + * Update maintainer field in debian/packages + + -- Luca Falavigna Sat, 19 May 2007 18:20:08 +0200 + phpmyadmin (4:2.9.1.1-2ubuntu1) feisty; urgency=low * SECURITY: Fix PHP Executor Deep Recursion Stack Overflow diff -Nru phpmyadmin-2.9.1.1/debian/control phpmyadmin-2.9.1.1/debian/control --- phpmyadmin-2.9.1.1/debian/control 2007-05-19 18:30:07.000000000 +0200 +++ phpmyadmin-2.9.1.1/debian/control 2007-05-19 18:30:09.000000000 +0200 @@ -1,14 +1,15 @@ Source: phpmyadmin -Maintainer: Thijs Kinkhorst +Maintainer: Ubuntu MOTU Developers Section: web Priority: extra Standards-Version: 3.7.2 Build-Depends: yada (>= 0.52), po-debconf +Xsbc-Original-Maintainer: Thijs Kinkhorst Package: phpmyadmin Architecture: all -Depends: libapache2-mod-php5 | libapache-mod-php5 | php5-cgi | php5 | libapache2-mod-php4 | libapache-mod-php4 | php4 | php4-cgi, php5-mysql | php5-mysqli | php4-mysql, perl, ${phpmyadmin:Depends} -Recommends: apache2 | httpd, php5-mcrypt | php4-mcrypt, php5-gd | php4-gd, ${phpmyadmin:Recommends} +Depends: libapache2-mod-php5 | php5-cgi | php5, php5-mysql | php5-mysqli, perl, php5-mcrypt, ${phpmyadmin:Depends} +Recommends: apache2 | httpd, php5-gd, ${phpmyadmin:Recommends} Suggests: mysql-server (>= 3.23.36), ${phpmyadmin:Suggests} Description: Administrate MySQL over the WWW phpMyAdmin is intended to handle the administration of MySQL over the WWW. diff -Nru phpmyadmin-2.9.1.1/debian/packages phpmyadmin-2.9.1.1/debian/packages --- phpmyadmin-2.9.1.1/debian/packages 2007-05-19 18:30:07.000000000 +0200 +++ phpmyadmin-2.9.1.1/debian/packages 2007-05-19 18:30:09.000000000 +0200 @@ -9,7 +9,8 @@ Source: phpmyadmin Section: web Priority: extra -Maintainer: Thijs Kinkhorst +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Thijs Kinkhorst Standards-Version: 3.7.2 Upstream-Source: Home-Page: @@ -31,13 +32,13 @@ Package: phpmyadmin Architecture: all -Depends: libapache2-mod-php5 | libapache-mod-php5 | php5-cgi | php5 | libapache2-mod-php4 | libapache-mod-php4 | php4 | php4-cgi -Depends: php5-mysql | php5-mysqli | php4-mysql +Depends: libapache2-mod-php5 | php5-cgi | php5 +Depends: php5-mysql | php5-mysqli Depends: perl +Depends: php5-mcrypt Depends: [] Recommends: apache2 | httpd -Recommends: php5-mcrypt | php4-mcrypt -Recommends: php5-gd | php4-gd +Recommends: php5-gd Recommends: [] Suggests: mysql-server (>= 3.23.36) Suggests: []