Merge lp:~seb128/unity-control-center/user-faces-binary into lp:unity-control-center

Proposed by Sebastien Bacher on 2015-11-03
Status: Merged
Approved by: Sebastien Bacher on 2015-11-06
Approved revision: 12836
Merged at revision: 12838
Proposed branch: lp:~seb128/unity-control-center/user-faces-binary
Merge into: lp:unity-control-center
Diff against target: 136 lines (+47/-0)
5 files modified
configure.ac (+1/-0)
debian/control (+9/-0)
debian/unity-control-center-faces.install (+1/-0)
panels/user-accounts/data/Makefile.am (+2/-0)
panels/user-accounts/data/faces/Makefile.am (+34/-0)
To merge this branch: bzr merge lp:~seb128/unity-control-center/user-faces-binary
Reviewer Review Type Date Requested Status
Robert Ancell 2015-11-03 Approve on 2015-11-04
Review via email: mp+276498@code.launchpad.net

Commit message

Import user-accounts faces image and ship in a new binary, that way
unity-control-center doesn't have to depends on gnome-control-center
which means that one can be moved to universe

Description of the change

Import user-accounts faces image and ship in a new binary, that way
unity-control-center doesn't have to depends on gnome-control-center
which means that one can be moved to universe

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2015-08-18 12:10:55 +0000
3+++ configure.ac 2015-11-03 08:30:20 +0000
4@@ -486,6 +486,7 @@
5 panels/user-accounts/Makefile
6 panels/user-accounts/data/Makefile
7 panels/user-accounts/data/unity-user-accounts-panel.desktop.in
8+panels/user-accounts/data/faces/Makefile
9 panels/wacom/Makefile
10 panels/wacom/calibrator/Makefile
11 panels/wacom/unity-wacom-panel.desktop.in
12
13=== modified file 'debian/control'
14--- debian/control 2015-08-18 12:10:55 +0000
15+++ debian/control 2015-11-03 08:30:20 +0000
16@@ -122,6 +122,15 @@
17 It also contains a front end to these applets, which can also be
18 accessed with the GNOME panel or the Nautilus file manager.
19
20+Package: unity-control-center-faces
21+Architecture: all
22+Depends: ${misc:Depends}
23+Replaces: gnome-control-center-shared-data
24+Conflicts: gnome-control-center-shared-data
25+Provides: gnome-control-center-shared-data
26+Description: utilities to configure the GNOME desktop - faces images
27+ This package contains images that can be used for user profile's icon
28+
29 Package: unity-control-center-dev
30 Architecture: all
31 Section: devel
32
33=== added file 'debian/unity-control-center-faces.install'
34--- debian/unity-control-center-faces.install 1970-01-01 00:00:00 +0000
35+++ debian/unity-control-center-faces.install 2015-11-03 08:30:20 +0000
36@@ -0,0 +1,1 @@
37+usr/share/pixmaps/faces
38
39=== modified file 'panels/user-accounts/data/Makefile.am'
40--- panels/user-accounts/data/Makefile.am 2014-02-21 15:48:18 +0000
41+++ panels/user-accounts/data/Makefile.am 2015-11-03 08:30:20 +0000
42@@ -1,3 +1,5 @@
43+SUBDIRS = faces
44+
45 @INTLTOOL_DESKTOP_RULE@
46
47 desktopdir = $(datadir)/applications
48
49=== added directory 'panels/user-accounts/data/faces'
50=== added file 'panels/user-accounts/data/faces/Makefile.am'
51--- panels/user-accounts/data/faces/Makefile.am 1970-01-01 00:00:00 +0000
52+++ panels/user-accounts/data/faces/Makefile.am 2015-11-03 08:30:20 +0000
53@@ -0,0 +1,34 @@
54+
55+imagedir = $(datadir)/pixmaps/faces
56+
57+image_DATA = \
58+ astronaut.jpg \
59+ baseball.png \
60+ butterfly.png \
61+ cat-eye.jpg \
62+ chess.jpg \
63+ coffee.jpg \
64+ dice.jpg \
65+ energy-arc.jpg \
66+ fish.jpg \
67+ flake.jpg \
68+ flower.jpg \
69+ grapes.jpg \
70+ guitar.jpg \
71+ launch.jpg \
72+ leaf.jpg \
73+ lightning.jpg \
74+ penguin.jpg \
75+ puppy.jpg \
76+ sky.jpg \
77+ soccerball.png \
78+ sunflower.jpg \
79+ sunset.jpg \
80+ tennis-ball.png \
81+ yellow-rose.jpg
82+
83+EXTRA_DIST = \
84+ $(image_DATA)
85+
86+-include $(top_srcdir)/git.mk
87+
88
89=== added file 'panels/user-accounts/data/faces/astronaut.jpg'
90Binary files panels/user-accounts/data/faces/astronaut.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/astronaut.jpg 2015-11-03 08:30:20 +0000 differ
91=== added file 'panels/user-accounts/data/faces/baseball.png'
92Binary files panels/user-accounts/data/faces/baseball.png 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/baseball.png 2015-11-03 08:30:20 +0000 differ
93=== added file 'panels/user-accounts/data/faces/butterfly.png'
94Binary files panels/user-accounts/data/faces/butterfly.png 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/butterfly.png 2015-11-03 08:30:20 +0000 differ
95=== added file 'panels/user-accounts/data/faces/cat-eye.jpg'
96Binary files panels/user-accounts/data/faces/cat-eye.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/cat-eye.jpg 2015-11-03 08:30:20 +0000 differ
97=== added file 'panels/user-accounts/data/faces/chess.jpg'
98Binary files panels/user-accounts/data/faces/chess.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/chess.jpg 2015-11-03 08:30:20 +0000 differ
99=== added file 'panels/user-accounts/data/faces/coffee.jpg'
100Binary files panels/user-accounts/data/faces/coffee.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/coffee.jpg 2015-11-03 08:30:20 +0000 differ
101=== added file 'panels/user-accounts/data/faces/dice.jpg'
102Binary files panels/user-accounts/data/faces/dice.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/dice.jpg 2015-11-03 08:30:20 +0000 differ
103=== added file 'panels/user-accounts/data/faces/energy-arc.jpg'
104Binary files panels/user-accounts/data/faces/energy-arc.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/energy-arc.jpg 2015-11-03 08:30:20 +0000 differ
105=== added file 'panels/user-accounts/data/faces/fish.jpg'
106Binary files panels/user-accounts/data/faces/fish.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/fish.jpg 2015-11-03 08:30:20 +0000 differ
107=== added file 'panels/user-accounts/data/faces/flake.jpg'
108Binary files panels/user-accounts/data/faces/flake.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/flake.jpg 2015-11-03 08:30:20 +0000 differ
109=== added file 'panels/user-accounts/data/faces/flower.jpg'
110Binary files panels/user-accounts/data/faces/flower.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/flower.jpg 2015-11-03 08:30:20 +0000 differ
111=== added file 'panels/user-accounts/data/faces/grapes.jpg'
112Binary files panels/user-accounts/data/faces/grapes.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/grapes.jpg 2015-11-03 08:30:20 +0000 differ
113=== added file 'panels/user-accounts/data/faces/guitar.jpg'
114Binary files panels/user-accounts/data/faces/guitar.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/guitar.jpg 2015-11-03 08:30:20 +0000 differ
115=== added file 'panels/user-accounts/data/faces/launch.jpg'
116Binary files panels/user-accounts/data/faces/launch.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/launch.jpg 2015-11-03 08:30:20 +0000 differ
117=== added file 'panels/user-accounts/data/faces/leaf.jpg'
118Binary files panels/user-accounts/data/faces/leaf.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/leaf.jpg 2015-11-03 08:30:20 +0000 differ
119=== added file 'panels/user-accounts/data/faces/lightning.jpg'
120Binary files panels/user-accounts/data/faces/lightning.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/lightning.jpg 2015-11-03 08:30:20 +0000 differ
121=== added file 'panels/user-accounts/data/faces/penguin.jpg'
122Binary files panels/user-accounts/data/faces/penguin.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/penguin.jpg 2015-11-03 08:30:20 +0000 differ
123=== added file 'panels/user-accounts/data/faces/puppy.jpg'
124Binary files panels/user-accounts/data/faces/puppy.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/puppy.jpg 2015-11-03 08:30:20 +0000 differ
125=== added file 'panels/user-accounts/data/faces/sky.jpg'
126Binary files panels/user-accounts/data/faces/sky.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/sky.jpg 2015-11-03 08:30:20 +0000 differ
127=== added file 'panels/user-accounts/data/faces/soccerball.png'
128Binary files panels/user-accounts/data/faces/soccerball.png 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/soccerball.png 2015-11-03 08:30:20 +0000 differ
129=== added file 'panels/user-accounts/data/faces/sunflower.jpg'
130Binary files panels/user-accounts/data/faces/sunflower.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/sunflower.jpg 2015-11-03 08:30:20 +0000 differ
131=== added file 'panels/user-accounts/data/faces/sunset.jpg'
132Binary files panels/user-accounts/data/faces/sunset.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/sunset.jpg 2015-11-03 08:30:20 +0000 differ
133=== added file 'panels/user-accounts/data/faces/tennis-ball.png'
134Binary files panels/user-accounts/data/faces/tennis-ball.png 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/tennis-ball.png 2015-11-03 08:30:20 +0000 differ
135=== added file 'panels/user-accounts/data/faces/yellow-rose.jpg'
136Binary files panels/user-accounts/data/faces/yellow-rose.jpg 1970-01-01 00:00:00 +0000 and panels/user-accounts/data/faces/yellow-rose.jpg 2015-11-03 08:30:20 +0000 differ

Subscribers

People subscribed via source and target branches