From 6bf2c182b350e59dff0c1fd073e52ea6894df131 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@e14n.com>
Date: Tue, 16 Jul 2013 11:23:47 -0700
Subject: [PATCH] Upgrade version number

Conflicts:
	lib/framework.php
---
 INSTALL           |  6 +++---
 README            | 26 +++++++++++---------------
 UPGRADE           |  4 ++--
 lib/framework.php |  6 +++---
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/INSTALL b/INSTALL
index 75237fa1fe..2508acd7e5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -106,9 +106,9 @@ especially if you've previously installed PHP/MySQL packages.
 1. Unpack the tarball you downloaded on your Web server. Usually a
    command like this will work:
 
-       tar zxf statusnet-1.1.0-alpha1.tar.gz
+       tar zxf statusnet-1.1.1.tar.gz
 
-   ...which will make a statusnet-1.1.0-alpha1 subdirectory in your current
+   ...which will make a statusnet-1.1.1 subdirectory in your current
    directory. (If you don't have shell access on your Web server, you
    may have to unpack the tarball on your local computer and FTP the
    files to the server.)
@@ -116,7 +116,7 @@ especially if you've previously installed PHP/MySQL packages.
 2. Move the tarball to a directory of your choosing in your Web root
    directory. Usually something like this will work:
 
-       mv statusnet-1.1.0-alpha1 /var/www/statusnet
+       mv statusnet-1.1.1 /var/www/statusnet
 
    This will make your StatusNet instance available in the statusnet path of
    your server, like "http://example.net/statusnet". "microblog" or
diff --git a/README b/README
index b9ffcbaddb..3999bffbce 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
 README
 ------
 
-StatusNet 1.1.0
-2 July 2012
+StatusNet 1.1.1
+16 July 2013
 
 This is the README file for StatusNet, the Open Source social
 networking platform. It includes general information about the
@@ -107,23 +107,19 @@ for additional terms.
 New this version
 ================
 
-This is a minor bug fix and feature release since 1.0.1, released 3
-October 2011. (Because the plugin interface has changed in an upwardly
-compatible way, we've incremented the minor version number. See
-http://semver.org/ for the semantic versioning scheme we follow.)
+This is a security fix and bug fix release since 1.1.0,
+released 2 July 2012. All 1.1.0 sites should upgrade to this version.
 
 It includes the following changes:
 
-- ActivitySpam plugin to check updates against spamicity.info
-- Options to hide users who've been silenced or have posted spammy updates.
-- OfflineBackup experimental plugin.
-- Fixes for TwitterBridge to correctly handle replies through the bridge.
-- Improvements in ActivityStreams JSON output to better match 1.0 spec.
-- Console scripts for managing groups.
-- Bug fix for conversation counts in conversation streams.
-- Rights for moderators to manage spam.
+- Fixes for SQL injection errors in profile lists.
+- Improved ActivityStreams JSON representation of activities and objects.
+- Upgrade to the Twitter 1.1 API.
+- More robust handling of errors in distribution.
+- Fix error in OStatus subscription for remote groups.
+- Fix error in XMPP distribution.
 
-A full changelog is available at http://status.net/wiki/StatusNet_1.1.0.
+A full changelog is available at http://status.net/wiki/StatusNet_1.1.1.
 
 Troubleshooting
 ===============
diff --git a/UPGRADE b/UPGRADE
index c50e7622ff..2ae96e0dae 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -24,7 +24,7 @@ instructions; read to the end first before trying them.
 5. Once all writing processes to your site are turned off, make a
    final backup of the Web directory and database.
 6. Move your StatusNet directory to a backup spot, like "statusnet.bak".
-7. Unpack your StatusNet 1.1.0-alpha1 tarball and move it to "statusnet" or
+7. Unpack your StatusNet 1.1.1 tarball and move it to "statusnet" or
    wherever your code used to be.
 8. Copy the config.php file and the contents of the avatar/, background/,
    file/, and local/ subdirectories from your old directory to your new
@@ -37,7 +37,7 @@ instructions; read to the end first before trying them.
     reversed. YOU CAN EASILY DESTROY YOUR SITE WITH THIS STEP. Don't
     do it without a known-good backup!
 
-    In your new StatusNet 1.1.0-alpha1 directory and AFTER YOU MAKE A
+    In your new StatusNet 1.1.1 directory and AFTER YOU MAKE A
     BACKUP run the upgrade.php script like this:
 
         php ./scripts/upgrade.php
diff --git a/lib/framework.php b/lib/framework.php
index f12ad8048a..99955b040c 100644
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -19,13 +19,13 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-define('STATUSNET_BASE_VERSION', '1.1.0');
-define('STATUSNET_LIFECYCLE', 'alpha1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_BASE_VERSION', '1.1.1');
+define('STATUSNET_LIFECYCLE', 'release'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . '-' . STATUSNET_LIFECYCLE);
 
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
-define('STATUSNET_CODENAME', 'Fight for Your Right');
+define('STATUSNET_CODENAME', 'OK');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);