Ubuntu
gnome-control-center package

Merge lp:~rodrigo-moya/ubuntu/natty/gnome-control-center/2_32_1_release into lp:~ubuntu-desktop/gnome-control-center/ubuntu

  1. Natty (11.04)
  2. 2_32_1_release
  3. Merge into ubuntu
Proposed by Rodrigo Moya
Status: Merged
Merged at revision: 196
Proposed branch: lp:~rodrigo-moya/ubuntu/natty/gnome-control-center/2_32_1_release
Merge into: lp:~ubuntu-desktop/gnome-control-center/ubuntu
Diff against target: 51 lines (+8/-22)
3 files modified
debian/changelog (+8/-0)
debian/patches/98_fix_dso_linking.patch (+0/-21)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/natty/gnome-control-center/2_32_1_release
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+41166@code.launchpad.net

Description of the change

2.32 upstream release

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-11-10 15:52:54 +0000
+++ debian/changelog 2010-11-18 12:51:55 +0000
@@ -1,3 +1,11 @@
1gnome-control-center (1:2.32.1-0ubuntu1) natty; urgency=low
2
3 * New upstream release
4 * debian/patches/98_fix_dso_linking.patch:
5 - Remove upstreamed patch
6
7 -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 18 Nov 2010 10:24:28 +0100
8
1gnome-control-center (1:2.32.0-0ubuntu3) natty; urgency=low9gnome-control-center (1:2.32.0-0ubuntu3) natty; urgency=low
210
3 [ Martin Pitt ]11 [ Martin Pitt ]
412
=== removed file 'debian/patches/98_fix_dso_linking.patch'
--- debian/patches/98_fix_dso_linking.patch 2010-11-10 15:52:47 +0000
+++ debian/patches/98_fix_dso_linking.patch 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
1Index: gnome-control-center-2.32.0/capplets/keyboard/Makefile.am
2===================================================================
3--- gnome-control-center-2.32.0.orig/capplets/keyboard/Makefile.am 2010-11-10 16:43:24.228649002 +0100
4+++ gnome-control-center-2.32.0/capplets/keyboard/Makefile.am 2010-11-10 16:44:20.368649000 +0100
5@@ -15,7 +15,7 @@
6 gnome-keyboard-properties-xkbpv.c \
7 gnome-keyboard-properties-xkb.h
8
9-gnome_keyboard_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBGNOMEKBDUI_LIBS)
10+gnome_keyboard_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBGNOMEKBDUI_LIBS) $(LIBGNOMEKBD_LIBS)
11
12 @INTLTOOL_DESKTOP_RULE@
13
14@@ -33,6 +33,7 @@
15 INCLUDES = \
16 $(GNOMECC_CAPPLETS_CFLAGS) \
17 $(LIBGNOMEKBDUI_CFLAGS) \
18+ $(LIBGNOMEKBD_CFLAGS) \
19 -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
20 -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
21 -DGNOMECC_UI_DIR="\"$(uidir)\""
220
=== modified file 'debian/patches/series'
--- debian/patches/series 2010-11-10 15:52:47 +0000
+++ debian/patches/series 2010-11-18 12:51:55 +0000
@@ -15,5 +15,4 @@
1595_desktop-effects-integration.patch1595_desktop-effects-integration.patch
1696_hide_accessible_login.patch1696_hide_accessible_login.patch
1797_subpixel_hinting_defaults.patch1797_subpixel_hinting_defaults.patch
1898_fix_dso_linking.patch
1999_ltmain_as-needed.patch1899_ltmain_as-needed.patch

Subscribers

People subscribed via source and target branches