Skip to content

Commit

Permalink
Added missing panelLaunchers.js to Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
clefebvre committed Dec 21, 2011
1 parent 6d9661c commit b568c16
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 12 deletions.
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for cinnamon 1.1.0.
# Generated by GNU Autoconf 2.68 for cinnamon 1.1.1.
#
# 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.1.0'
PACKAGE_STRING='cinnamon 1.1.0'
PACKAGE_VERSION='1.1.1'
PACKAGE_STRING='cinnamon 1.1.1'
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.1.0 to adapt to many kinds of systems.
\`configure' configures cinnamon 1.1.1 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.1.0:";;
short | recursive ) echo "Configuration of cinnamon 1.1.1:";;
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.1.0
cinnamon configure 1.1.1
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.1.0, which was
It was created by cinnamon $as_me 1.1.1, 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.1.0'
VERSION='1.1.1'


cat >>confdefs.h <<_ACEOF
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.1.0, which was
This file was extended by cinnamon $as_me 1.1.1, 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.1.0
cinnamon config.status 1.1.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ(2.63)
AC_INIT([cinnamon],[1.1.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon],[cinnamon])
AC_INIT([cinnamon],[1.1.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon],[cinnamon])

AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/cinnamon-global.c])
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
cinnamon (1.1.1) lisa; urgency=low

* Fix: Added missing panelLaunchers.js

-- Clement Lefebvre <root@linuxmint.com> Wed, 21 Dec 2011 18:29:29 +0000

cinnamon (1.1.0) lisa; urgency=low

* Fixed run dialog
Expand Down
1 change: 1 addition & 0 deletions js/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ nobase_dist_js_DATA = \
ui/notificationDaemon.js \
ui/overview.js \
ui/panel.js \
ui/panelLaunchers.js \
ui/panelMenu.js \
ui/placeDisplay.js \
ui/polkitAuthenticationAgent.js \
Expand Down
2 changes: 1 addition & 1 deletion js/misc/config.js
Original file line number Diff line number Diff line change
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.1.0';
const PACKAGE_VERSION = '1.1.1';
/* 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 b568c16

Please sign in to comment.