[interchange-cvs] interchange - racke modified 3 files

[interchange-core@interchange.redhat.com]

User:      racke
Date:      2002-05-21 22:16:16 GMT
Modified:  .        Tag: STABLE_4_8-branch WHATSNEW
Modified:  debian   Tag: STABLE_4_8-branch changelog
Modified:           interchange-ui.postinst
Log:
Check for demo catalog added in interchange-ui's postinst (fixes Debian
bug #147705). Fixes inaccesible demo catalog if only interchange-ui is
upgraded.

Revision  Changes    Path
No                   revision



No                   revision



2.6.2.58  +4 -0      interchange/WHATSNEW


rev 2.6.2.58, prev_rev 2.6.2.57
Index: WHATSNEW
===================================================================
RCS file: /anon_cvs/repository/interchange/WHATSNEW,v
retrieving revision 2.6.2.57
retrieving revision 2.6.2.58
diff -u -r2.6.2.57 -r2.6.2.58
--- WHATSNEW	21 May 2002 20:48:36 -0000	2.6.2.57
+++ WHATSNEW	21 May 2002 22:16:16 -0000	2.6.2.58
@@ -59,6 +59,10 @@
   not starting it after install anyway. Administrator should decide whether
   to do those things.
 
+* Check for demo catalog added in interchange-ui's postinst (fixes Debian
+  bug #147705). Fixes inaccesible demo catalog if only interchange-ui is
+  upgraded.
+
 * Turned Depends of the libapache-mod-interchange Debian package on 
   interchange into a Suggests, thanks to Christopher F. Miller 
   <cfm.maine.com> for the suggestion.



No                   revision



No                   revision



2.10.2.27 +2 -0      interchange/debian/changelog


rev 2.10.2.27, prev_rev 2.10.2.26
Index: changelog
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/changelog,v
retrieving revision 2.10.2.26
retrieving revision 2.10.2.27
diff -u -r2.10.2.26 -r2.10.2.27
--- changelog	21 May 2002 10:47:19 -0000	2.10.2.26
+++ changelog	21 May 2002 22:16:16 -0000	2.10.2.27
@@ -1,6 +1,8 @@
 interchange (4.8.6-0.1) unstable; urgency=low
 
   * new upstream release
+  * check for demo catalog added in interchange-ui's postinst 
+    (Closes: #147705) 
   * turned Depends of libapache-mod-interchange on interchange into a
     Suggests (interchange might be running on a remote host), thanks to
     Christopher F.Miller <cfm.maine.com> for the suggestion



2.3.2.1   +12 -1     interchange/debian/interchange-ui.postinst


rev 2.3.2.1, prev_rev 2.3
Index: interchange-ui.postinst
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange-ui.postinst,v
retrieving revision 2.3
retrieving revision 2.3.2.1
diff -u -r2.3 -r2.3.2.1
--- interchange-ui.postinst	13 Aug 2001 09:38:29 -0000	2.3
+++ interchange-ui.postinst	21 May 2002 22:16:16 -0000	2.3.2.1
@@ -20,9 +20,20 @@
 # Source debconf library
 . /usr/share/debconf/confmodule
 
+# Check for installed foundation demo catalog and set configuration
+# variable accordingly
+
+USE_FOUNDATION=
+if dpkg --status interchange-cat-foundation 2>/dev/null | grep -q '^Status: .* installed$'; then
+	db_get interchange-cat-foundation/install
+	if [ "$RET" = "true" ]; then
+		USE_FOUNDATION=1
+	fi
+fi
+
 db_get interchange-ui/defaultlocale
 UI_LOCALE=$RET
-/usr/sbin/interchangeconfig UI=1 UI_LOCALE=$UI_LOCALE
+/usr/sbin/interchangeconfig UI=1 UI_LOCALE=$UI_LOCALE USE_FOUNDATION=$USE_FOUNDATION
 
 #DEBHELPER#