Index: openacs-4/packages/ref-countries/ref-countries.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-countries/ref-countries.info,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/ref-countries/ref-countries.info	19 May 2007 06:55:09 -0000	1.9
+++ openacs-4/packages/ref-countries/ref-countries.info	13 May 2010 10:11:23 -0000	1.10
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="1.1" url="http://www.mayuli.com/acs-repository/download/apm/ref-countries-1.1.apm">
+    <version name="5.6.0d2" url="http://www.mayuli.com/acs-repository/download/apm/ref-countries-5.6.0d2.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
@@ -17,19 +17,14 @@
         <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
         <description format="text/html">Countries supplies the ISO 3166 Country data for acs-reference.</description>
 
-        <provides url="ref-countries" version="1.1"/>
-        <requires url="acs-kernel" version="4.6.2"/>
-        <requires url="acs-reference" version="0.1d"/>
+        <provides url="ref-countries" version="5.6.0d2"/>
+        <requires url="acs-kernel" version="5.6.0d1"/>
+        <requires url="acs-reference" version="5.6.0d1"/>
 
-        <files>
-            <file type="package_spec" path="ref-countries.info"/>
-            <file type="data_model" db_type="oracle" path="sql/common/ref-country-data.sql"/>
-            <file type="data_model_create" db_type="oracle" path="sql/oracle/ref-countries-create.sql"/>
-            <file type="data_model_drop" db_type="oracle" path="sql/oracle/ref-countries-drop.sql"/>
-            <file type="data_model_create" db_type="postgresql" path="sql/postgresql/ref-countries-create.sql"/>
-            <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/ref-countries-drop.sql"/>
-            <file type="documentation" path="www/doc/index.html"/>
-        </files>
+        <callbacks>
+            <callback type="after-upgrade"  proc="ref_countries::apm::after_upgrade"/>
+        </callbacks>
+
         <parameters>
         <!-- No version parameters -->
         </parameters>
Index: openacs-4/packages/ref-countries/sql/common/countries.dat
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-countries/sql/common/countries.dat,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ref-countries/sql/common/countries.dat	17 Jul 2003 01:10:40 -0000	1.1
+++ openacs-4/packages/ref-countries/sql/common/countries.dat	13 May 2010 10:11:23 -0000	1.2
@@ -1,4 +1,5 @@
 AFGHANISTAN;AF
+�LAND ISLANDS;AX
 ALBANIA;AL
 ALGERIA;DZ
 AMERICAN SAMOA;AS
@@ -23,7 +24,7 @@
 BENIN;BJ
 BERMUDA;BM
 BHUTAN;BT
-BOLIVIA;BO
+BOLIVIA, PLURINATIONAL STATE OF;BO
 BOSNIA AND HERZEGOVINA;BA
 BOTSWANA;BW
 BOUVET ISLAND;BV
@@ -50,7 +51,7 @@
 CONGO, THE DEMOCRATIC REPUBLIC OF THE;CD
 COOK ISLANDS;CK
 COSTA RICA;CR
-COTE D'IVOIRE;CI
+C�TE D'IVOIRE;CI
 CROATIA;HR
 CUBA;CU
 CYPRUS;CY
@@ -87,6 +88,7 @@
 GUADELOUPE;GP
 GUAM;GU
 GUATEMALA;GT
+GUERNSEY;GG
 GUINEA;GN
 GUINEA-BISSAU;GW
 GUYANA;GY
@@ -102,12 +104,14 @@
 IRAN, ISLAMIC REPUBLIC OF;IR
 IRAQ;IQ
 IRELAND;IE
+ISLE OF MAN;IM
 ISRAEL;IL
 ITALY;IT
 JAMAICA;JM
 JAPAN;JP
+JERSEY;JE
 JORDAN;JO
-KAZAKSTAN;KZ
+KAZAKHSTAN;KZ
 KENYA;KE
 KIRIBATI;KI
 KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF;KP
@@ -123,7 +127,7 @@
 LIECHTENSTEIN;LI
 LITHUANIA;LT
 LUXEMBOURG;LU
-MACAU;MO
+MACAO;MO
 MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF;MK
 MADAGASCAR;MG
 MALAWI;MW
@@ -141,6 +145,7 @@
 MOLDOVA, REPUBLIC OF;MD
 MONACO;MC
 MONGOLIA;MN
+MONTENEGRO;ME
 MONTSERRAT;MS
 MOROCCO;MA
 MOZAMBIQUE;MZ
@@ -173,20 +178,23 @@
 PORTUGAL;PT
 PUERTO RICO;PR
 QATAR;QA
-REUNION;RE
+R�UNION;RE
 ROMANIA;RO
 RUSSIAN FEDERATION;RU
 RWANDA;RW
+SAINT BARTH�LEMY;BL
 SAINT HELENA;SH
 SAINT KITTS AND NEVIS;KN
 SAINT LUCIA;LC
+SAINT MARTIN;MF
 SAINT PIERRE AND MIQUELON;PM
 SAINT VINCENT AND THE GRENADINES;VC
 SAMOA;WS
 SAN MARINO;SM
 SAO TOME AND PRINCIPE;ST
 SAUDI ARABIA;SA
 SENEGAL;SN
+SERBIA;RS
 SEYCHELLES;SC
 SIERRA LEONE;SL
 SINGAPORE;SG
@@ -209,6 +217,7 @@
 TAJIKISTAN;TJ
 TANZANIA, UNITED REPUBLIC OF;TZ
 THAILAND;TH
+TIMOR-LESTE;TL
 TOGO;TG
 TOKELAU;TK
 TONGA;TO
@@ -227,7 +236,7 @@
 URUGUAY;UY
 UZBEKISTAN;UZ
 VANUATU;VU
-VENEZUELA;VE
+VENEZUELA, BOLIVARIAN REPUBLIC OF;VE
 VIET NAM;VN
 VIRGIN ISLANDS, BRITISH;VG
 VIRGIN ISLANDS, U.S.;VI
Index: openacs-4/packages/ref-countries/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-countries/tcl/apm-callback-procs.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ref-countries/tcl/apm-callback-procs.tcl	13 May 2010 10:11:23 -0000	1.1
@@ -0,0 +1,55 @@
+ad_library {
+
+    Installation procs for ref-countries
+
+    @author Emmanuelle Raffenne (eraffenne@gmail.com)
+
+}
+
+namespace eval ref_countries {}
+namespace eval ref_countries::apm {}
+
+ad_proc -private ref_countries::apm::after_upgrade {
+    {-from_version_name:required}
+    {-to_version_name:required}
+} {
+    apm_upgrade_logic \
+        -from_version_name $from_version_name \
+        -to_version_name $to_version_name \
+        -spec {  
+            5.6.0d1 5.6.0d2 {
+
+                set new_countries {"�LAND ISLANDS" AX
+                    "BOLIVIA, PLURINATIONAL STATE OF" BO
+                    "C�TE D'IVOIRE" CI
+                    "GUERNSEY" GG
+                    "ISLE OF MAN" IM
+                    "JERSEY" JE
+                    "KAZAKHSTAN" KZ
+                    "MACAO" MO
+                    "MONTENEGRO" ME
+                    "R�UNION" RE
+                    "SAINT BARTH�LEMY" BL
+                    "SAINT MARTIN" MF
+                    "SERBIA" RS
+                    "TIMOR-LESTE" TL
+                    "VENEZUELA, BOLIVARIAN REPUBLIC OF" VE}
+
+                foreach {name code} $new_countries {
+                    set exists_p [db_string get_country {select count(*) from countries where iso = :code} -default 0]
+
+                    if { $exists_p } {
+                        db_dml update_country {
+                            update countries set default_name = :name
+                            where iso = :code
+                        }
+                    } else {
+                        db_dml insert_country {
+                            insert into countries (iso, default_name)
+                            values (:code, :name)
+                        }
+                    }
+                }
+            }
+        }
+}
Index: openacs-4/packages/ref-countries/tcl/ref-countries-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-countries/tcl/ref-countries-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ref-countries/tcl/ref-countries-procs.tcl	13 May 2010 09:24:34 -0000	1.3
+++ openacs-4/packages/ref-countries/tcl/ref-countries-procs.tcl	13 May 2010 10:11:23 -0000	1.4
@@ -16,7 +16,7 @@
     
     set country_code [db_string get_country_code "select iso from countries where default_name = upper(:country)" -default ""]
 
-    if {[string eq "" $country_code]} {
+    if { $country_code eq "" } {
         
         # Lets try to be smart.
         set country_list [list \