patched the sql install script
authorHeiko Schlittermann (JUMPER) <hs@schlittermann.de>
Wed, 31 Aug 2011 12:01:21 +0200
changeset 4 60a9d558f2a9
parent 3 473e22d3230f
child 5 39695f73e414
child 9 26608f45a5c6
patched the sql install script
.hgignore
debian/changelog
debian/control
debian/patches/debian-changes-2011072500-8
debian/patches/series
debian/rules
--- a/.hgignore	Tue Aug 30 17:16:09 2011 +0200
+++ b/.hgignore	Wed Aug 31 12:01:21 2011 +0200
@@ -5,3 +5,11 @@
 debian/littlebird-tc-sql
 debian/littlebird.debhelper.log
 debian/littlebird.substvars
+.pc
+debian/littlebird-tc.debhelper.log
+debian/littlebird-tc.substvars
+debian/littlebird-tc/DEBIAN/control
+debian/littlebird-tc/DEBIAN/md5sums
+debian/littlebird-tc/usr/share/doc/littlebird-tc/README.Debian
+debian/littlebird-tc/usr/share/doc/littlebird-tc/changelog.Debian.gz
+debian/littlebird-tc/usr/share/doc/littlebird-tc/copyright
--- a/debian/changelog	Tue Aug 30 17:16:09 2011 +0200
+++ b/debian/changelog	Wed Aug 31 12:01:21 2011 +0200
@@ -1,3 +1,9 @@
+littlebird (2011072500-8) stable; urgency=low
+
+  * fixed db installation script 
+
+ -- Heiko Schlittermann <hs@schlittermann.de>  Wed, 31 Aug 2011 11:43:35 +0200
+
 littlebird (2011072500-7) stable; urgency=low
 
   * improved dependencies 
--- a/debian/control	Tue Aug 30 17:16:09 2011 +0200
+++ b/debian/control	Wed Aug 31 12:01:21 2011 +0200
@@ -2,7 +2,7 @@
 Section: unknown
 Priority: extra
 Maintainer: Heiko Schlittermann <hs@schlittermann.de>
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 7.0.50~), rsync, bash
 Standards-Version: 3.8.4
 Homepage: <insert the upstream URL, if relevant>
 #Vcs-Git: git://git.debian.org/collab-maint/littlebird.git
@@ -11,7 +11,7 @@
 Package: littlebird-tc
 Architecture: all
 Depends: littlebird-tc-core
-Description: The Little Bird Trust Center
+Description: the littlebird trust center
 Replaces: littlebird (<< ${source:Version})
 Breaks: littlebird (<< ${source:Version})
 
@@ -21,12 +21,13 @@
 Description: littlebird trustcenter common files
 
 Package: littlebird-tc-core
-Architecture: any
+Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, littlebird-tc-common (>= ${source:Version}), 
-	littlebird-tc-common (>= ${source:Version}), zend-server-php-5.3, php-5.3-loader-zend-server
+	littlebird-tc-common (>= ${source:Version}), 
+	zend-server-php-5.3, php-5.3-loader-zend-server, bash
 Recommends: littlebird-tc-sql (>= ${source:Version})
 Description: littlebird trustcenter core
- This is the trustcenter package for little bird.
+ This is the trustcenter package for littlebird.
 
 Package: littlebird-tc-sql
 Architecture: all
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/debian-changes-2011072500-8	Wed Aug 31 12:01:21 2011 +0200
@@ -0,0 +1,165 @@
+Description: Upstream changes introduced in version 2011072500-8
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ littlebird (2011072500-8) stable; urgency=low
+ .
+   * fixed db installation script
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Heiko Schlittermann <hs@schlittermann.de>
+
+---
+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: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- littlebird-2011072500.orig/LittleBird/encoded/LittleBird-Test/Database/install_test_iteration_2011-06.sh
++++ littlebird-2011072500/LittleBird/encoded/LittleBird-Test/Database/install_test_iteration_2011-06.sh
+@@ -1,66 +1,90 @@
+ #!/bin/bash
++# leichte Anpassungen durch hs@schlittermann.de
++# Aufruf wie immer, dann werden die bisherigen Angaben *root* und das bisherige
++# Passwort verwendet. Oder
++# install_test_iteration_2011-06.sh DB_HOST DB_NAME DB_ADMIN DB_ADMINPASS DB_USER DB_USERPASS
++
++# ACHTUNG: DIE DATENBANK WIRD KOMPLETT GEERDET!
+ 
+ #DB Update Dev - Test,
+ #Iteration Mai, Juni
+ 
+ #Test Stand vor der Iteration
++DB_HOST=${1-localhost}; shift
++DB_NAME=${1-trustcenter_history_test}; shift
++
++DB_ADMIN=${1-root}; shift
++DB_ADMINPASS=${1-Pa55w0rd}; shift
+ 
++DB_USER=${1-$DB_ADMIN}; shift
++DB_USERPASS=${1-$DB_ADMINPASS}; shift
+ 
+-mysql -u root -pPa55w0rd --default-character-set=utf8 < install_dev_tc_2011-04-30_023.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_install_dev_tc_2011-04-30_023.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_002_install_dev_tc_2011-04-30_023.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_003_install_dev_tc_2011-04-30_023.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_004_install_dev_tc_2011-04-30_023.sql
+-
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_024.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_025.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_026.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_027.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_028.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_029.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_030.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_031.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_032.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_033.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_034.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_035.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_036.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_037.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-04-30_038.sql
++#echo "$DB_ADMIN $DB_ADMINPASS $DB_NAME"
++#echo "$DB_USER $DB_USERPASS $DB_NAME"
++
++fix_db_name() { sed "s/trustcenter_history_test/$DB_NAME/g"; }
++mysql() { fix_db_name | command mysql "$@" -h"$DB_HOST" -D"$DB_NAME" --default-character-set=utf8; }
++mysql_as_admin() { echo "as admin: $1"; <"$1" mysql -u "$DB_ADMIN" -p"$DB_ADMINPASS"; }
++mysql_as_user()  { echo "as user:  $1"; <"$1" mysql -u "$DB_USER"  -p"$DB_USERPASS"; }
++
++mysql_as_admin install_dev_tc_2011-04-30_023.sql
++mysql_as_admin update_install_dev_tc_2011-04-30_023.sql
++
++
++mysql_as_user update_002_install_dev_tc_2011-04-30_023.sql
++mysql_as_user update_003_install_dev_tc_2011-04-30_023.sql
++mysql_as_user update_004_install_dev_tc_2011-04-30_023.sql
++mysql_as_user update_trustcenter_history_2011-04-30_024.sql
++
++mysql_as_admin update_trustcenter_history_2011-04-30_025.sql
++mysql_as_admin update_trustcenter_history_2011-04-30_026.sql
++
++mysql_as_user update_trustcenter_history_2011-04-30_027.sql
++mysql_as_admin update_trustcenter_history_2011-04-30_028.sql
++mysql_as_user update_trustcenter_history_2011-04-30_029.sql
++mysql_as_user update_trustcenter_history_2011-04-30_030.sql
++mysql_as_user update_trustcenter_history_2011-04-30_031.sql
++mysql_as_admin update_trustcenter_history_2011-04-30_032.sql
++mysql_as_admin update_trustcenter_history_2011-04-30_033.sql
++mysql_as_admin update_trustcenter_history_2011-04-30_034.sql
++mysql_as_user update_trustcenter_history_2011-04-30_035.sql
++mysql_as_admin update_trustcenter_history_2011-04-30_036.sql
++mysql_as_user update_trustcenter_history_2011-04-30_037.sql
++mysql_as_user update_trustcenter_history_2011-04-30_038.sql
+ 
+ #Todo update - 06-2011
+ 
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-06-30_001.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-06-30_002.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < update_trustcenter_history_2011-06-30_003.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_1112.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_1152.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_1116.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_1163.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-07-31_652.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_1144.sql
++mysql_as_admin update_trustcenter_history_2011-06-30_001.sql
++mysql_as_user update_trustcenter_history_2011-06-30_002.sql
++mysql_as_user update_trustcenter_history_2011-06-30_003.sql
++mysql_as_user 2011-06-30_1112.sql
++mysql_as_user 2011-06-30_1152.sql
++mysql_as_user 2011-06-30_1116.sql
++mysql_as_admin 2011-06-30_1163.sql
++mysql_as_user 2011-07-31_652.sql
++mysql_as_user 2011-06-30_1144.sql
+ 
+ #cryptKey + editorID set
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_627.sql
++mysql_as_admin 2011-06-30_627.sql
+ 
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_910_909.sql
++mysql_as_admin 2011-06-30_910_909.sql
+ 
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_document_premerge.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_task1157_betreuungsvertrag_V2.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_task1155_betreuungsvertragTP_V2.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_task1101_einzugsermaechtigung_V2.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_task1125_betreuungsgebuehr_V2.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_task1098_aerztlicheVollmacht_V2.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_task1100_abholberechtigung_V2.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_acl_calc.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_1168.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_1186.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_task1208_textbausteine_sortierbar.sql
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_task1223_rechtliches_sonstiges.sql
++mysql_as_user 2011-06-30_document_premerge.sql
++mysql_as_user 2011-06-30_task1157_betreuungsvertrag_V2.sql
++mysql_as_user 2011-06-30_task1155_betreuungsvertragTP_V2.sql
++mysql_as_user 2011-06-30_task1101_einzugsermaechtigung_V2.sql
++mysql_as_user 2011-06-30_task1125_betreuungsgebuehr_V2.sql
++mysql_as_user 2011-06-30_task1098_aerztlicheVollmacht_V2.sql
++mysql_as_user 2011-06-30_task1100_abholberechtigung_V2.sql
++mysql_as_user 2011-06-30_acl_calc.sql
++mysql_as_admin 2011-06-30_1168.sql
++mysql_as_admin 2011-06-30_1186.sql
++mysql_as_user 2011-06-30_task1208_textbausteine_sortierbar.sql
++mysql_as_user 2011-06-30_task1223_rechtliches_sonstiges.sql
+ 
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_1182.sql
++mysql_as_user 2011-06-30_1182.sql
+ 
+ #cryptKey + editorID set
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_update_heidenau_fees.sql
++mysql_as_user 2011-06-30_update_heidenau_fees.sql
+ 
+-mysql -u root -pPa55w0rd -Dtrustcenter_history_test --default-character-set=utf8 < 2011-06-30_allg_db_update.sql
++mysql_as_admin 2011-06-30_allg_db_update.sql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/series	Wed Aug 31 12:01:21 2011 +0200
@@ -0,0 +1,1 @@
+debian-changes-2011072500-8
--- a/debian/rules	Tue Aug 30 17:16:09 2011 +0200
+++ b/debian/rules	Wed Aug 31 12:01:21 2011 +0200
@@ -10,6 +10,7 @@
 #export DH_VERBOSE=1
 
 SHELL=/bin/bash
+
 core=debian/littlebird-tc-core
 sql=debian/littlebird-tc-sql
 
@@ -25,9 +26,5 @@
 	install -d -m 0755 ${sql}/usr/share/littlebird/tc-sql/
 	rsync -a LittleBird/encoded/LittleBird-Test/Database/ ${sql}/usr/share/littlebird/tc-sql/
 
-
-override_dh_strip:
-	true
-
-override_dh_shlibdeps:
-	true
+override_dh_strip: ; true
+override_dh_shlibdeps: ; true