OurDelta

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

  1. ourdelta-mariadb51-2-montyprogram-fixes
  2. Merge into 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
1=== modified file 'bakery/debian-5.1/dist/Debian/mariadb-server-5.1.files'
2--- bakery/debian-5.1/dist/Debian/mariadb-server-5.1.files 2009-10-30 08:33:30 +0000
3+++ bakery/debian-5.1/dist/Debian/mariadb-server-5.1.files 2009-10-30 15:05:20 +0000
4@@ -64,3 +64,27 @@
5 usr/share/mysql/mysql_system_tables_data.sql
6 usr/share/mysql/mysql_system_tables.sql
7 usr/share/mysql/mysql_test_data_timezone.sql
8+usr/share/mysql/charsets
9+usr/share/mysql/czech
10+usr/share/mysql/danish
11+usr/share/mysql/dutch
12+usr/share/mysql/english
13+usr/share/mysql/estonian
14+usr/share/mysql/french
15+usr/share/mysql/german
16+usr/share/mysql/greek
17+usr/share/mysql/hungarian
18+usr/share/mysql/italian
19+usr/share/mysql/japanese
20+usr/share/mysql/korean
21+usr/share/mysql/norwegian
22+usr/share/mysql/norwegian-ny
23+usr/share/mysql/polish
24+usr/share/mysql/portuguese
25+usr/share/mysql/romanian
26+usr/share/mysql/russian
27+usr/share/mysql/serbian
28+usr/share/mysql/slovak
29+usr/share/mysql/spanish
30+usr/share/mysql/swedish
31+usr/share/mysql/ukrainian

Subscribers

People subscribed via source and target branches