[interchange-cvs] interchange - racke modified 3 files

[interchange-core@icdevgroup.org]

User:      racke
Date:      2002-12-16 18:03:38 GMT
Modified:  debian   interchange.cfg interchange.dirs
Modified:           interchange.postinst
Log:
directory designed for adding/removing catalogs from packages introduced

Revision  Changes    Path
2.7       +4 -1      interchange/debian/interchange.cfg


rev 2.7, prev_rev 2.6
Index: interchange.cfg
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.cfg,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -r2.6 -r2.7
--- interchange.cfg	11 Aug 2002 16:54:20 -0000	2.6
+++ interchange.cfg	16 Dec 2002 18:03:38 -0000	2.7
@@ -38,10 +38,13 @@
 
 #========================================================================#
 
-# Read catalog definitions from separate file
+# Read catalog definitions from two different locations:
+# - catalogs.cfg is for custom catalogs
+# - catalog.d/*.cfg is for catalogs installed by Debian packages
 # Only catalogs listed there are handled by the expiry cron job
 
 include /etc/interchange/catalogs.cfg
+include /var/lib/interchange/catalog.d/*.cfg
 
 #========================================================================#
 



2.2       +1 -0      interchange/debian/interchange.dirs


rev 2.2, prev_rev 2.1
Index: interchange.dirs
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.dirs,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- interchange.dirs	6 Dec 2001 16:15:28 -0000	2.1
+++ interchange.dirs	16 Dec 2002 18:03:38 -0000	2.2
@@ -4,6 +4,7 @@
 usr/lib/interchange/etc
 usr/sbin
 usr/share/man/man1
+var/lib/interchange/catalog.d
 var/lib/interchange/catalogs
 var/log/interchange
 var/run/interchange



2.10      +2 -1      interchange/debian/interchange.postinst


rev 2.10, prev_rev 2.9
Index: interchange.postinst
===================================================================
RCS file: /anon_cvs/repository/interchange/debian/interchange.postinst,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -r2.9 -r2.10
--- interchange.postinst	6 Dec 2001 16:15:54 -0000	2.9
+++ interchange.postinst	16 Dec 2002 18:03:38 -0000	2.10
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+# Copyright 2001,2002 by Stefan Hornburg (Racke) <racke@linuxia.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -57,6 +57,7 @@
 # More permissions
 
 chown -R $USER.$GROUP /etc/interchange/usertag
+chown -R $USER.$GROUP /var/lib/interchange/catalog.d
 
 # Record debconf configuration in multiple files
 # 1. Stuff needed for the init script