← Back to branch summary

~kroq-gar78/ubuntu/precise/gnome-control-center/fix-885947

« back to all changes in this revision

Viewing changes to debian/patches/25_window_manager_settings.patch

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-17 10:47:27 UTC
  • mfrom: (0.1.11 experimental) (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110517104727-lqel6m8vhfw5jby1
Tags: 1:3.0.1.1-1ubuntu1
* Rebase on Debian, remaining Ubuntu changes:
* debian/control:
  - Build-Depend on hardening-wrapper, dpkg-dev and dh-autoreconf
  - Add dependency on ubuntu-system-service
  - Remove dependency on gnome-icon-theme-symbolic
  - Move dependency on apg, gnome-icon-theme-symbolic and accountsservice to
    be a Recommends: until we get them in main
* debian/rules:
  - Use autoreconf
  - Add binary-post-install rule for gnome-control-center-data
  - Run dh-autoreconf
* debian/gnome-control-center.dirs:
* debian/gnome-control-center.links:
  - Add a link to the control center shell for indicators
* debian/patches/00_disable-nm.patch:
  - Temporary patch to disable building with NetworkManager until we get
    the new one in the archive
* debian/patches/01_git_remove_gettext_calls.patch:
  - Remove calls to AM_GNU_GETTEXT, IT_PROG_INTLTOOL should be enough
* debian/patches/01_git_kill_warning.patch:
  - Kill warning
* debian/patches/50_ubuntu_systemwide_prefs.patch:
  - Ubuntu specific proxy preferences
* debian/patches/51_ubuntu_system_keyboard.patch:
  - Implement the global keyboard spec at https://wiki.ubuntu.com/DefaultKeyboardSettings

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/25_window_manager_settings.patch
1
 
--- a/capplets/windows/Makefile.am
2
 
+++ b/capplets/windows/Makefile.am
3
 
@@ -20,7 +20,7 @@
4
 
 
5
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)                                        \
6
 
             -I$(top_srcdir)/libwindow-settings \
7
 
-            -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \
8
 
+            -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/libgnome-window-settings1"\" \
9
 
             -DUIDIR=\""$(uidir)"\"     \
10
 
             -DGNOMELOCALEDIR="\"$(datadir)/locale\""                   \
11
 
             -DPIXMAPDIR=\""$(pixmapdir)"\"
12
 
--- a/libwindow-settings/Makefile.am
13
 
+++ b/libwindow-settings/Makefile.am
14
 
@@ -1,4 +1,4 @@
15
 
-WM_MODULE_DIR=$(libdir)/window-manager-settings
16
 
+WM_MODULE_DIR=$(libdir)/libgnome-window-settings1
17
 
 
18
 
 INCLUDES =                                                             \
19
 
        -DGNOMELOCALEDIR="\"$(datadir)/locale\""                        \