[master][merge] from release-v1.5.1c.

.tx/config

@@ -9,4 +9,5 @@ source_lang = en
 # Namings not quite the same in Transifex and babel:
 # Transifex vs Babel (& CKAN)
 # 'sr@Latin'  vs 'sr_Latn'
-trans.sr@Latin = translations/sr_Latn/LC_MESSAGES/ckan.po
+trans.sr@Latin = ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
+trans.sr@latin = ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po

CHANGELOG.txt

@@ -1,8 +1,53 @@
 CKAN CHANGELOG
 ++++++++++++++
 
+v1.5.1 2011-01-04
+=================
+
+Major:
+ * Background tasks (#1363, #1371, #1408)
+ * Fix for security issue affecting CKAN v1.5 (#1585)
+
+Minor:
+ * Language support now excellent for European languages: en de fr it es no sv pl ru pt cs sr ca
+ * Web UI improvements:
+    * Resource editing refreshed
+    * Group editing refreshed
+    * Indication that group creation requires logging-in (#1004)
+    * Users' pictures displayed using Gravatar (#1409)
+    * 'Welcome' banner shown to new users (#1378)
+    * Group package list now ordered alphabetically (#1502)
+ * Allow managing a dataset's groups also via package entity API (#1381)
+ * Dataset listings in API standardised (#1490)
+ * Search ordering by modification and creation date (#191)
+ * Account creation disallowed with Open ID (create account in CKAN first) (#1386)
+ * User name can be modified (#1386)
+ * Email address required for registration (for password reset) (#1319)
+ * Atom feeds hidden for now
+ * New config options to ease CSS insertion into the template (#1380)
+ * Removed ETag browser cache headers (#1422)
+ * CKAN version number and admin contact in new 'status_show' API (#1087)
+ * Upgrade SQLAlchemy to 0.7.3 (#1433)
+ * SOLR schema is now versioned (#1498)
+
+Bug fixes:
+ * Group ordering on main page was alphabetical but should be by size (since 1.5) (#1487)
+ * Package could get added multiple times to same Group, distorting Group size (#1484)
+ * Search index corruption when multiple CKAN instances on a server all storing the same object (#1430)
+ * Dataset property metadata_created had wrong value (since v1.3) (#1546)
+ * Tag browsing showed tags for deleted datasets (#920)
+ * User name change field validation error (#1470)
+ * You couldn't edit a user with a unicode email address (#1479)
+ * Package search API results missed the extra fields (#1455)
+ * OpenID registration disablement explained better (#1532)
+ * Data upload (with ckanext-storage) failed if spaces in the filename (#1518)
+ * Resource download count fixed (integration with ckanext-googleanalytics) (#1451)
+
+
 v1.5 2011-11-07
 ===============
+**Deprecated due to security issue #1585**
+
 Major:
  * New visual theme (#1108)
     * Package & Resource edit overhaul (#1294/#1348/#1351/#1368/#1296)

build.sh

@@ -15,11 +15,25 @@
 # Over time, as CKAN and its dependencies follow conventions more closely the
 # edge cases handled by this script should go away and the build should become
 # simpler.
+#
+# Install:
+#
+#     sudo apt-get update
+#     sudo apt-get install -y wget
+#     echo "deb http://apt.3aims.com/buildkit-0.2.2 lucid universe" | sudo tee /etc/apt/sources.list.d/3aims.list
+#     wget -qO- "http://apt.3aims.com/packages_public.key" | sudo apt-key add -
+#     sudo apt-get update
+#     sudo apt-get install buildkit-deb buildkit-apt-repo
 
-CKAN_PACKAGE_VERSION=08
-DEPS_PACKAGE_VERSION=05
-CKAN_PATH=/home/james/Documents/Work/OKFN/code/pyenv/src/ckan
-BUILDKIT_REPO_PATH="/var/lib/buildkit/repo/ckan-1.5"
+
+CKAN_PACKAGE_VERSION=01
+DEPS_PACKAGE_VERSION=01
+# If you don't run this command from the CKAN source directory, specify the 
+# path to CKAN here
+CKAN_PATH=$PWD
+# You'll need to create the repo if it doesn't exist:
+# sudo -u buildkit buildkit repo clone base_lucid ckan-1.5.1
+REPO_NAME="ckan-1.5.1"
 PIP_DOWNLOAD_CACHE=${CKAN_PATH}/build/env/cache
 EMAIL=packaging@okfn.org
 NAME="James Gardner"
@@ -54,8 +68,7 @@ cp ${CKAN_PATH}/build/buildkit/env/build/licenses/dist/buildkit/*.deb ${CKAN_PAT
 echo "done."
 
 # Add the .debs to the repository and the export the latest files for upload
-echo "Adding the packages to the $BUILDKIT_REPO_PATH repo ..."
-sudo -u buildkit buildkit repo remove -a $BUILDKIT_REPO_PATH
-sudo -u buildkit buildkit repo add $BUILDKIT_REPO_PATH ${CKAN_PATH}/dist/buildkit/*.deb
+echo "Adding the packages to the $REPO_NAME repo using files in ${CKAN_PATH}/dist/buildkit/*.deb ..."
+sudo -u buildkit buildkit repo remove -a $REPO_NAME dummy_arg
+sudo -u buildkit buildkit repo add $REPO_NAME ${CKAN_PATH}/dist/buildkit/*.deb
 echo "done."
-

ckan/__init__.py

@@ -1,17 +1,18 @@
 __version__ = '1.5.2a'
 __description__ = 'Comprehensive Knowledge Archive Network (CKAN) Software'
 __long_description__ = \
-'''The CKAN software is used to run the Comprehensive Knowledge Archive
-Network (CKAN) site: http://www.ckan.net.
+'''CKAN software provides a hub for datasets. The flagship site running CKAN 
+is theDataHub.org but it is also used for dozens of other open data websites
+run by governments, agencies and citizens.
 
-The Comprehensive Knowledge Archive Network is a registry of open
-knowledge packages and projects (and a few closed ones). CKAN is the
-place to search for open knowledge resources as well as register your
-own - be that a set of Shakespeare's works, a global population density
-database, the voting records of MPs, or 30 years of US patents.
+CKAN provides a place to search for open knowledge resources as well as 
+register your own - be that a set of Shakespeare's works, a global 
+population density database, the voting records of MPs, or 30 years of 
+US patents.
 
-Those familiar with freshmeat or CPAN can think of CKAN as providing an
-analogous service for open knowledge. 
+CKAN is an abbreviation for 'Comprehensive Knowledge Archive Network'. 
+Those familiar with Freshmeat or CPAN can think of CKAN as providing an
+analogous service for open data and knowledge. 
 '''
 __license__ = 'AGPL'
 

ckan/controllers/user.py

@@ -260,7 +260,8 @@ def logged_in(self):
             h.flash_success(_("%s is now logged in") % user_dict['display_name'])
             return self.me()
         else:
-            h.flash_error(_('Login failed. Bad username or password.'))
+            h.flash_error('Login failed. Bad username or password.' + \
+                          ' (Or if using OpenID, it hasn\'t been associated with a user account.)')
             h.redirect_to(controller='user', action='login')
 
     def logged_out(self):