Version bump, drop old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

8 files changed, 53 insertions, 269 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index d0f30b59396e..28fff6ea469d 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-extra/cinnamon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.65 2015/06/30 19:15:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.66 2015/07/04 19:15:09 pacho Exp $
+
+*cinnamon-2.6.9 (04 Jul 2015)
+
+  04 Jul 2015; Pacho Ramos <pacho@gentoo.org> +cinnamon-2.6.9.ebuild,
+  -cinnamon-2.4.6.ebuild, -files/background.patch,
+  -files/cinnamon-2.2.16-calendar-upower.patch,
+  -files/cinnamon-2.2.16-gnome-3.14.patch,
+  -files/cinnamon-2.2.16-sbin-lspci.patch,
+  -files/cinnamon-2.2.16-set-wheel.patch,
+  -files/cinnamon-2.2.6-optional-networkmanager.patch:
+  Version bump, drop old
 
   30 Jun 2015; Pacho Ramos <pacho@gentoo.org> cinnamon-2.6.8.ebuild:
   Drop no longer needed warnings about r300/r600 (#553548)
diff --git a/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
index 81a8a845c183..e35f63c9c546 100644
--- a/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild,v 1.4 2015/06/20 02:32:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild,v 1.1 2015/07/04 19:15:09 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 PYTHON_REQ_USE="xml"
 
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-single-r1
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
 
 DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
 HOMEPAGE="http://cinnamon.linuxmint.com/"
@@ -20,17 +20,24 @@ SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P
 
 LICENSE="GPL-2+"
 SLOT="0"
+
 # bluetooth support dropped due bug #511648
-IUSE="+l10n +networkmanager" #+bluetooth
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.7 and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	python_targets_python2_7
+	|| ( python_targets_python3_3 python_targets_python3_4 )
+	"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
 	app-misc/ca-certificates
 	dev-libs/dbus-glib
-	>=dev-libs/glib-2.29.10:2
-	>=dev-libs/gobject-introspection-0.10.1
+	>=dev-libs/glib-2.29.10:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
 	>=dev-libs/json-glib-0.13.2
 	>=dev-libs/libcroco-0.6.2:0.6
 	dev-libs/libxml2:2
@@ -39,7 +46,7 @@ COMMON_DEPEND="
 	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
 	gnome-extra/cinnamon-menus[introspection]
 	>=gnome-extra/cjs-2.4
-	>=media-libs/clutter-1.7.5:1.0[introspection]
+	>=media-libs/clutter-1.10:1.0[introspection]
 	media-libs/cogl:1.0=[introspection]
 	>=gnome-base/gsettings-desktop-schemas-2.91.91
 	media-libs/gstreamer:1.0
@@ -48,7 +55,7 @@ COMMON_DEPEND="
 	net-libs/libsoup:2.4[introspection]
 	>=sys-auth/polkit-0.100[introspection]
 	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.0.0:3[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
 	x11-libs/pango[introspection]
 	>=x11-libs/startup-notification-0.11
 	x11-libs/libX11
@@ -90,15 +97,15 @@ RDEPEND="${COMMON_DEPEND}
 
 	x11-misc/xdg-utils
 
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gconf-python:2[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/dbus-python[python_targets_python2_7]
+	dev-python/gconf-python:2[python_targets_python2_7]
+	dev-python/lxml[python_targets_python2_7]
+	dev-python/pexpect[python_targets_python2_7]
+	dev-python/pycairo[python_targets_python2_7]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pypam[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pyinotify[python_targets_python2_7]
+	dev-python/pypam[python_targets_python2_7]
+	virtual/python-imaging[python_targets_python2_7]
 
 	x11-themes/gnome-themes-standard[gtk]
 	x11-themes/gnome-icon-theme-symbolic
@@ -109,16 +116,16 @@ RDEPEND="${COMMON_DEPEND}
 
 	gnome-extra/polkit-gnome
 
-	l10n? ( >=gnome-extra/cinnamon-translations-2.4 )
 	networkmanager? (
 		gnome-extra/nm-applet
 		net-misc/mobile-broadband-provider-info
 		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
 "
 #bluetooth? ( net-wireless/cinnamon-bluetooth )
 
 DEPEND="${COMMON_DEPEND}
-	dev-python/polib[${PYTHON_USEDEP}]
+	dev-python/polib[python_targets_python2_7]
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	>=dev-util/intltool-0.40
@@ -131,7 +138,7 @@ DEPEND="${COMMON_DEPEND}
 S="${WORKDIR}/Cinnamon-${PV}"
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	python_setup
 }
 
 src_prepare() {
@@ -143,11 +150,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
 
 	# Optional NetworkManager, bug #488684
-	epatch "${FILESDIR}"/${PN}-2.4.5-optional-networkmanager.patch
+	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
 
 	# Use wheel group instead of sudo (from Fedora/Arch)
 	# https://github.com/linuxmint/Cinnamon/issues/3576
-	epatch "${FILESDIR}"/${PN}-2.4.5-set-wheel.patch
+	epatch "${FILESDIR}"/${PN}-2.6.7-set-wheel.patch
 
 	# Fix GNOME 3.14 support (from Fedora/Arch)
 	# https://github.com/linuxmint/Cinnamon/issues/3577
@@ -179,7 +186,17 @@ src_prepare() {
 
 	epatch_user
 
-	python_fix_shebang .
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
 
 	eautoreconf
 	gnome2_src_prepare
@@ -238,15 +255,4 @@ pkg_postinst() {
 		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
 		ewarn "open-source drivers."
 	fi
-
-	if has_version "media-libs/mesa[video_cards_radeon]" ||
-	   has_version "media-libs/mesa[video_cards_r300]" ||
-	   has_version "media-libs/mesa[video_cards_r600]"; then
-		elog "Cinnamon is unstable under classic-mode r300/r600 mesa drivers."
-		elog "Make sure that gallium architecture for r300 and r600 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[gallium]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
-		fi
-	fi
 }
diff --git a/gnome-extra/cinnamon/files/background.patch b/gnome-extra/cinnamon/files/background.patch
deleted file mode 100644
index ccfdce4cf22c..000000000000
--- a/gnome-extra/cinnamon/files/background.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-@@ -334,10 +334,9 @@ class BackgroundWallpaperPane (Gtk.VBox)
-     
-     def update_icon_view(self):
-         pictures_list = []
--        if os.path.exists("/usr/share/cinnamon-background-properties"):
--            for i in os.listdir("/usr/share/cinnamon-background-properties"):
--                if i.endswith(".xml"):
--                    pictures_list += self.parse_xml_backgrounds_list(os.path.join("/usr/share/cinnamon-background-properties", i))
-+        for i in os.listdir("/usr/share/gnome-background-properties"):
-+            if i.endswith(".xml"):
-+                    pictures_list += self.parse_xml_backgrounds_list(os.path.join("/usr/share/gnome-background-properties", i))
-         
-         path = os.path.join(os.getenv("HOME"), ".cinnamon", "backgrounds")
-         if os.path.exists(path):
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.16-calendar-upower.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.16-calendar-upower.patch
deleted file mode 100644
index fefd9c539b40..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.2.16-calendar-upower.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: cinnamon/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js
-===================================================================
---- cinnamon.orig/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js	2014-04-27 11:56:10.582581808 +0200
-+++ cinnamon/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js	2014-07-14 00:44:37.882215797 +0200
-@@ -94,7 +94,11 @@
- 
-             // https://bugzilla.gnome.org/show_bug.cgi?id=655129
-             this._upClient = new UPowerGlib.Client();
--            this._upClient.connect('notify-resume', this._updateClockAndDate);
-+            try {
-+                this._upClient.connect('notify-resume', this._updateClockAndDate);
-+            } catch (e) {
-+                this._upClient.connect('notify::resume', this._updateClockAndDate);
-+            }
- 
-             // Start the clock
-             this.on_settings_changed();
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.16-gnome-3.14.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.16-gnome-3.14.patch
deleted file mode 100644
index e2a2d99eb220..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.2.16-gnome-3.14.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/data/theme/cinnamon.css
-+++ b/data/theme/cinnamon.css
-@@ -1445,7 +1445,8 @@
- .applet-icon:hover,
- .applet-box:hover > .applet-icon {
- 	color: #fff;
--	icon-shadow: white 0px 0px 3px;
-+/* Broken with GNOME 3.14 (icon-size is not honoured)
-+ *	icon-shadow: white 0px 0px 3px;*/
- }
- 
- /* ===================================================================
---- a/files/usr/lib/cinnamon-settings/modules/cs_themes.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_themes.py
-@@ -91,7 +91,7 @@
-     
-     def _load_icon_themes(self):
-         dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons"))
--        valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme")))
-+        valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme")))
-         valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
-         res = []
-         for i in valid:
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.16-sbin-lspci.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.16-sbin-lspci.patch
deleted file mode 100644
index 5c9ea66a797f..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.2.16-sbin-lspci.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 973446912684a07204a8b9d40fe23a98f0235a97 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 30 Sep 2014 09:24:58 -0400
-Subject: [PATCH] cinnamon-settings: append /usr/sbin to PATH before calling
- lspci
-
-Some distros, e.g. Gentoo, install lspci in /usr/sbin
----
- files/usr/lib/cinnamon-settings/modules/cs_info.py | 5 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/files/usr/lib/cinnamon-settings/modules/cs_info.py b/files/usr/lib/cinnamon-settings/modules/cs_info.py
-index aa5e4da..d50be27 100644
---- a/files/usr/lib/cinnamon-settings/modules/cs_info.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_info.py
-@@ -31,6 +31,8 @@ def getProcessOut(command):
- def getGraphicsInfos():
-     cards = {}
-     count = 0
-+    envpath = os.environ["PATH"]
-+    os.environ["PATH"] = envpath + ":/usr/local/sbin:/usr/sbin:/sbin"
-     for card in getProcessOut(("lspci")):
-         if not "VGA" in card:
-             continue
-@@ -43,6 +45,7 @@ def getGraphicsInfos():
-         if cardName:
-             cards[count] = (cardName)
-             count += 1
-+    os.environ["PATH"] = envpath
-     return cards
- 
- def getDiskSize():
--- 
-2.1.1
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.16-set-wheel.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.16-set-wheel.patch
deleted file mode 100644
index 81c6dc4b583f..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.2.16-set-wheel.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -144,12 +144,11 @@ class EditableEntry (Gtk.Notebook):
- 
- class PasswordDialog(Gtk.Dialog):
- 
--    def __init__ (self, user, password_mask, group_mask):            
-+    def __init__ (self, user, password_mask):
-         super(PasswordDialog, self).__init__()
- 
-         self.user = user
-         self.password_mask = password_mask
--        self.group_mask = group_mask
- 
-         self.set_modal(True)
-         self.set_skip_taskbar_hint(True)
-@@ -215,12 +214,6 @@ class PasswordDialog(Gtk.Dialog):
-     def change_password(self):        
-         newpass = self.new_password.get_text()
-         self.user.set_password(newpass, "")
--        os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
--        mask = self.group_mask.get_text()
--        mask = mask.split(", ")
--        mask.remove("nopasswdlogin")
--        mask = ", ".join(mask)
--        self.group_mask.set_text(mask)        
-         self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
-         self.destroy()  
- 
-@@ -515,7 +508,7 @@ class Module:
-         model, treeiter = self.users_treeview.get_selection().get_selected()
-         if treeiter != None:
-             user = model[treeiter][INDEX_USER_OBJECT]       
--            dialog = PasswordDialog(user, self.password_mask, self.groups_label)                
-+            dialog = PasswordDialog(user, self.password_mask)                
-             response = dialog.run()
- 
-     def _on_groups_button_clicked(self, widget): 
-@@ -745,11 +738,11 @@ class Module:
-             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
-             description = "<b>%s</b>\n%s" % (fullname, username)
-             piter = self.users.append(None, [new_user, pixbuf, description])
--            # Add the user to his/her own group and sudo if Administrator was selected
-+            # Add the user to his/her own group and wheel if Administrator was selected
-             if dialog.account_type_combo.get_active() == 1:
--                os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username)) 
-+                os.system("usermod %s -G %s,wheel" % (username, username)) 
-             else:
--                os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
-+                os.system("usermod %s -G %s" % (username, username))
-             self.load_groups()
-         dialog.destroy()
-          
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.6-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.6-optional-networkmanager.patch
deleted file mode 100644
index aeed8deac007..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.2.6-optional-networkmanager.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 26fbdd602e60baded13e203fdc5c90c063a089e4 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 10 May 2014 15:14:05 -0400
-Subject: [PATCH] Make networkmanager dependency optional for Gentoo
-
----
- configure.ac         | 36 ++++++++++++++++++++++++++++++++++--
- js/misc/config.js.in |  2 ++
- src/Makefile.am      |  5 ++++-
- 3 files changed, 40 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index bc764e1..894379b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -81,8 +81,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
-                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
-                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
- 			       libcanberra
--                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
--                               libnm-glib libnm-util gnome-keyring-1)
-+                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
-+
-+##########################
-+# Check for NetworkManager
-+##########################
-+NM_MIN_VERSION=0.9
-+AC_ARG_ENABLE(networkmanager,
-+              AS_HELP_STRING([--disable-networkmanager],
-+                             [disable NetworkManager support @<:@default=auto@:>@]),,
-+              [enable_networkmanager=auto])
-+
-+if test "x$enable_networkmanager" != "xno"; then
-+   PKG_CHECK_MODULES(NETWORKMANAGER,
-+                     [libnm-glib libnm-util gnome-keyring-1],
-+                     [have_networkmanager=yes],
-+                     [have_networkmanager=no])
-+
-+   CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS"
-+   CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS"
-+else
-+   have_networkmanager="no  (disabled)"
-+fi
-+
-+if test "x$have_networkmanager" = "xyes"; then
-+   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
-+   AC_SUBST([HAVE_NETWORKMANAGER], [1])
-+else
-+   if test "x$enable_networkmanager" = "xyes"; then
-+      AC_MSG_ERROR([Couldn't find NetworkManager.])
-+   fi
-+   AC_SUBST([HAVE_NETWORKMANAGER], [0])
-+fi
-+
-+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
- 
- PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
- 
-diff --git a/js/misc/config.js.in b/js/misc/config.js.in
-index 704989b..df7e014 100644
---- a/js/misc/config.js.in
-+++ b/js/misc/config.js.in
-@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
- const GJS_VERSION = '@GJS_VERSION@';
- /* 1 if gnome-bluetooth is available, 0 otherwise */
- const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-+/* 1 if networkmanager is available, 0 otherwise */
-+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
- /* The system TLS CA list */
- const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@';
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 06d7f93..fe12cb9 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -267,7 +267,10 @@ libcinnamon_la_LIBADD =		\
- libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
- 
- Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
--Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0
-+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0
-+if HAVE_NETWORKMANAGER
-+Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
-+endif
- Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
- Cinnamon_0_1_gir_LIBS = libcinnamon.la
- Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
--- 
-1.9.2
-