Fix reconfig script wrt bug #104495.
authorRenat Lumpau <rl03@gentoo.org>
Fri, 2 Sep 2005 11:09:14 +0000 (11:09 +0000)
committerRenat Lumpau <rl03@gentoo.org>
Fri, 2 Sep 2005 11:09:14 +0000 (11:09 +0000)
Package-Manager: portage-2.0.51.22-r2

dev-db/phpmyadmin/ChangeLog
dev-db/phpmyadmin/Manifest
dev-db/phpmyadmin/files/reconfig

index 98a3276e4130bb4618a647c19de6998c7c01ded9..47f73b4c6c8a13fe35c820dc5caa211fb718ba45 100644 (file)
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.120 2005/08/30 20:01:01 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.121 2005/09/02 11:09:14 rl03 Exp $
+
+  02 Sep 2005; Renat Lumpau <rl03@gentoo.org> files/reconfig:
+  Fix reconfig script wrt bug #104495.
 
   30 Aug 2005; Renat Lumpau <rl03@gentoo.org> -phpmyadmin-2.6.2-r2.ebuild,
   -phpmyadmin-2.6.3_p1.ebuild:
index 873d7a57deca071545a185b1472f4a591bc5903f..cc83125a226f189225aa0cc2b3dd2f73c2085bcf 100644 (file)
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 MD5 9c32ebccf18915d5520cc69c20bc677b phpmyadmin-2.6.4_rc1.ebuild 2084
-MD5 e914be58c1fb53acd24035c81518701c ChangeLog 16985
+MD5 8b034db5fa617230282c62561b50d70b ChangeLog 17087
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 MD5 cf627de1acb2efda0af3d42a61305df2 files/digest-phpmyadmin-2.6.4_rc1 74
 MD5 4f79e26c8e5060be5dd522af91639d9b files/postinstall-en.txt 511
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
-MD5 c77590e1a3a629c248e58081d2363d5b files/reconfig 314
+MD5 a7201a857705dfcec9502fc7dd3a96db files/reconfig 315
 MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDFLsXEzitwsaoONoRAuB1AJ4mYs92FY8WenA0KchpWFYeTans0gCfTD+c
-2GKWcAc9Yy+NCfYmHttkNDg=
-=5Fv4
+iD8DBQFDGDL0EzitwsaoONoRAn0bAJ92GIGeGtKyEa6jnXC20uf5L+lE4QCfXuct
+7gEcqXfVapW5bR0aHZJBszc=
+=5o5I
 -----END PGP SIGNATURE-----
index 675fc41f1fe20541a5470b2f80562fba22d1e87a..dccd10442f739b3d56efaf6e81945eb0bf376bf3 100644 (file)
@@ -9,7 +9,7 @@ die() {
 
 if [ $1 = "install" ]; then
        cd ${MY_INSTALLDIR}
-       sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}${VHOST_APPDIR}';|g" -i config.inc.php || die "sed failed"
+       sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}/${VHOST_APPDIR}';|g" -i config.inc.php || die "sed failed"
 
 elif [ $1 = "clean" ]; then
        echo $1