--- unity-control-center-14.04.2.orig/debian/changelog +++ unity-control-center-14.04.2/debian/changelog @@ -0,0 +1,67 @@ +unity-control-center (14.04.2-0ubuntu1) trusty; urgency=medium + + * Merge in datetime panel from indicator-datetime + * Backport commit to fix notebook spacing issues. + * Let the launcher icons be scaled down to 16. (LP: #1168409). + * keyboard: wrap information label in the shortcuts panel. (LP: #1276119). + + -- Robert Ancell Fri, 14 Feb 2014 14:28:24 +1300 + +unity-control-center (14.04.1-0ubuntu5) trusty; urgency=medium + + * debian/control: + - Run with either gnome-settings-daemon or unity-settings-daemon + (LP: #1277487) + + -- Robert Ancell Fri, 07 Feb 2014 16:22:09 +0000 + +unity-control-center (14.04.1-0ubuntu4) trusty; urgency=medium + + * don't set the alignment of a frame that doesn't exist, fixes a warning + * run "cd po; make update-po" to refresh the strings lists + + -- Sebastien Bacher Fri, 31 Jan 2014 11:50:16 +0100 + +unity-control-center (14.04.1-0ubuntu3) trusty; urgency=medium + + * Imported the current g-c-c translations from launchpad, those include + the Ubuntu specific strings + + [ Robert Ancell ] + * Rename unity-slideshow-* icons to ucc-slideshow-* so we don't conflict + with gnome-control-center-unity anymore + + -- Sebastien Bacher Thu, 30 Jan 2014 16:15:17 +0100 + +unity-control-center (14.04.1-0ubuntu2) trusty; urgency=medium + + * debian/source_unity-control-center.py: + - updated with the recent fixes from gnome-control-center + * debian/unity-control-center.links: + - drop old symlink that was used to add a system-settings entry to + indicator-session, that's deprecated + * po/POTFILES.in: + - updated list of files to translate + + -- Sebastien Bacher Fri, 24 Jan 2014 16:01:06 +0100 + +unity-control-center (14.04.1-0ubuntu1) trusty; urgency=medium + + * Copy icons for sound, display and power panel from GNOME and Humanity themes + so they show as before now the icon names have changed. + + -- Robert Ancell Thu, 09 Jan 2014 15:43:13 +1300 + +unity-control-center (14.04.0-0ubuntu1) trusty; urgency=medium + + * debian/control: + - Use updated gnome-control-center version to conflict with + + -- Robert Ancell Thu, 09 Jan 2014 10:57:38 +1300 + +unity-control-center (14.04.0) trusty; urgency=low + + * Fork gnome-control-center so we can maintain it for Unity 7 until it is + replaced by the Unity 8 equivalent. + + -- Robert Ancell Wed, 08 Jan 2014 16:29:18 +1300 --- unity-control-center-14.04.2.orig/debian/compat +++ unity-control-center-14.04.2/debian/compat @@ -0,0 +1 @@ +9 --- unity-control-center-14.04.2.orig/debian/control +++ unity-control-center-14.04.2/debian/control @@ -0,0 +1,128 @@ +Source: unity-control-center +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +Standards-Version: 3.9.5 +Build-Depends: autotools-dev, + cdbs (>= 0.4.41), + debhelper (>= 9), + desktop-file-utils, + gtk-doc-tools, + gnome-common, + gnome-pkg-tools (>= 0.10), + gnome-settings-daemon-dev (>= 3.8.4), + gsettings-desktop-schemas-dev (>= 3.7.2.2), + hardening-wrapper, + intltool (>= 0.37.1), + libcanberra-gtk3-dev, + libcheese-gtk-dev (>= 2.91.91.1), + libcolord-dev, + libcups2-dev, + libdbus-1-dev (>= 0.32), + libdbus-glib-1-dev (>= 0.32), + libgdk-pixbuf2.0-dev (>= 2.23.0), + libglib2.0-dev (>= 2.31.2), + libgnome-bluetooth-dev (>= 3.3.4), + libgnome-desktop-3-dev (>= 3.5.91), + libgnome-menu-3-dev, + libgnomekbd-dev, + libgoa-1.0-dev (>= 3.5.90), + libgstreamer-plugins-base0.10-dev, + libgtk-3-dev (>= 3.5.13), + libgtop2-dev, + libibus-1.0-dev (>= 1.5.0), + libnm-glib-dev (>= 0.9) [linux-any], + libnm-gtk-dev (>= 0.9) [linux-any], + libnm-util-dev (>= 0.9) [linux-any], + libnotify-dev (>= 0.7.3), + libpolkit-gobject-1-dev (>= 0.103), + libpulse-dev (>= 1:2.0), + libpwquality-dev, + libupower-glib-dev (>= 0.9.1), + libsystemd-login-dev, + libtimezonemap1-dev, + libwacom-dev (>= 0.6), + libx11-dev, + libxft-dev (>= 2.1.2), + libxkbfile-dev, + libxklavier-dev (>= 5.1), + libxml2-dev, + locales, + network-manager-dev (>= 0.9) [linux-any], + shared-mime-info, + libwebkitgtk-3.0-dev, + libgl1-mesa-dev, +Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu + +Package: unity-control-center +Architecture: any +Section: gnome +Depends: ${misc:Depends}, + ${shlibs:Depends}, + accountsservice, + apg, + desktop-file-utils, + gkbd-capplet (>= 3.5.90), + gnome-desktop3-data, + gnome-icon-theme (>= 2.24), + gnome-icon-theme-symbolic, + gnome-menus (>= 2.12.0), + gnome-settings-daemon (>= 3.8.4) | unity-settings-daemon, + gsettings-desktop-schemas (>= 3.5.91), +Recommends: cups-pk-helper, + gnome-session-bin, + ubuntu-system-service, + ibus (>= 1.5.0), + iso-codes, + mousetweaks, + policykit-1-gnome, + libcanberra-pulse, + system-config-printer-gnome +Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50), + unity-control-center-datetime +Replaces: gnome-bluetooth (<< 3.4.0), + unity-control-center-datetime +Breaks: gnome-power-manager (<< 3.0), + gnome-session (<< 3.0), + libglib2.0-0 (<< 2.28.6-2), + gnome-bluetooth (<< 3.4.0), + compiz (<< 1:0.9.8+bzr330), + metacity (<< 1:2.34.2), + unity (<< 6.2-0ubuntu2~) +Suggests: gnome-screensaver | xscreensaver, + gnome-user-guide | ubuntu-docs, + gstreamer0.10-pulseaudio, + libcanberra-gtk-module, + x11-xserver-utils +Provides: unity-control-center-datetime +Description: utilities to configure the GNOME desktop + This package contains configuration applets for the GNOME desktop, + allowing to set accessibility configuration, desktop fonts, keyboard + and mouse properties, sound setup, desktop theme and background, user + interface properties, screen resolution, and other GNOME parameters. + . + It also contains a front end to these applets, which can also be + accessed with the GNOME panel or the Nautilus file manager. + +Package: unity-control-center-dev +Architecture: all +Section: devel +Depends: ${misc:Depends} +Description: utilities to configure the GNOME desktop + This package contains the file required to get the keydirs location + +Package: libunity-control-center-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, + libunity-control-center1 (= ${binary:Version}) +Description: utilities to configure the GNOME desktop + This package contains the files needed to build Control Center panels + +Package: libunity-control-center1 +Architecture: any +Section: libs +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: utilities to configure the GNOME desktop + This package contains the library used by Control Center panels --- unity-control-center-14.04.2.orig/debian/copyright +++ unity-control-center-14.04.2/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Jim Pick jim@jimpick.com on +Sat, 14 Mar 1998 20:12:23 -0800. + +It was downloaded from: + http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/ + +Copyright: 1998,99,2000 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, + USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- unity-control-center-14.04.2.orig/debian/libunity-control-center-dev.install +++ unity-control-center-14.04.2/debian/libunity-control-center-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/*/pkgconfig +debian/tmp/usr/include/unity-control-center-1 +debian/tmp/usr/lib/*/libunity-control-center.so --- unity-control-center-14.04.2.orig/debian/libunity-control-center1.install +++ unity-control-center-14.04.2/debian/libunity-control-center1.install @@ -0,0 +1 @@ +usr/lib/*/libunity-control-center.so.* --- unity-control-center-14.04.2.orig/debian/libunity-control-center1.symbols +++ unity-control-center-14.04.2/debian/libunity-control-center1.symbols @@ -0,0 +1,25 @@ +libunity-control-center.so.1 libunity-control-center1 #MINVER# +* Build-Depends-Package: libunity-control-center-dev + cc_editable_entry_get_editable@Base 14.04.0 + cc_editable_entry_get_scale@Base 14.04.0 + cc_editable_entry_get_selectable@Base 14.04.0 + cc_editable_entry_get_text@Base 14.04.0 + cc_editable_entry_get_type@Base 14.04.0 + cc_editable_entry_get_weight@Base 14.04.0 + cc_editable_entry_new@Base 14.04.0 + cc_editable_entry_set_editable@Base 14.04.0 + cc_editable_entry_set_scale@Base 14.04.0 + cc_editable_entry_set_selectable@Base 14.04.0 + cc_editable_entry_set_text@Base 14.04.0 + cc_editable_entry_set_weight@Base 14.04.0 + cc_panel_get_display_name@Base 14.04.0 + cc_panel_get_help_uri@Base 14.04.0 + cc_panel_get_permission@Base 14.04.0 + cc_panel_get_shell@Base 14.04.0 + cc_panel_get_type@Base 14.04.0 + cc_shell_embed_widget_in_header@Base 14.04.0 + cc_shell_get_active_panel@Base 14.04.0 + cc_shell_get_toplevel@Base 14.04.0 + cc_shell_get_type@Base 14.04.0 + cc_shell_set_active_panel@Base 14.04.0 + cc_shell_set_active_panel_from_id@Base 14.04.0 --- unity-control-center-14.04.2.orig/debian/rules +++ unity-control-center-14.04.2/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk + +export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed +include /usr/share/dpkg/buildflags.mk + +DEB_CONFIGURE_SCRIPT := ./autogen.sh +DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ + --disable-update-mimedb \ + --enable-systemd + +DEB_DH_MAKESHLIBS_ARGS_gnome-control-center = --no-act + +binary-post-install/gnome-control-center-data:: + rm -rf debian/capplets-data/usr/share/applications/mimeinfo.cache + rm -rf debian/capplets-data/usr/share/pkgconfig + dh_installmime -p$(cdbs_curpkg) + +common-binary-post-install-arch:: list-missing --- unity-control-center-14.04.2.orig/debian/source/format +++ unity-control-center-14.04.2/debian/source/format @@ -0,0 +1 @@ +1.0 --- unity-control-center-14.04.2.orig/debian/source_unity-control-center.py +++ unity-control-center-14.04.2/debian/source_unity-control-center.py @@ -0,0 +1,32 @@ +import os, apport.packaging, re +import glob +from apport.hookutils import * + +def add_info(report): + # the issue is not in the unity-control-center code so reassign + if "Stacktrace" in report and "/unity-control-center-1/" in report["Stacktrace"]: + for words in report["Stacktrace"].split(): + if words.startswith("/usr/lib/") and "/control-center-1/" in words: + if apport.packaging.get_file_package(words) != 'unity-control-center': + report.add_package_info(apport.packaging.get_file_package(words)) + return + component = re.compile("lib(\w*).so").search(words).groups(1)[0] + report['Title'] = '[%s]: %s' % (component, report.get('Title', report.standard_title())) + report['Tags'] = '%s %s' % (report.get('Tags', ""), component) + break # Stop on the first .so that's the interesting one + + # collect informations on the /usr/lib/control-center-1 components + plugin_packages = set() + for paneldir in (['/usr/lib/control-center-1'] + glob.glob('/usr/lib/*/control-center-1')): + for dirpath, dirnames, filenames in os.walk(paneldir): + for filename in filenames: + path = os.path.join(dirpath, filename) + package = apport.packaging.get_file_package(path) + if package == 'unity-control-center': + continue + if not package: + continue + + plugin_packages.add(package) + if plugin_packages: + report["usr_lib_unity-control-center"] = package_versions(*sorted(plugin_packages)) --- unity-control-center-14.04.2.orig/debian/unity-control-center-dev.install +++ unity-control-center-14.04.2/debian/unity-control-center-dev.install @@ -0,0 +1 @@ +usr/share/pkgconfig --- unity-control-center-14.04.2.orig/debian/unity-control-center.install +++ unity-control-center-14.04.2/debian/unity-control-center.install @@ -0,0 +1,11 @@ +etc/xdg/menus +usr/bin +usr/lib/*/unity-control-center-1/panels/*.so +usr/share/applications +usr/share/man +usr/share/unity-control-center +usr/share/desktop-directories +usr/share/locale +usr/share/icons +usr/share/polkit-1 +debian/source_unity-control-center.py /usr/share/apport/package-hooks