Clarified upgrade instructions

Package-Manager: portage-2.1

3 files changed, 22 insertions, 17 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index 3f80fae42cac..83f1e9acb154 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.38 2006/06/22 23:01:05 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.39 2006/06/30 07:23:46 rl03 Exp $
+
+  30 Jun 2006; Renat Lumpau <rl03@gentoo.org> files/3.4.5/reconfig:
+  Clarified upgrade instructions
 
   22 Jun 2006; Renat Lumpau <rl03@gentoo.org> files/3.4.5/reconfig:
   Clarify postupgrade instructions
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 302c0269a636..d720cc18e488 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -13,10 +13,10 @@ AUX 3.4.5/postinstall-en.txt 703 RMD160 5bddbc2097afd96da1ff2993befdb1c8b27769ef
 MD5 c915d8b7646d69d0dc32fae2bfaf298a files/3.4.5/postinstall-en.txt 703
 RMD160 5bddbc2097afd96da1ff2993befdb1c8b27769ef files/3.4.5/postinstall-en.txt 703
 SHA256 497e75437529d61f69b628b0f7ab4ffa51dd0be9292220e657c4148345ab5a35 files/3.4.5/postinstall-en.txt 703
-AUX 3.4.5/reconfig 1340 RMD160 1fc810e64576df621b239cbb9ebbb66352d0a89a SHA1 378bfbe48848e6d24230f8cfc273e906311206ed SHA256 2192a89ccd36a9fa8e30cacea80d7a014dc5bdddc69d34f4dae9027260fbd465
-MD5 377ea82bca578a2250aa7eac263aef24 files/3.4.5/reconfig 1340
-RMD160 1fc810e64576df621b239cbb9ebbb66352d0a89a files/3.4.5/reconfig 1340
-SHA256 2192a89ccd36a9fa8e30cacea80d7a014dc5bdddc69d34f4dae9027260fbd465 files/3.4.5/reconfig 1340
+AUX 3.4.5/reconfig 1585 RMD160 7f925ed321ec02f42cd1f8fe2c6b962961769e17 SHA1 3743d1cbf640cb7295559ae294934e2626cda2ec SHA256 dc54bf257e1ab8eecffdc4941744d4f7eb11691ef02ea5235f5c3ffd3cec9a0a
+MD5 1f4f355f90c4bb2e937c944730120d35 files/3.4.5/reconfig 1585
+RMD160 7f925ed321ec02f42cd1f8fe2c6b962961769e17 files/3.4.5/reconfig 1585
+SHA256 dc54bf257e1ab8eecffdc4941744d4f7eb11691ef02ea5235f5c3ffd3cec9a0a files/3.4.5/reconfig 1585
 AUX config.layout-gentoo 616 RMD160 5a67ad1cb45ad067f66c5348acfedc45841ab252 SHA1 67e1d7d24b4593f5a2301cf5584cb83109c6a497 SHA256 edf9ae9b820a072cacf2bc6f43b3147d746037ba299265c62bcfafb50be06759
 MD5 4dcfdbf63b882b398473d975b34fa23e files/config.layout-gentoo 616
 RMD160 5a67ad1cb45ad067f66c5348acfedc45841ab252 files/config.layout-gentoo 616
@@ -60,10 +60,10 @@ EBUILD rt-3.6.0.ebuild 6530 RMD160 b0fd586429aa771c70553bed7715d01996f841a9 SHA1
 MD5 4a4dae6a622c7c4646bb6da77d34d1ae rt-3.6.0.ebuild 6530
 RMD160 b0fd586429aa771c70553bed7715d01996f841a9 rt-3.6.0.ebuild 6530
 SHA256 bef9411b9b0ebbd905e2131701732546df2c06fd0daf9ed6ec2ca5f5e1ccfdc5 rt-3.6.0.ebuild 6530
-MISC ChangeLog 6119 RMD160 bed4276ea66ef087244edbff7f4d34de5cd752b2 SHA1 b4ec047a2da7ed74f09794d9b43b0272e2ef0915 SHA256 9daaca999f54e1655725892ac46ccec791c5c08d9dacd8b98b0b4c917e8f2099
-MD5 b7528a1461d96bb99752bcb14c335fab ChangeLog 6119
-RMD160 bed4276ea66ef087244edbff7f4d34de5cd752b2 ChangeLog 6119
-SHA256 9daaca999f54e1655725892ac46ccec791c5c08d9dacd8b98b0b4c917e8f2099 ChangeLog 6119
+MISC ChangeLog 6221 RMD160 c8c8e27e4075e0b0dca35ae79f2a200fe17aefe8 SHA1 0485f604867a22e46bc3bfa036fd97c2730bde58 SHA256 54e412a75899d483777bef109abfb4a56093ba216354e1d53c8f35087ecac453
+MD5 a3167fef57fd5c9744ddad9efe6f4fde ChangeLog 6221
+RMD160 c8c8e27e4075e0b0dca35ae79f2a200fe17aefe8 ChangeLog 6221
+SHA256 54e412a75899d483777bef109abfb4a56093ba216354e1d53c8f35087ecac453 ChangeLog 6221
 MISC metadata.xml 221 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 SHA1 0f301c536f2b097bd3ff21cc1dd05fe6d8f4713e SHA256 e9d20baa1edc4def48ad57c9620d3d0ee361888408261619ff9ea9edb47ce67a
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 metadata.xml 221
@@ -80,7 +80,7 @@ SHA256 dc83845cea9294ef43c9f083452de339d1ad32c8d089c0bb1b921fcad9aba4ba files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEmx8bEzitwsaoONoRAgQFAKDOsks4BLK6vRT+SVxtF52sFCAFLACfbpUy
-PvAMF2BURjY/ZJ9IR/dmGi8=
-=GfBs
+iD8DBQFEpNGCEzitwsaoONoRAv7cAJ4kCAlcmUhBqoi8Ry7TJpKyJMRs0wCgkON4
+k3X4oiNgxSe3eaxSGJdZJBI=
+=2jDq
 -----END PGP SIGNATURE-----
diff --git a/www-apps/rt/files/3.4.5/reconfig b/www-apps/rt/files/3.4.5/reconfig
index 583b511a73b7..3c0153013985 100644
--- a/www-apps/rt/files/3.4.5/reconfig
+++ b/www-apps/rt/files/3.4.5/reconfig
@@ -19,12 +19,14 @@ if [ $1 = "install" ]; then
 
 	# check for upgrades
 	cd ${VHOST_ROOT}/${PF}/upgrade
-	echo "You may need to update your database."
-	echo "For each item in the output below"
+	echo "You may need to update your database. For each item in the output below"
 	echo "whose name is greater than your previously installed RT version,"
-	echo "${VHOST_ROOT}/${PF}/sbin/rt-setup-database --action schema --datadir ${VHOST_ROOT}/${PF}/upgrade/<version> --prompt-for-dba-password"
-	echo "${VHOST_ROOT}/${PF}/sbin/rt-setup-database --action acl --datadir ${VHOST_ROOT}/${PF}/upgrade/<version> -prompt-for-dba-password"
-	echo "${VHOST_ROOT}/${PF}/sbin/rt-setup-database --action insert --datadir ${VHOST_ROOT}/${PF}/upgrade/<version> -prompt-for-dba-password"
+	echo "run the following commands, specifying YOUR_DBA_USER:"
+	echo "${VHOST_ROOT}/${PF}/sbin/rt-setup-database --action schema --datadir ${VHOST_ROOT}/${PF}/upgrade/<version> --dba YOUR_DBA_USER --prompt-for-dba-password"
+	echo "${VHOST_ROOT}/${PF}/sbin/rt-setup-database --action acl --datadir ${VHOST_ROOT}/${PF}/upgrade/<version> --dba YOUR_DBA_USER -prompt-for-dba-password"
+	echo "${VHOST_ROOT}/${PF}/sbin/rt-setup-database --action insert --datadir ${VHOST_ROOT}/${PF}/upgrade/<version> --dba YOUR_DBA_USER --prompt-for-dba-password"
+	echo "Note that some upgrade directories don't have all 3 items (schema, acl, insert)"
+	echo "You can skip missing items safely"
 	echo "Don't forget to read the online installation guide for more details"
 	ls