summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorTom William Payne <twp@gentoo.org>2004-06-27 11:37:11 +0000
committerTom William Payne <twp@gentoo.org>2004-06-27 11:37:11 +0000
commitb44638407dc8a34bf35518fb4298588f1b3a325a (patch)
treede1825866848999ea7d5dc0e010a64c32d63a649 /dev-db
parentAdded to ~ppc (diff)
downloadhistorical-b44638407dc8a34bf35518fb4298588f1b3a325a.tar.gz
historical-b44638407dc8a34bf35518fb4298588f1b3a325a.tar.bz2
historical-b44638407dc8a34bf35518fb4298588f1b3a325a.zip
Bug # 53220.
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/phpmyadmin/ChangeLog6
-rw-r--r--dev-db/phpmyadmin/Manifest6
-rw-r--r--dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.62
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild4
4 files changed, 11 insertions, 7 deletions
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index fa11df1f6bcf..5e3b688934d1 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/phpmyadmin
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.49 2004/06/27 11:31:40 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.50 2004/06/27 11:37:11 twp Exp $
+
+ 27 Jun 2004; <twp@gentoo.org> files/mysql-setup.sql.in-2.5.6,
+ phpmyadmin-2.5.7.ebuild:
+ Bug # 53220.
*phpmyadmin-2.5.7 (27 Jun 2004)
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index a622031a6c24..dfbdd0e8007f 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,6 +1,6 @@
-MD5 e4d5432186d20a71c5166a7c71625c56 phpmyadmin-2.5.7.ebuild 2597
+MD5 74203cd5498df5e879e4a181567a3cb3 phpmyadmin-2.5.7.ebuild 2597
MD5 069d2a2a19bf52163dd8921042bd23e1 phpmyadmin-2.5.6.ebuild 2991
-MD5 d75e7ab09c88daa710d6b05b91e3ef72 ChangeLog 7668
+MD5 add65c15fc5fcb2ba15e7877f2ce53b1 ChangeLog 7775
MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
MD5 24d7b43b89dd98ad9968a2c78c2be68b phpmyadmin-2.5.6-r1.ebuild 2605
MD5 5367bc809b77e6374f18d126990fba75 files/digest-phpmyadmin-2.5.6 70
@@ -10,4 +10,4 @@ MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712
MD5 5367bc809b77e6374f18d126990fba75 files/digest-phpmyadmin-2.5.6-r1 70
-MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.6 3230
+MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
diff --git a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6 b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6
index 147c07f721b8..d5853baf01b4 100644
--- a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6
+++ b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6
@@ -16,7 +16,7 @@ CREATE DATABASE IF NOT EXISTS pmadb;
USE pmadb;
CREATE TABLE IF NOT EXISTS `PMA_bookmark` (
- `id` int(11) DEFAULT '0' NOT NULL auto_increment,
+ `id` int(11) DEFAULT NULL NOT NULL auto_increment,
`dbase` varchar(255) NOT NULL,
`user` varchar(255) NOT NULL,
`label` varchar(255) NOT NULL,
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild
index dfb08871e529..ef9d75145c63 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild,v 1.1 2004/06/27 11:31:40 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.7.ebuild,v 1.2 2004/06/27 11:37:11 twp Exp $
inherit eutils webapp
@@ -35,7 +35,7 @@ src_compile() {
sed -e "s/@pmapass@/${pmapass}/g" \
${T}/config.inc.php > config.inc.php
sed -e "s/@pmapass@/${pmapass}/g" \
- ${FILESDIR}/mysql-setup.sql.in-${PV} > ${T}/mysql-setup.sql
+ ${FILESDIR}/mysql-setup.sql.in-2.5.6 > ${T}/mysql-setup.sql
}
src_install() {