Various upgrades and fixes for cinnamon:

	- Upgrade cinnamon, cinnamon-control-center, nemo and mutter [1].
	- Add staging support
	- While here change lib_depends to the new style
	- Add some USES+=pkgconfig missing
	- Sort USE_GNOME
	- Update the pkg-plist for all the ports changed
	- Fix the COMMENT knobs
	- Fix the nemo patches. Remove patch-autogen.sh
	- Remove patch-panels_common_cc-common-language.c and add patch-panels_user-accounts_um-utils.c for c-c-c

Reviewed by: kwm

[1] 1.8.8.1, 1.8.2, 1.8.5 and 3.6.2


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18785 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 95 insertions, 309 deletions

diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index dc4d2be0c..348ac6f83 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -3,12 +3,12 @@
 #
 
 PORTNAME=	cinnamon-control-center
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8.2
 CATEGORIES=	sysutils gnome
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gustau.perez@gmail.com
-COMMENT=	A gnome-control-center replacement for Cinnamon
+COMMENT=	gnome-control-center replacement for Cinnamon
 
 BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
@@ -18,29 +18,30 @@ LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libcheese.so:${PORTSDIR}/multimedia/cheese3 \
 		libkrb5support.so:${PORTSDIR}/security/krb5 \
 		libcaribou.so:${PORTSDIR}/accessibility/caribou \
-		libgtop.so:${PORTSDIR}/devel/libgtop \
+		libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
 		libmuffin.so:${PORTSDIR}/x11-wm/muffin \
 		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
 		libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \
 		libfolks.so:${PORTSDIR}/net-im/folks \
 		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libcroco.so:${PORTSDIR}/textproc/libcroco \
+		libcroco-0.6.so:${PORTSDIR}/textproc/libcroco \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libclutter-glx-1.so:${PORTSDIR}/graphics/clutter \
-		libclutter-gst-1.so:${PORTSDIR}/multimedia/clutter-gst \
+		libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
+		libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \
 		libgjs.so:${PORTSDIR}/lang/gjs
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		${LOCALBASE}/share/doc/py-lxml/CREDITS.txt:${PORTSDIR}/devel/py-lxml
 
+WRKSRC=		${WRKDIR}/linuxmint-cinnamon-control-center-2249c94
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-GH_TAGNAME=	1.7.1
-GH_COMMIT=	a3883df
+GH_TAGNAME=	1.8.2
+GH_COMMIT=	3b93fd2
 
-NO_STAGE=	yes
 USE_XORG=	x11 xfixes sm
-USES=		gettext gmake pathfix
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomemenus3 \
 		gnomedesktop3 evolutiondataserver3
 USE_LDCONFIG=	yes
@@ -69,22 +70,13 @@ PLIST_SUB+=	CUPS="@comment "
 .endif
 
 post-patch:
-	@${MKDIR} ${WRKSRC}/files${PREFIX}
-
-	@${MV} ${WRKSRC}/files/usr/share ${WRKSRC}/files${PREFIX}
-
 	@${REINPLACE_CMD} -e 's|find|find ${WRKSRC}/files|g' \
 		${WRKSRC}/files/Makefile.in
 
-	@${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|g ;\
-		s|"usr/lib|"${PREFIX}/share/|g ;\
-		s|.utf8|.UTF-8|g' \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-control-center/language-options
-
 	@${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|g' \
 		${WRKSRC}/panels/common/cc-common-language.c
 
 pre-configure:
-	cd ${WRKSRC} && ${PREFIX}/bin/autoreconf && :> panels/info/hostnames-test.txt
+	cd ${WRKSRC} && ${PREFIX}/bin/autoreconf
 
 .include <bsd.port.mk>
diff --git a/sysutils/cinnamon-control-center/distinfo b/sysutils/cinnamon-control-center/distinfo
index 118d2a57c..70b31cb05 100644
--- a/sysutils/cinnamon-control-center/distinfo
+++ b/sysutils/cinnamon-control-center/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-control-center-1.7.1.tar.gz) = 56dc2ee75569a23ad1e850939c864274cfa10e4f2b3408a248087cd5bb4f6f9a
-SIZE (gnome3/cinnamon-control-center-1.7.1.tar.gz) = 8435750
+SHA256 (gnome3/cinnamon-control-center-1.8.2.tar.gz) = c1bb0e1851b3379d62fce6fe7659ca114df8b2637dc8ad3fe237147fe0371562
+SIZE (gnome3/cinnamon-control-center-1.8.2.tar.gz) = 8434741
diff --git a/sysutils/cinnamon-control-center/files/patch-panels_common_cc-common-language.c b/sysutils/cinnamon-control-center/files/patch-panels_common_cc-common-language.c
deleted file mode 100644
index 0e9225c3c..000000000
--- a/sysutils/cinnamon-control-center/files/patch-panels_common_cc-common-language.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- panels/common/cc-common-language.orig.c	2013-02-28 12:16:01.054493856 +0100
-+++ panels/common/cc-common-language.c	2013-02-28 12:16:14.526494237 +0100
-@@ -580,7 +580,7 @@
-                             &error )) {
-                 g_debug ("Couldn't get available languages: %s", error->message);
-                 g_error_free (error);
--                return;
-+                return ht;
-         }
- 
-         name = strtok (avail_languages, "\n");
diff --git a/sysutils/cinnamon-control-center/files/patch-panels_user-accounts_um-utils.c b/sysutils/cinnamon-control-center/files/patch-panels_user-accounts_um-utils.c
index 30e931a14..565411a89 100644
--- a/sysutils/cinnamon-control-center/files/patch-panels_user-accounts_um-utils.c
+++ b/sysutils/cinnamon-control-center/files/patch-panels_user-accounts_um-utils.c
@@ -1,23 +1,19 @@
---- panels/user-accounts/um-utils.orig.c	2013-02-28 12:30:49.816494890 +0100
-+++ panels/user-accounts/um-utils.c	2013-02-28 12:32:17.656493654 +0100
-@@ -23,9 +23,10 @@
- 
- #include <math.h>
+--- panels/user-accounts/um-utils.c.orig	2013-05-22 16:25:19.000000000 +0000
++++ panels/user-accounts/um-utils.c	2013-10-09 16:50:07.978760476 +0000
+@@ -25,7 +25,15 @@
  #include <stdlib.h>
-+#include <sys/param.h>
  #include <sys/types.h>
  #include <pwd.h>
 -#include <utmp.h>
++
++#include <sys/param.h>
++#if __FreeBSD_version < 900000
++ #include <utmp.h>
++#else
 +#include <utmpx.h>
++/* from the old utmp.h */
++#define UT_NAMESIZE 16
++#endif
  
  #include <glib.h>
- #include <glib/gi18n.h>
-@@ -445,7 +446,7 @@
- }
- 
- 
--#define MAXNAMELEN  (UT_NAMESIZE - 1)
-+#define MAXNAMELEN  (MAXLOGNAME - 1)
- 
- static gboolean
- is_username_used (const gchar *username)
+ #include <glib/gi18n-lib.h>
diff --git a/sysutils/cinnamon-control-center/pkg-plist b/sysutils/cinnamon-control-center/pkg-plist
index 1936ef76a..057bb3791 100644
--- a/sysutils/cinnamon-control-center/pkg-plist
+++ b/sysutils/cinnamon-control-center/pkg-plist
@@ -8,30 +8,18 @@ include/cinnamon-control-center-1/libcinnamon-control-center/cc-shell.h
 lib/cinnamon-control-center-1/panels/libcolor.a
 lib/cinnamon-control-center-1/panels/libcolor.la
 lib/cinnamon-control-center-1/panels/libcolor.so
-lib/cinnamon-control-center-1/panels/libdate_time.a
-lib/cinnamon-control-center-1/panels/libdate_time.la
-lib/cinnamon-control-center-1/panels/libdate_time.so
 lib/cinnamon-control-center-1/panels/libdisplay.a
 lib/cinnamon-control-center-1/panels/libdisplay.la
 lib/cinnamon-control-center-1/panels/libdisplay.so
-lib/cinnamon-control-center-1/panels/libinfo.a
-lib/cinnamon-control-center-1/panels/libinfo.la
-lib/cinnamon-control-center-1/panels/libinfo.so
 lib/cinnamon-control-center-1/panels/libpower.a
 lib/cinnamon-control-center-1/panels/libpower.la
 lib/cinnamon-control-center-1/panels/libpower.so
-%%CUPS%%lib/cinnamon-control-center-1/panels/libprinters.a
-%%CUPS%%lib/cinnamon-control-center-1/panels/libprinters.la
-%%CUPS%%lib/cinnamon-control-center-1/panels/libprinters.so
 lib/cinnamon-control-center-1/panels/libregion.a
 lib/cinnamon-control-center-1/panels/libregion.la
 lib/cinnamon-control-center-1/panels/libregion.so
 lib/cinnamon-control-center-1/panels/libscreen.a
 lib/cinnamon-control-center-1/panels/libscreen.la
 lib/cinnamon-control-center-1/panels/libscreen.so
-lib/cinnamon-control-center-1/panels/libsound.a
-lib/cinnamon-control-center-1/panels/libsound.la
-lib/cinnamon-control-center-1/panels/libsound.so
 lib/cinnamon-control-center-1/panels/libsoundnua.a
 lib/cinnamon-control-center-1/panels/libsoundnua.la
 lib/cinnamon-control-center-1/panels/libsoundnua.so
@@ -47,183 +35,85 @@ lib/libcinnamon-control-center.so.1
 libdata/pkgconfig/libcinnamon-control-center.pc
 share/applications/cinnamon-color-panel.desktop
 share/applications/cinnamon-control-center.desktop
-share/applications/cinnamon-datetime-panel.desktop
 share/applications/cinnamon-display-panel.desktop
-share/applications/cinnamon-info-panel.desktop
 share/applications/cinnamon-power-panel.desktop
-%%CUPS%%share/applications/cinnamon-printers-panel.desktop
 share/applications/cinnamon-region-panel.desktop
 share/applications/cinnamon-screen-panel.desktop
 share/applications/cinnamon-sound-nua-panel.desktop
 share/applications/cinnamon-sound-panel.desktop
 share/applications/cinnamon-universal-access-panel.desktop
 share/applications/cinnamon-user-accounts-panel.desktop
-share/cinnamon-control-center/datetime/backward
-share/cinnamon-control-center/icons/hicolor/16x16/devices/cin-audio-headset.svg
-share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-high.png
-share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-low.png
-share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-medium.png
-share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-muted.png
-share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-high.png
-share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-low.png
-share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-medium.png
-share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-muted.png
-share/cinnamon-control-center/icons/hicolor/24x24/devices/cin-audio-headset.svg
-share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-high.png
-share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-low.png
-share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-medium.png
-share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-muted.png
-share/cinnamon-control-center/icons/hicolor/32x32/devices/cin-audio-headset.svg
-share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-high.png
-share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-low.png
-share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-medium.png
-share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-muted.png
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-center-back-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-center-back.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-center-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-center.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-left-back-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-left-back.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-left-side-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-left-side.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-left-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-left.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-right-back-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-right-back.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-right-side-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-right-side.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-right-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-speaker-right.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-subwoofer-testing.svg
-share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/audio-subwoofer.svg
-share/cinnamon-control-center/language-options
-share/cinnamon-control-center/language-options.bak
-share/cinnamon-control-center/pixmaps/about-me-lock-open.png
-share/cinnamon-control-center/pixmaps/about-me-lock.png
-share/cinnamon-control-center/pixmaps/left-index-finger.png
-share/cinnamon-control-center/pixmaps/left-index-finger.svg
-share/cinnamon-control-center/pixmaps/left-little-finger.png
-share/cinnamon-control-center/pixmaps/left-little-finger.svg
-share/cinnamon-control-center/pixmaps/left-middle-finger.png
-share/cinnamon-control-center/pixmaps/left-middle-finger.svg
-share/cinnamon-control-center/pixmaps/left-ring-finger.png
-share/cinnamon-control-center/pixmaps/left-ring-finger.svg
-share/cinnamon-control-center/pixmaps/left-thumb.png
-share/cinnamon-control-center/pixmaps/left-thumb.svg
-share/cinnamon-control-center/pixmaps/print_error.png
-share/cinnamon-control-center/pixmaps/print_error.svg
-share/cinnamon-control-center/pixmaps/print_ok.png
-share/cinnamon-control-center/pixmaps/print_ok.svg
-share/cinnamon-control-center/pixmaps/right-index-finger.png
-share/cinnamon-control-center/pixmaps/right-index-finger.svg
-share/cinnamon-control-center/pixmaps/right-little-finger.png
-share/cinnamon-control-center/pixmaps/right-little-finger.svg
-share/cinnamon-control-center/pixmaps/right-middle-finger.png
-share/cinnamon-control-center/pixmaps/right-middle-finger.svg
-share/cinnamon-control-center/pixmaps/right-ring-finger.png
-share/cinnamon-control-center/pixmaps/right-ring-finger.svg
-share/cinnamon-control-center/pixmaps/right-thumb.png
-share/cinnamon-control-center/pixmaps/right-thumb.svg
+%%DATADIR%%/icons/hicolor/16x16/devices/cin-audio-headset.svg
+%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/22x22/status/cin-audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/22x22/status/cin-audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/22x22/status/cin-audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/22x22/status/cin-audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/24x24/devices/cin-audio-headset.svg
+%%DATADIR%%/icons/hicolor/24x24/status/cin-audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/24x24/status/cin-audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/24x24/status/cin-audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/24x24/status/cin-audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/32x32/devices/cin-audio-headset.svg
+%%DATADIR%%/icons/hicolor/32x32/status/cin-audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/32x32/status/cin-audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/32x32/status/cin-audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/32x32/status/cin-audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg
+%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer.svg
+%%DATADIR%%/pixmaps/about-me-lock-open.png
+%%DATADIR%%/pixmaps/about-me-lock.png
+%%DATADIR%%/pixmaps/left-index-finger.png
+%%DATADIR%%/pixmaps/left-index-finger.svg
+%%DATADIR%%/pixmaps/left-little-finger.png
+%%DATADIR%%/pixmaps/left-little-finger.svg
+%%DATADIR%%/pixmaps/left-middle-finger.png
+%%DATADIR%%/pixmaps/left-middle-finger.svg
+%%DATADIR%%/pixmaps/left-ring-finger.png
+%%DATADIR%%/pixmaps/left-ring-finger.svg
+%%DATADIR%%/pixmaps/left-thumb.png
+%%DATADIR%%/pixmaps/left-thumb.svg
+%%DATADIR%%/pixmaps/print_error.png
+%%DATADIR%%/pixmaps/print_error.svg
+%%DATADIR%%/pixmaps/print_ok.png
+%%DATADIR%%/pixmaps/print_ok.svg
+%%DATADIR%%/pixmaps/right-index-finger.png
+%%DATADIR%%/pixmaps/right-index-finger.svg
+%%DATADIR%%/pixmaps/right-little-finger.png
+%%DATADIR%%/pixmaps/right-little-finger.svg
+%%DATADIR%%/pixmaps/right-middle-finger.png
+%%DATADIR%%/pixmaps/right-middle-finger.svg
+%%DATADIR%%/pixmaps/right-ring-finger.png
+%%DATADIR%%/pixmaps/right-ring-finger.svg
+%%DATADIR%%/pixmaps/right-thumb.png
+%%DATADIR%%/pixmaps/right-thumb.svg
 share/cinnamon-control-center/sounds/cinnamon-sounds-default.xml
 share/cinnamon-control-center/ui/cinnamon-region-panel-layout-chooser.ui
 share/cinnamon-control-center/ui/cinnamon-region-panel-options-dialog.ui
 share/cinnamon-control-center/ui/cinnamon-region-panel.ui
-share/cinnamon-control-center/ui/cinnamon.png
 share/cinnamon-control-center/ui/color.ui
-share/cinnamon-control-center/ui/datetime/bg.png
-share/cinnamon-control-center/ui/datetime/bg_dim.png
-share/cinnamon-control-center/ui/datetime/cc.png
-share/cinnamon-control-center/ui/datetime/datetime.ui
-share/cinnamon-control-center/ui/datetime/pin.png
-share/cinnamon-control-center/ui/datetime/timezone_%%XAWVER%%.75.png
-share/cinnamon-control-center/ui/datetime/timezone_%%XAWVER%%.75_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_%%XAWVER%%.png
-share/cinnamon-control-center/ui/datetime/timezone_%%XAWVER%%_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-%%XAWVER%%.png
-share/cinnamon-control-center/ui/datetime/timezone_-%%XAWVER%%_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-1.png
-share/cinnamon-control-center/ui/datetime/timezone_-10.png
-share/cinnamon-control-center/ui/datetime/timezone_-10_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-11.png
-share/cinnamon-control-center/ui/datetime/timezone_-11_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-1_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-2.png
-share/cinnamon-control-center/ui/datetime/timezone_-2_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-3.5.png
-share/cinnamon-control-center/ui/datetime/timezone_-3.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-3.png
-share/cinnamon-control-center/ui/datetime/timezone_-3_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-4.5.png
-share/cinnamon-control-center/ui/datetime/timezone_-4.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-4.png
-share/cinnamon-control-center/ui/datetime/timezone_-4_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-5.5.png
-share/cinnamon-control-center/ui/datetime/timezone_-5.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-5.png
-share/cinnamon-control-center/ui/datetime/timezone_-5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-6.png
-share/cinnamon-control-center/ui/datetime/timezone_-6_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-7.png
-share/cinnamon-control-center/ui/datetime/timezone_-7_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-9.5.png
-share/cinnamon-control-center/ui/datetime/timezone_-9.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-9.png
-share/cinnamon-control-center/ui/datetime/timezone_-9_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_0.png
-share/cinnamon-control-center/ui/datetime/timezone_0_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_1.png
-share/cinnamon-control-center/ui/datetime/timezone_10.5.png
-share/cinnamon-control-center/ui/datetime/timezone_10.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_10.png
-share/cinnamon-control-center/ui/datetime/timezone_10_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_11.5.png
-share/cinnamon-control-center/ui/datetime/timezone_11.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_11.png
-share/cinnamon-control-center/ui/datetime/timezone_11_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_12.75.png
-share/cinnamon-control-center/ui/datetime/timezone_12.75_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_12.png
-share/cinnamon-control-center/ui/datetime/timezone_12_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_13.png
-share/cinnamon-control-center/ui/datetime/timezone_13_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_14.png
-share/cinnamon-control-center/ui/datetime/timezone_14_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_1_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_2.png
-share/cinnamon-control-center/ui/datetime/timezone_2_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_3.5.png
-share/cinnamon-control-center/ui/datetime/timezone_3.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_3.png
-share/cinnamon-control-center/ui/datetime/timezone_3_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_4.5.png
-share/cinnamon-control-center/ui/datetime/timezone_4.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_4.png
-share/cinnamon-control-center/ui/datetime/timezone_4_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_5.5.png
-share/cinnamon-control-center/ui/datetime/timezone_5.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_5.75.png
-share/cinnamon-control-center/ui/datetime/timezone_5.75_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_5.png
-share/cinnamon-control-center/ui/datetime/timezone_5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_6.5.png
-share/cinnamon-control-center/ui/datetime/timezone_6.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_6.png
-share/cinnamon-control-center/ui/datetime/timezone_6_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_7.png
-share/cinnamon-control-center/ui/datetime/timezone_7_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_9.5.png
-share/cinnamon-control-center/ui/datetime/timezone_9.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_9.png
-share/cinnamon-control-center/ui/datetime/timezone_9_dim.png
 share/cinnamon-control-center/ui/display-capplet.ui
-share/cinnamon-control-center/ui/info.ui
 share/cinnamon-control-center/ui/language-chooser.ui
 share/cinnamon-control-center/ui/power.ui
-%%CUPS%%share/cinnamon-control-center/ui/printers/jobs-dialog.ui
-%%CUPS%%share/cinnamon-control-center/ui/printers/new-printer-dialog.ui
-%%CUPS%%share/cinnamon-control-center/ui/printers/options-dialog.ui
-%%CUPS%%share/cinnamon-control-center/ui/printers/ppd-selection-dialog.ui
-%%CUPS%%share/cinnamon-control-center/ui/printers/printers.ui
 share/cinnamon-control-center/ui/screen.ui
 share/cinnamon-control-center/ui/shell.ui
 share/cinnamon-control-center/ui/uap.ui
@@ -239,206 +129,131 @@ share/icons/hicolor/16x16/apps/cin-multimedia-volume-control.svg
 share/icons/hicolor/16x16/apps/cinnamon-power-manager.png
 share/icons/hicolor/16x16/apps/cinnamon-preferences-color.png
 share/icons/hicolor/16x16/apps/cinnamon-preferences-desktop-display.png
-share/icons/hicolor/16x16/apps/cinnamon-preferences-system-time.png
 share/icons/hicolor/22x22/apps/cin-multimedia-volume-control.png
 share/icons/hicolor/22x22/apps/cin-multimedia-volume-control.svg
 share/icons/hicolor/22x22/apps/cinnamon-power-manager.png
 share/icons/hicolor/22x22/apps/cinnamon-preferences-color.png
 share/icons/hicolor/22x22/apps/cinnamon-preferences-desktop-display.png
-share/icons/hicolor/22x22/apps/cinnamon-preferences-system-time.png
 share/icons/hicolor/24x24/apps/cin-multimedia-volume-control.png
 share/icons/hicolor/24x24/apps/cinnamon-power-manager.png
 share/icons/hicolor/24x24/apps/cinnamon-preferences-color.png
 share/icons/hicolor/24x24/apps/cinnamon-preferences-desktop-display.png
 share/icons/hicolor/256x256/apps/cinnamon-power-manager.png
 share/icons/hicolor/256x256/apps/cinnamon-preferences-color.png
-share/icons/hicolor/256x256/apps/cinnamon-preferences-system-time.png
 share/icons/hicolor/32x32/apps/cin-multimedia-volume-control.png
 share/icons/hicolor/32x32/apps/cin-multimedia-volume-control.svg
 share/icons/hicolor/32x32/apps/cinnamon-power-manager.png
 share/icons/hicolor/32x32/apps/cinnamon-preferences-color.png
 share/icons/hicolor/32x32/apps/cinnamon-preferences-desktop-display.png
-share/icons/hicolor/32x32/apps/cinnamon-preferences-system-time.png
-share/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/apps/cin-multimedia-volume-control.png
-share/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/apps/cinnamon-power-manager.png
-share/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/apps/cinnamon-preferences-color.png
-share/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/apps/cinnamon-preferences-system-time.png
-share/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices/cin-audio-headset.svg
+share/icons/hicolor/48x48/apps/cin-multimedia-volume-control.png
+share/icons/hicolor/48x48/apps/cinnamon-power-manager.png
+share/icons/hicolor/48x48/apps/cinnamon-preferences-color.png
+share/icons/hicolor/48x48/devices/cin-audio-headset.svg
 share/icons/hicolor/64x64/apps/cinnamon-preferences-color.png
 share/icons/hicolor/scalable/apps/cin-multimedia-volume-control.svg
 share/icons/hicolor/scalable/apps/cinnamon-preferences-color.svg
 share/icons/hicolor/scalable/apps/cinnamon-preferences-desktop-display.svg
-share/icons/hicolor/scalable/apps/cinnamon-preferences-system-time.svg
 share/icons/hicolor/scalable/status/cin-audio-input-microphone-high-symbolic.svg
 share/icons/hicolor/scalable/status/cin-audio-input-microphone-low-symbolic.svg
 share/icons/hicolor/scalable/status/cin-audio-input-microphone-medium-symbolic.svg
 share/icons/hicolor/scalable/status/cin-audio-input-microphone-muted-symbolic.svg
 share/locale/af/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/am/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/am/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ar/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ar/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/as/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/as/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ast/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ast/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/az/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/be/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/be@latin/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/bg/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/bg/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/bn/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/bn/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/bn_IN/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/bn_IN/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/br/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/bs/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/bs/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ca/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ca/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/ca@valencia/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/crh/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/cs/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/cs/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/cy/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/cy/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/da/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/da/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/de/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/de/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/dz/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/el/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/el/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/en/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/en@shaw/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/en_CA/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/en_GB/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/en_GB/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/eo/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/es/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/es/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/et/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/et/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/eu/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/fa/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/fa/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/fi/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/fi/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/fr/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/fr/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/ga/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/gl/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/gl/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/gu/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/gu/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/he/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/he/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/hi/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/hi/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/hr/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/hr/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/hu/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/hu/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/hy/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/id/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/id/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ilo/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
-share/locale/is/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/is/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/it/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/it/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ja/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ja/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ka/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ka/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/kk/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/km/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/kn/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/kn/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ko/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ko/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ku/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ku/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/ky/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/lo/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
-share/locale/lt/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/lt/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/lv/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/lv/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/mai/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/mai/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/mg/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/mk/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/mk/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ml/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ml/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/mn/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/mr/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/mr/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ms/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ms/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/my/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/nb/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/nb/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/nds/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/nds/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/ne/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/nl/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/nl/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/nn/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/nn/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/nso/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/oc/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/or/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/or/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/pa/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/pa/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/pl/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/pl/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/pt/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/pt/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/pt_BR/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/pt_BR/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ro/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ro/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ru/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ru/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/rw/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/si/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/si/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sk/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/sk/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sl/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/sl/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sq/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/sq/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sr/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/sr/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sr@latin/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/sr@latin/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sv/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/sv/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ta/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/ta/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/te/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/te/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/th/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/tr/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/tr/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/ug/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/uk/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/uk/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ur/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/uz/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/uz@cyrillic/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/vi/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/vi/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/wa/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/xh/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/zh_CN/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/zh_CN/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/zh_HK/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/zh_TW/LC_MESSAGES/cinnamon-control-center-1.0-timezones.mo
 share/locale/zh_TW/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/locale/zu/LC_MESSAGES/cinnamon-control-center-1.0.mo
 share/pixmaps/cinnamon/faces/astronaut.jpg
@@ -474,19 +289,14 @@ share/sounds/cinnamon/default/alerts/sonar.ogg
 @dirrm share/sounds/cinnamon/default/alerts
 @dirrm share/sounds/cinnamon/default
 @dirrm share/sounds/cinnamon
-@dirrmtry share/polkit-1/rules.d
 @dirrm share/pixmaps/cinnamon/faces
 @dirrm share/pixmaps/cinnamon
-@dirrmtry share/locale/ilo/LC_MESSAGES
-@dirrmtry share/locale/ilo
 @dirrm share/cinnamon-control-center/ui/user-accounts
-%%CUPS%%@dirrmtry share/cinnamon-control-center/ui/printers
-@dirrm share/cinnamon-control-center/ui/datetime
 @dirrm share/cinnamon-control-center/ui
 @dirrm share/cinnamon-control-center/sounds
 @dirrm share/cinnamon-control-center/pixmaps
-@dirrm share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%/devices
-@dirrm share/cinnamon-control-center/icons/hicolor/4%%XAWVER%%x4%%XAWVER%%
+@dirrm share/cinnamon-control-center/icons/hicolor/48x48/devices
+@dirrm share/cinnamon-control-center/icons/hicolor/48x48
 @dirrm share/cinnamon-control-center/icons/hicolor/32x32/status
 @dirrm share/cinnamon-control-center/icons/hicolor/32x32/devices
 @dirrm share/cinnamon-control-center/icons/hicolor/32x32
@@ -500,7 +310,6 @@ share/sounds/cinnamon/default/alerts/sonar.ogg
 @dirrm share/cinnamon-control-center/icons/hicolor/16x16
 @dirrm share/cinnamon-control-center/icons/hicolor
 @dirrm share/cinnamon-control-center/icons
-@dirrm share/cinnamon-control-center/datetime
 @dirrm share/cinnamon-control-center
 @dirrm lib/cinnamon-control-center-1/panels
 @dirrm lib/cinnamon-control-center-1