Skip to content

Commit

Permalink
1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
clefebvre committed Mar 13, 2012
1 parent 4b36434 commit 5f1c10d
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 19 deletions.
22 changes: 11 additions & 11 deletions configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for cinnamon 1.3.1.
# Generated by GNU Autoconf 2.68 for cinnamon 1.4.0.
#
# Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon>.
#
Expand Down Expand Up @@ -571,8 +571,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cinnamon'
PACKAGE_TARNAME='cinnamon'
PACKAGE_VERSION='1.3.1'
PACKAGE_STRING='cinnamon 1.3.1'
PACKAGE_VERSION='1.4.0'
PACKAGE_STRING='cinnamon 1.4.0'
PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon'
PACKAGE_URL=''

Expand Down Expand Up @@ -1453,7 +1453,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures cinnamon 1.3.1 to adapt to many kinds of systems.
\`configure' configures cinnamon 1.4.0 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1523,7 +1523,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cinnamon 1.3.1:";;
short | recursive ) echo "Configuration of cinnamon 1.4.0:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1698,7 +1698,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cinnamon configure 1.3.1
cinnamon configure 1.4.0
generated by GNU Autoconf 2.68

Copyright (C) 2010 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2067,7 +2067,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by cinnamon $as_me 1.3.1, which was
It was created by cinnamon $as_me 1.4.0, which was
generated by GNU Autoconf 2.68. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -2894,7 +2894,7 @@ fi

# Define the identity of the package.
PACKAGE='cinnamon'
VERSION='1.3.1'
VERSION='1.4.0'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -14948,7 +14948,7 @@ fi
CLUTTER_MIN_VERSION=1.7.5
GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
GJS_MIN_VERSION=1.29.18
MUFFIN_MIN_VERSION=1.0.1
MUFFIN_MIN_VERSION=1.0.2
FOLKS_MIN_VERSION=0.5.2
GTK_MIN_VERSION=3.0.0
GIO_MIN_VERSION=2.29.10
Expand Down Expand Up @@ -17250,7 +17250,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by cinnamon $as_me 1.3.1, which was
This file was extended by cinnamon $as_me 1.4.0, which was
generated by GNU Autoconf 2.68. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -17316,7 +17316,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
cinnamon config.status 1.3.1
cinnamon config.status 1.4.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"

Expand Down
4 changes: 2 additions & 2 deletions configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.63)
AC_INIT([cinnamon],[1.3.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon],[cinnamon])
AC_INIT([cinnamon],[1.4.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon],[cinnamon])

AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/cinnamon-global.c])
Expand Down Expand Up @@ -67,7 +67,7 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
CLUTTER_MIN_VERSION=1.7.5
GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
GJS_MIN_VERSION=1.29.18
MUFFIN_MIN_VERSION=1.0.1
MUFFIN_MIN_VERSION=1.0.2
FOLKS_MIN_VERSION=0.5.2
GTK_MIN_VERSION=3.0.0
GIO_MIN_VERSION=2.29.10
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
@@ -1,3 +1,9 @@
cinnamon (1.4.0) lisa; urgency=low

* New Cinnamon release

-- Clement Lefebvre <root@linuxmint.com> Tue, 13 Mar 2012 16:11:41 +0000

cinnamon (1.3.1) lisa; urgency=low

* New Cinnamon release
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Expand Up @@ -36,7 +36,7 @@ Build-Depends: cdbs,
libgudev-1.0-dev,
libnm-glib-dev (>= 0.8.999),
libstartup-notification0-dev (>= 0.11),
libmuffin-dev (>= 1.0.1),
libmuffin-dev (>= 1.0.2),
librsvg2-dev,
libwnck-dev,
libclutter-1.0-dev (>= 1.7.5),
Expand Down
2 changes: 1 addition & 1 deletion debian/control.in
Expand Up @@ -31,7 +31,7 @@ Build-Depends: cdbs,
libgudev-1.0-dev,
libnm-glib-dev (>= 0.8.999),
libstartup-notification0-dev (>= 0.11),
libmuffin-dev (>= 1.0.1),
libmuffin-dev (>= 1.0.2),
librsvg2-dev,
libwnck-dev,
libclutter-1.0-dev (>= 1.7.5),
Expand Down
6 changes: 3 additions & 3 deletions files/Makefile
Expand Up @@ -203,10 +203,10 @@ OTOOL64 =
PACKAGE = cinnamon
PACKAGE_BUGREPORT = https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon
PACKAGE_NAME = cinnamon
PACKAGE_STRING = cinnamon 1.3.1
PACKAGE_STRING = cinnamon 1.4.0
PACKAGE_TARNAME = cinnamon
PACKAGE_URL =
PACKAGE_VERSION = 1.3.1
PACKAGE_VERSION = 1.4.0
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
Expand All @@ -230,7 +230,7 @@ TRAY_CFLAGS = -pthread -DGSEAL_ENABLE -I/usr/include/atk-1.0 -I/usr/include/cair
TRAY_LIBS = -pthread -lgtk-3 -lgdk-3 -latk-1.0 -lcairo-gobject -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
TYPELIBDIR = /usr/lib/girepository-1.0
USE_NLS = yes
VERSION = 1.3.1
VERSION = 1.4.0
XGETTEXT = /usr/bin/xgettext
XGETTEXT_015 = /usr/bin/xgettext
XGETTEXT_EXTRA_OPTIONS =
Expand Down
2 changes: 1 addition & 1 deletion js/misc/config.js
Expand Up @@ -3,7 +3,7 @@
/* The name of this package (not localized) */
const PACKAGE_NAME = 'cinnamon';
/* The version of this package */
const PACKAGE_VERSION = '1.3.1';
const PACKAGE_VERSION = '1.4.0';
/* The version of GJS we're linking to */
const GJS_VERSION = '1.30.0';
/* 1 if gnome-bluetooth is available, 0 otherwise */
Expand Down

0 comments on commit 5f1c10d

Please sign in to comment.