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
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-11-10 15:52:54 +0000
3+++ debian/changelog 2010-11-18 12:51:55 +0000
4@@ -1,3 +1,11 @@
5+gnome-control-center (1:2.32.1-0ubuntu1) natty; urgency=low
6+
7+ * New upstream release
8+ * debian/patches/98_fix_dso_linking.patch:
9+ - Remove upstreamed patch
10+
11+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 18 Nov 2010 10:24:28 +0100
12+
13 gnome-control-center (1:2.32.0-0ubuntu3) natty; urgency=low
14
15 [ Martin Pitt ]
16
17=== removed file 'debian/patches/98_fix_dso_linking.patch'
18--- debian/patches/98_fix_dso_linking.patch 2010-11-10 15:52:47 +0000
19+++ debian/patches/98_fix_dso_linking.patch 1970-01-01 00:00:00 +0000
20@@ -1,21 +0,0 @@
21-Index: gnome-control-center-2.32.0/capplets/keyboard/Makefile.am
22-===================================================================
23---- gnome-control-center-2.32.0.orig/capplets/keyboard/Makefile.am 2010-11-10 16:43:24.228649002 +0100
24-+++ gnome-control-center-2.32.0/capplets/keyboard/Makefile.am 2010-11-10 16:44:20.368649000 +0100
25-@@ -15,7 +15,7 @@
26- gnome-keyboard-properties-xkbpv.c \
27- gnome-keyboard-properties-xkb.h
28-
29--gnome_keyboard_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBGNOMEKBDUI_LIBS)
30-+gnome_keyboard_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBGNOMEKBDUI_LIBS) $(LIBGNOMEKBD_LIBS)
31-
32- @INTLTOOL_DESKTOP_RULE@
33-
34-@@ -33,6 +33,7 @@
35- INCLUDES = \
36- $(GNOMECC_CAPPLETS_CFLAGS) \
37- $(LIBGNOMEKBDUI_CFLAGS) \
38-+ $(LIBGNOMEKBD_CFLAGS) \
39- -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
40- -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
41- -DGNOMECC_UI_DIR="\"$(uidir)\""
42
43=== modified file 'debian/patches/series'
44--- debian/patches/series 2010-11-10 15:52:47 +0000
45+++ debian/patches/series 2010-11-18 12:51:55 +0000
46@@ -15,5 +15,4 @@
47 95_desktop-effects-integration.patch
48 96_hide_accessible_login.patch
49 97_subpixel_hinting_defaults.patch
50-98_fix_dso_linking.patch
51 99_ltmain_as-needed.patch

Subscribers

People subscribed via source and target branches