# HG changeset patch # User Heiko Schlittermann (JUMPER) # Date 1316028767 -7200 # Node ID 4b1a3d9a3caed7632078c63e1a806d005242b4cc # Parent a170d243ea64a14757efe293ab5b9a631c2b6a50 now it should work for 2011091400. diff -r a170d243ea64 -r 4b1a3d9a3cae debian/changelog --- a/debian/changelog Wed Sep 14 15:59:31 2011 +0200 +++ b/debian/changelog Wed Sep 14 21:32:47 2011 +0200 @@ -1,3 +1,13 @@ +littlebird (2011091400-1) stable; urgency=low + + * dpkg-reconfigure littlebird-tc-core asks questions from -tc-common too + * fixed reconfigure bug + * no php5-cli dependency, set PATH to find the local zend php interpreter + * fixed postinst + * moved db files to /srv/www/littlebird/Database (needed for installation) + + -- Heiko Schlittermann Wed, 14 Sep 2011 16:47:31 +0200 + littlebird (2011091400-0) stable; urgency=low * new upstream 2011-09-14 diff -r a170d243ea64 -r 4b1a3d9a3cae debian/control --- a/debian/control Wed Sep 14 15:59:31 2011 +0200 +++ b/debian/control Wed Sep 14 21:32:47 2011 +0200 @@ -9,14 +9,14 @@ Package: littlebird-tc-common Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends} Description: littlebird trustcenter common files Package: littlebird-tc-core Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, littlebird-tc-common (>= ${source:Version}), +Depends: ${misc:Depends}, littlebird-tc-common (>= ${source:Version}), littlebird-tc-common (>= ${source:Version}), - zend-server-php-5.3, php-5.3-loader-zend-server, php5-cli, openssl, ucf + zend-server-php-5.3, php-5.3-loader-zend-server, openssl, ucf Recommends: littlebird-tc-sql (>= ${source:Version}) Provides: littlebird-tc Description: littlebird trustcenter core @@ -24,7 +24,7 @@ Package: littlebird-tc-sql Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, littlebird-tc-core (>= ${source:Version}), bash +Depends: ${misc:Depends}, littlebird-tc-core (>= ${source:Version}), bash Suggests: mysql-server Description: littlebird sql files This package contains the sql files for initializing or diff -r a170d243ea64 -r 4b1a3d9a3cae debian/littlebird-tc-core.config --- a/debian/littlebird-tc-core.config Wed Sep 14 15:59:31 2011 +0200 +++ b/debian/littlebird-tc-core.config Wed Sep 14 21:32:47 2011 +0200 @@ -1,5 +1,12 @@ #! /bin/sh set -e + +# on reconfigure we reconfigure the common package too, +# since currently it contains the db name etc… cleaner +# solution could be to duplicate the code from there to here +test "$1" = "reconfigure" \ + && `dirname $0`/littlebird-tc-common.config "$@" + . /usr/share/debconf/confmodule prefix=littlebird-tc diff -r a170d243ea64 -r 4b1a3d9a3cae debian/littlebird-tc-core.postinst --- a/debian/littlebird-tc-core.postinst Wed Sep 14 15:59:31 2011 +0200 +++ b/debian/littlebird-tc-core.postinst Wed Sep 14 21:32:47 2011 +0200 @@ -36,7 +36,7 @@ # not sure if this conforms to policy: changing another packages # config files if test -d /etc/php5/cli; then - echo "# linking php.ini to zend" >&2 + #echo "# linking php.ini to zend" >&2 ( set -e cd /etc/php5/cli s=/usr/local/zend/etc/conf.php.ini @@ -49,7 +49,7 @@ fi if test -d "/etc/php5/conf.d"; then - echo "# linkin other zend inis" >&2 + #echo "# linking other zend inis" >&2 ( set -e cd /etc/php5/conf.d for p in mysqli.ini curl.ini mcrypt.ini gd.ini diff -r a170d243ea64 -r 4b1a3d9a3cae debian/littlebird-tc-sql.install --- a/debian/littlebird-tc-sql.install Wed Sep 14 15:59:31 2011 +0200 +++ b/debian/littlebird-tc-sql.install Wed Sep 14 21:32:47 2011 +0200 @@ -1,1 +1,1 @@ -Database/. /usr/share/littlebird-tc/sql +Database /srv/www/littlebird/ diff -r a170d243ea64 -r 4b1a3d9a3cae debian/littlebird-tc-sql.postinst --- a/debian/littlebird-tc-sql.postinst Wed Sep 14 15:59:31 2011 +0200 +++ b/debian/littlebird-tc-sql.postinst Wed Sep 14 21:32:47 2011 +0200 @@ -66,13 +66,14 @@ FLUSH PRIVILEGES; EOF - if false; + if false; then /usr/share/littlebird-tc/sql/install_test_iteration_2011-06.sh \ --host "$host" --db "$name" \ --adminuser "$adminuser" --adminpass "$adminpass" \ --user "$user" --pass "$pass" fi - bash /srv/www/littlebird/TrustCenter/scripts/install_update_db.sh \ + env PATH=/usr/local/zend/bin:$PATH \ + bash /srv/www/littlebird/TrustCenter/scripts/install_update_db.sh \ "$adminuser" "$adminpass" # avoid stupid messages next time diff -r a170d243ea64 -r 4b1a3d9a3cae debian/patches/db-update --- a/debian/patches/db-update Wed Sep 14 15:59:31 2011 +0200 +++ b/debian/patches/db-update Wed Sep 14 21:32:47 2011 +0200 @@ -23,12 +23,13 @@ Reviewed-By: Last-Update: ---- littlebird-2011091400.orig/TrustCenter/scripts/install_update_db.sh -+++ littlebird-2011091400/TrustCenter/scripts/install_update_db.sh +--- a/TrustCenter/scripts/install_update_db.sh ++++ b/TrustCenter/scripts/install_update_db.sh @@ -1,6 +1,6 @@ -#!/bin/sh +-# cron script actual statistic +#!/bin/bash - # cron script actual statistic ++# need bash for bashism ZF_CONF=$(dirname `readlink -f $0`)/../zf_conf.sh source $ZF_CONF