# HG changeset patch # User Heiko Schlittermann (JUMPER) # Date 1316029086 -7200 # Node ID 530cd948fc9686373bc58101bd9bed66c172b717 # Parent 5b5c6e1dfbdde4f0d55041514bcccb1b16c7f000# Parent f3a26a99d605b9ff25beccec403f7e9e60411e9b [merged] diff -r 5b5c6e1dfbdd -r 530cd948fc96 .hgignore --- a/.hgignore Mon Sep 05 12:58:30 2011 +0200 +++ b/.hgignore Wed Sep 14 21:38:06 2011 +0200 @@ -1,5 +1,10 @@ syntax: glob -LittleBird +TrustCenter +CA +Database +3rdparty +RestInterface +library debian/files debian/littlebird-tc-common debian/littlebird-tc-core diff -r 5b5c6e1dfbdd -r 530cd948fc96 .hgsigs --- a/.hgsigs Mon Sep 05 12:58:30 2011 +0200 +++ b/.hgsigs Wed Sep 14 21:38:06 2011 +0200 @@ -5,3 +5,4 @@ c4903cbeddc76733a0dbc5f25907773cec45a279 0 iEYEABECAAYFAk5hUcgACgkQ7k6smEjQNZsrBgCfXQS9uSu0uDV5Ktj9Q40HSvjdXb0AoLiB8SQaf7Qa3xzQ/fSjwNrhJdZ4 3efac7ee90b26e41f84f01c25b393beb538049c7 0 iEYEABECAAYFAk5hUqoACgkQ7k6smEjQNZvLiACgkGLqWJYXQmZqXNXLXPxkIAEJ8L0AnAqFtMP8YUdWxkjlZ2KBMfjoGgY4 f8bef62d47cf6ea8709b1307cf62caa0f4325a68 0 iEYEABECAAYFAk5kq1IACgkQ7k6smEjQNZvxKQCghAnGqnRu/Efn7BjbGEt9/npoujEAn1fMTelxZ9az4sTwydkeyHJ4I/KT +5eb448cd4650748ebf9643699395d0f811c61ea1 0 iEYEABECAAYFAk5xAlMACgkQ7k6smEjQNZvQYgCfdMG5rtXfAFnt/IrA9RndSR1rM4sAn1ewvr/9vmvf6R3vCCqkz59ioB/Z diff -r 5b5c6e1dfbdd -r 530cd948fc96 .hgtags --- a/.hgtags Mon Sep 05 12:58:30 2011 +0200 +++ b/.hgtags Wed Sep 14 21:38:06 2011 +0200 @@ -6,3 +6,4 @@ df69658ab757f7c409d366a9a24aa2a2e93ba26d deb-*-54 9aecae1cb9c5d3fa27f0fc4a0224b4f96606b5ce deb-*-55 0ef5fae55351de5e40f3a3a6ddb9ad67cc4e4d79 deb-*-57 +4b1a3d9a3caed7632078c63e1a806d005242b4cc littlebird-2011091400-1 diff -r 5b5c6e1dfbdd -r 530cd948fc96 debian/changelog --- a/debian/changelog Mon Sep 05 12:58:30 2011 +0200 +++ b/debian/changelog Wed Sep 14 21:38:06 2011 +0200 @@ -1,3 +1,19 @@ +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 + + -- Heiko Schlittermann Wed, 14 Sep 2011 14:40:56 +0200 + littlebird (2011072500-57) stable; urgency=low * fixed core postrm diff -r 5b5c6e1dfbdd -r 530cd948fc96 debian/control --- a/debian/control Mon Sep 05 12:58:30 2011 +0200 +++ b/debian/control Wed Sep 14 21:38:06 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,8 +24,9 @@ Package: littlebird-tc-sql Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, mysql-client, littlebird-tc-common (>= ${source:Version}) +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 - updating the trustcenter database + updating the trustcenter database. Install it on one of your trustcenter + servers only. diff -r 5b5c6e1dfbdd -r 530cd948fc96 debian/littlebird-tc-core.config --- a/debian/littlebird-tc-core.config Mon Sep 05 12:58:30 2011 +0200 +++ b/debian/littlebird-tc-core.config Wed Sep 14 21:38:06 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 5b5c6e1dfbdd -r 530cd948fc96 debian/littlebird-tc-core.install --- a/debian/littlebird-tc-core.install Mon Sep 05 12:58:30 2011 +0200 +++ b/debian/littlebird-tc-core.install Wed Sep 14 21:38:06 2011 +0200 @@ -1,2 +1,2 @@ -LittleBird/encoded/LittleBird-Test/{CA,library,TrustCenter} /srv/www/littlebird +{CA,library,TrustCenter,RestInterface} /srv/www/littlebird debian/examples/apache /usr/share/doc/littlebird-tc/examples diff -r 5b5c6e1dfbdd -r 530cd948fc96 debian/littlebird-tc-core.postinst --- a/debian/littlebird-tc-core.postinst Mon Sep 05 12:58:30 2011 +0200 +++ b/debian/littlebird-tc-core.postinst Wed Sep 14 21:38:06 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 5b5c6e1dfbdd -r 530cd948fc96 debian/littlebird-tc-sql.install --- a/debian/littlebird-tc-sql.install Mon Sep 05 12:58:30 2011 +0200 +++ b/debian/littlebird-tc-sql.install Wed Sep 14 21:38:06 2011 +0200 @@ -1,1 +1,1 @@ -LittleBird/encoded/LittleBird-Test/Database/. /usr/share/littlebird-tc/sql +Database /srv/www/littlebird/ diff -r 5b5c6e1dfbdd -r 530cd948fc96 debian/littlebird-tc-sql.postinst --- a/debian/littlebird-tc-sql.postinst Mon Sep 05 12:58:30 2011 +0200 +++ b/debian/littlebird-tc-sql.postinst Wed Sep 14 21:38:06 2011 +0200 @@ -61,15 +61,20 @@ # create or update the user _mysql < + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- 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 ++# need bash for bashism + ZF_CONF=$(dirname `readlink -f $0`)/../zf_conf.sh + source $ZF_CONF + +-$ZEND_PROJECT_PATH/zf.sh database update root L1ttleB1rd ++$ZEND_PROJECT_PATH/zf.sh database update ${1-root} ${2-L1ttleB1rd} diff -r 5b5c6e1dfbdd -r 530cd948fc96 debian/patches/series --- a/debian/patches/series Mon Sep 05 12:58:30 2011 +0200 +++ b/debian/patches/series Wed Sep 14 21:38:06 2011 +0200 @@ -1,4 +1,1 @@ -debian-changes-2011072500-8 -debian-changes-2011072500-14 -debian-changes-2011072500-17 -debian-changes-2011072500-18 +db-update