defines changed to GNU social names instead of StatusNet

diff --git a/lib/framework.php b/lib/framework.php
index 33ceba8768996ac516f8beb80d2b82a6d2aea140..128937935041a753e4e4234b3e9a42354adf1628 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -17,15 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('GNUSOCIAL')) { exit(1); }
 
-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('GNUSOCIAL_BASE_VERSION', '1.1.1');
+define('GNUSOCIAL_LIFECYCLE', 'alpha'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 
-define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
+define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);
+define('STATUSNET_VERSION', GNUSOCIAL_VERSION); // compatibility
 
-define('STATUSNET_CODENAME', 'OK');
+define('GNUSOCIAL_CODENAME', 'Not decided yet');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);

diff --git a/lib/httpclient.php b/lib/httpclient.php
index a92c7d8c5be96d70cc8cbf14cd6bcd9e9b3032fc..0c249a518f3ec89f34d99752cd641307c96ed1c0 100644 (file)
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -249,7 +249,7 @@ class HTTPClient extends HTTP_Request2
      */
     function userAgent()
     {
-        return "GNU Social/".STATUSNET_VERSION." (".STATUSNET_CODENAME.")";
+        return "GNU Social/".GNUSOCIAL_VERSION." (".GNUSOCIAL_CODENAME.")";
     }
 
     /**