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
=== modified file 'configure.ac'
--- configure.ac 2015-08-18 12:10:55 +0000
+++ configure.ac 2015-11-03 08:30:20 +0000
@@ -486,6 +486,7 @@
486panels/user-accounts/Makefile486panels/user-accounts/Makefile
487panels/user-accounts/data/Makefile487panels/user-accounts/data/Makefile
488panels/user-accounts/data/unity-user-accounts-panel.desktop.in488panels/user-accounts/data/unity-user-accounts-panel.desktop.in
489panels/user-accounts/data/faces/Makefile
489panels/wacom/Makefile490panels/wacom/Makefile
490panels/wacom/calibrator/Makefile491panels/wacom/calibrator/Makefile
491panels/wacom/unity-wacom-panel.desktop.in492panels/wacom/unity-wacom-panel.desktop.in
492493
=== modified file 'debian/control'
--- debian/control 2015-08-18 12:10:55 +0000
+++ debian/control 2015-11-03 08:30:20 +0000
@@ -122,6 +122,15 @@
122 It also contains a front end to these applets, which can also be122 It also contains a front end to these applets, which can also be
123 accessed with the GNOME panel or the Nautilus file manager.123 accessed with the GNOME panel or the Nautilus file manager.
124124
125Package: unity-control-center-faces
126Architecture: all
127Depends: ${misc:Depends}
128Replaces: gnome-control-center-shared-data
129Conflicts: gnome-control-center-shared-data
130Provides: gnome-control-center-shared-data
131Description: utilities to configure the GNOME desktop - faces images
132 This package contains images that can be used for user profile's icon
133
125Package: unity-control-center-dev134Package: unity-control-center-dev
126Architecture: all135Architecture: all
127Section: devel136Section: devel
128137
=== added file 'debian/unity-control-center-faces.install'
--- debian/unity-control-center-faces.install 1970-01-01 00:00:00 +0000
+++ debian/unity-control-center-faces.install 2015-11-03 08:30:20 +0000
@@ -0,0 +1,1 @@
1usr/share/pixmaps/faces
02
=== modified file 'panels/user-accounts/data/Makefile.am'
--- panels/user-accounts/data/Makefile.am 2014-02-21 15:48:18 +0000
+++ panels/user-accounts/data/Makefile.am 2015-11-03 08:30:20 +0000
@@ -1,3 +1,5 @@
1SUBDIRS = faces
2
1@INTLTOOL_DESKTOP_RULE@3@INTLTOOL_DESKTOP_RULE@
24
3desktopdir = $(datadir)/applications5desktopdir = $(datadir)/applications
46
=== added directory 'panels/user-accounts/data/faces'
=== added file 'panels/user-accounts/data/faces/Makefile.am'
--- panels/user-accounts/data/faces/Makefile.am 1970-01-01 00:00:00 +0000
+++ panels/user-accounts/data/faces/Makefile.am 2015-11-03 08:30:20 +0000
@@ -0,0 +1,34 @@
1
2imagedir = $(datadir)/pixmaps/faces
3
4image_DATA = \
5 astronaut.jpg \
6 baseball.png \
7 butterfly.png \
8 cat-eye.jpg \
9 chess.jpg \
10 coffee.jpg \
11 dice.jpg \
12 energy-arc.jpg \
13 fish.jpg \
14 flake.jpg \
15 flower.jpg \
16 grapes.jpg \
17 guitar.jpg \
18 launch.jpg \
19 leaf.jpg \
20 lightning.jpg \
21 penguin.jpg \
22 puppy.jpg \
23 sky.jpg \
24 soccerball.png \
25 sunflower.jpg \
26 sunset.jpg \
27 tennis-ball.png \
28 yellow-rose.jpg
29
30EXTRA_DIST = \
31 $(image_DATA)
32
33-include $(top_srcdir)/git.mk
34
035
=== added file 'panels/user-accounts/data/faces/astronaut.jpg'
1Binary 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 differ36Binary 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
=== added file 'panels/user-accounts/data/faces/baseball.png'
2Binary 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 differ37Binary 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
=== added file 'panels/user-accounts/data/faces/butterfly.png'
3Binary 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 differ38Binary 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
=== added file 'panels/user-accounts/data/faces/cat-eye.jpg'
4Binary 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 differ39Binary 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
=== added file 'panels/user-accounts/data/faces/chess.jpg'
5Binary 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 differ40Binary 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
=== added file 'panels/user-accounts/data/faces/coffee.jpg'
6Binary 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 differ41Binary 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
=== added file 'panels/user-accounts/data/faces/dice.jpg'
7Binary 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 differ42Binary 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
=== added file 'panels/user-accounts/data/faces/energy-arc.jpg'
8Binary 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 differ43Binary 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
=== added file 'panels/user-accounts/data/faces/fish.jpg'
9Binary 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 differ44Binary 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
=== added file 'panels/user-accounts/data/faces/flake.jpg'
10Binary 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 differ45Binary 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
=== added file 'panels/user-accounts/data/faces/flower.jpg'
11Binary 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 differ46Binary 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
=== added file 'panels/user-accounts/data/faces/grapes.jpg'
12Binary 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 differ47Binary 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
=== added file 'panels/user-accounts/data/faces/guitar.jpg'
13Binary 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 differ48Binary 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
=== added file 'panels/user-accounts/data/faces/launch.jpg'
14Binary 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 differ49Binary 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
=== added file 'panels/user-accounts/data/faces/leaf.jpg'
15Binary 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 differ50Binary 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
=== added file 'panels/user-accounts/data/faces/lightning.jpg'
16Binary 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 differ51Binary 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
=== added file 'panels/user-accounts/data/faces/penguin.jpg'
17Binary 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 differ52Binary 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
=== added file 'panels/user-accounts/data/faces/puppy.jpg'
18Binary 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 differ53Binary 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
=== added file 'panels/user-accounts/data/faces/sky.jpg'
19Binary 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 differ54Binary 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
=== added file 'panels/user-accounts/data/faces/soccerball.png'
20Binary 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 differ55Binary 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
=== added file 'panels/user-accounts/data/faces/sunflower.jpg'
21Binary 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 differ56Binary 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
=== added file 'panels/user-accounts/data/faces/sunset.jpg'
22Binary 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 differ57Binary 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
=== added file 'panels/user-accounts/data/faces/tennis-ball.png'
23Binary 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 differ58Binary 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
=== added file 'panels/user-accounts/data/faces/yellow-rose.jpg'
24Binary 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 differ59Binary 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