Merge lp:~maria-captains/ourdelta/ourdelta-mariadb51-2-montyprogram-fixes into lp:~ourdelta-core/ourdelta/ourdelta-mariadb51-2

Proposed by Kristian Nielsen
Status: Merged
Merged at revision: not available
Proposed branch: lp:~maria-captains/ourdelta/ourdelta-mariadb51-2-montyprogram-fixes
Merge into: lp:~ourdelta-core/ourdelta/ourdelta-mariadb51-2
Diff against target: 31 lines
1 file modified
bakery/debian-5.1/dist/Debian/mariadb-server-5.1.files (+24/-0)
To merge this branch: bzr merge lp:~maria-captains/ourdelta/ourdelta-mariadb51-2-montyprogram-fixes
Reviewer Review Type Date Requested Status
OurDelta-core Pending
Review via email: mp+14222@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Kristian Nielsen (knielsen) wrote :

More Debian fixes.
With these fixes, Debian 5 i386 builds, installs, and upgrades (from mysql 5.0) correctly.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bakery/debian-5.1/dist/Debian/mariadb-server-5.1.files'
--- bakery/debian-5.1/dist/Debian/mariadb-server-5.1.files 2009-10-30 08:33:30 +0000
+++ bakery/debian-5.1/dist/Debian/mariadb-server-5.1.files 2009-10-30 15:05:20 +0000
@@ -64,3 +64,27 @@
64usr/share/mysql/mysql_system_tables_data.sql64usr/share/mysql/mysql_system_tables_data.sql
65usr/share/mysql/mysql_system_tables.sql65usr/share/mysql/mysql_system_tables.sql
66usr/share/mysql/mysql_test_data_timezone.sql66usr/share/mysql/mysql_test_data_timezone.sql
67usr/share/mysql/charsets
68usr/share/mysql/czech
69usr/share/mysql/danish
70usr/share/mysql/dutch
71usr/share/mysql/english
72usr/share/mysql/estonian
73usr/share/mysql/french
74usr/share/mysql/german
75usr/share/mysql/greek
76usr/share/mysql/hungarian
77usr/share/mysql/italian
78usr/share/mysql/japanese
79usr/share/mysql/korean
80usr/share/mysql/norwegian
81usr/share/mysql/norwegian-ny
82usr/share/mysql/polish
83usr/share/mysql/portuguese
84usr/share/mysql/romanian
85usr/share/mysql/russian
86usr/share/mysql/serbian
87usr/share/mysql/slovak
88usr/share/mysql/spanish
89usr/share/mysql/swedish
90usr/share/mysql/ukrainian

Subscribers

People subscribed via source and target branches