# HG changeset patch
# User Sylvain Thenault <sylvain.thenault@logilab.fr>
# Date 1229703730 -3600
# Node ID cb1f8a1d9d999558830644ef6b1ae7b66631e1ce
# Parent  26bd3a406889a69cf470fab756606097b842486b# Parent  716f178f293626aa10effc738b300fd5d718b84a
merge

diff -r 716f178f2936 -r cb1f8a1d9d99 __pkginfo__.py
--- a/__pkginfo__.py	Fri Dec 19 17:05:00 2008 +0100
+++ b/__pkginfo__.py	Fri Dec 19 17:22:10 2008 +0100
@@ -6,7 +6,7 @@
 distname = "cubicweb"
 modname = "cubicweb"
 
-numversion = (2, 99, 6)
+numversion = (2, 99, 7)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LCL'
diff -r 716f178f2936 -r cb1f8a1d9d99 debian/changelog
--- a/debian/changelog	Fri Dec 19 17:05:00 2008 +0100
+++ b/debian/changelog	Fri Dec 19 17:22:10 2008 +0100
@@ -1,3 +1,11 @@
+cubicweb (2.99.7-1) unstable; urgency=low
+
+  * remove buggy cubicweb-common.postinst
+  * replace erudi|ginco by cubicweb where necessary in existing instance
+  * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Fri, 19 Dec 2008 17:11:00 +0100
+
 cubicweb (2.99.6-1) DISTRIBUTION; urgency=low
 
   * new upstream release
diff -r 716f178f2936 -r cb1f8a1d9d99 debian/cubicweb-common.postinst
--- a/debian/cubicweb-common.postinst	Fri Dec 19 17:05:00 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#! /bin/sh -e
-
-if [ "$1" = configure ]; then
-    # XXX bw compat: erudi -> cubicweb migration
-    if [ -e "/usr/share/erudi/templates/" ]; then
-      # skip the "shared" subdirectory by moving it first, restoring it later
-      mv /usr/share/erudi/templates/shared /usr/share/erudi/
-      mv /usr/share/erudi/templates/* /usr/share/cubicweb/cubes/
-      mv /usr/share/erudi/shared /usr/share/erudi/templates
-      echo 'moved /usr/share/erudi/templates/* to /usr/share/cubicweb/cubes/'
-    fi
-fi 
-#DEBHELPER#
- 
-exit 0
diff -r 716f178f2936 -r cb1f8a1d9d99 debian/cubicweb-ctl.postinst
--- a/debian/cubicweb-ctl.postinst	Fri Dec 19 17:05:00 2008 +0100
+++ b/debian/cubicweb-ctl.postinst	Fri Dec 19 17:22:10 2008 +0100
@@ -15,6 +15,8 @@
     if [ -e "/etc/erudi.d/" ]; then
       mv /etc/erudi.d/* /etc/cubicweb.d/
       echo 'moved /etc/erudi.d/* to /etc/cubicweb.d/'
+      sed -i s/ginco/cubicweb/g /etc/*/*.py
+      sed -i s/erudi/cubicweb/ */*.conf
     fi
     if [ -e "/var/log/erudi/" ]; then
       mv /var/log/erudi/* /var/log/cubicweb/