1
=== modified file '.bzrignore'
2
--- .bzrignore	2013-09-20 14:31:57 +0000
3
+++ .bzrignore	2017-01-30 03:06:38 +0000
4
@@ -1,4 +1,8 @@
6
1
build
1
./build
7
2
.project
2
.project
8
3
.cproject
3
.cproject
9
4
.settings
4
.settings
10
5
./parts
11
6
./prime
12
7
./stage
13
8
./thumbnailer*.snap
14
5
9
15
=== added file 'snapcraft.yaml'
16
--- snapcraft.yaml	1970-01-01 00:00:00 +0000
17
+++ snapcraft.yaml	2017-01-30 03:06:38 +0000
18
@@ -0,0 +1,80 @@
19
1
name: thumbnailer
20
2
version: '2.4'
21
3
summary: Daemon and admin tool to create and cache image thumbnails for media files
22
4
description: >
23
5
  This snap provides thumbnailer-service, a DBus daemon that extracts thumbnails from
24
6
  local media files and retrieves music album artwork from dash.ubuntu.com. It also
25
7
  includes thumbnailer-admin, a command-line utility that allows for basic cache
26
8
  maintenance and testing. See lp:thumbnailer for more detail.
27
9
grade: devel
28
10
confinement: strict
29
11
30
12
slots:
31
13
  thumbnailer:
32
14
    interface: dbus
33
15
    name: com.canonical.Thumbnailer
34
16
    bus: session
35
17
36
18
plugs:
37
19
  platform:
38
20
    interface: content
39
21
    content: ubuntu-app-platform1
40
22
    target: ubuntu-app-platform
41
23
    default-provider: ubuntu-app-platform
42
24
  network-manager:
43
25
    interface: network-manager
44
26
  thumbnails:
45
27
    interface: dbus
46
28
    name: com.canonical.Thumbnailer
47
29
    bus: session
48
30
49
31
apps:
50
32
  thumbnailer-service:
51
33
    command: desktop-launch $SNAP/lib/thumbnailer/thumbnailer-service
52
34
    # TODO: Currently cannot use a simple daemon with the session bus. For now,
53
35
    # the service must be started by hand. See https://github.com/snapcore/snapd/pull/2592
54
36
    # daemon: simple
55
37
    plugs:
56
38
      - platform
57
39
      - network
58
40
      # TODO: This grants more privileges than we really need but, without this, apparmor
59
41
      # denies access.
60
42
      - network-manager
61
43
      # TODO: The gsettings interface currently does not permit reading.
62
44
      # See https://bugs.launchpad.net/snappy/+bug/1600154
63
45
      # For now, the service uses default settings because it's gsettings lookups fail.
64
46
      - gsettings
65
47
    slots:
66
48
      - thumbnailer
67
49
  thumbnailer-admin:
68
50
    command: desktop-launch $SNAP/bin/thumbnailer-admin
69
51
    plugs:
70
52
      - platform
71
53
      - thumbnails
72
54
73
55
parts:
74
56
  thumbnailer:
75
57
    plugin: cmake
76
58
    source: .
77
59
    after:
78
60
      - desktop-ubuntu-app-platform
79
61
    filesets:
80
62
      binaries:
81
63
        - bin/*
82
64
        - lib/thumbnailer/*
83
65
      man:
84
66
        - share/man/*
85
67
      etc:
86
68
        - etc/*
87
69
      share:
88
70
        # TODO: This does not seem to have any effect. It is unclear right now how gsettings
89
71
        # schemas need to be installed.
90
72
        - share/glib-2.0/*
91
73
    prime:
92
74
      - $binaries
93
75
      - $man
94
76
      - $etc
95
77
      - $share
96
78
      - ubuntu-app-platform
97
79
    install: |
98
80
      mkdir $SNAPCRAFT_PART_INSTALL/ubuntu-app-platform
99
0
81
100
=== modified file 'tests/copyright/check_copyright.sh'
101
--- tests/copyright/check_copyright.sh	2016-05-30 09:44:33 +0000
102
+++ tests/copyright/check_copyright.sh	2017-01-30 03:06:38 +0000
103
@@ -31,7 +31,7 @@
104
31
[ $# -lt 1 ] && usage
31
[ $# -lt 1 ] && usage
105
32
[ $# -gt 2 ] && usage
32
[ $# -gt 2 ] && usage
106
33
33
108
34
ignore_pat="\\.sci$|\\.swp$|\\.bzr|debian|qmldir|HACKING|tsan-suppress|valgrind-suppress|testsong_ogg|\\.txt$|\\.xml$|\\.in$|\\.dox$|\\.html$|\\.map$|\\.aiff$|\\.gif$|\\.jpg$|\\.JPG$|\\.mp2$|\\.mp3$|\\.m4a$|\\.m4v$|\\.flac$|\\.oga$|\\.ogg$|\\.opus$|\\.png$|\\.svg$|\\.wav$|UseGSettings.cmake$"
34
ignore_pat="\\.sci$|\\.swp$|\\.bzr|debian|qmldir|HACKING|tsan-suppress|valgrind-suppress|testsong_ogg|\\.txt$|\\.xml$|\\.in$|\\.dox$|\\.html$|\\.map$|\\.aiff$|\\.gif$|\\.jpg$|\\.JPG$|\\.mp2$|\\.mp3$|\\.m4a$|\\.m4v$|\\.flac$|\\.oga$|\\.ogg$|\\.opus$|\\.png$|\\.svg$|\\.wav$|UseGSettings.cmake$|\\.yaml$|parts|prime|stage|~[0-9]+~$"
109
35
35
110
36
#
36
#
111
37
# We don't use the -i option of licensecheck to add ignore_dir to the pattern because Jenkins creates directories
37
# We don't use the -i option of licensecheck to add ignore_dir to the pattern because Jenkins creates directories
112
38
38
113
=== modified file 'tests/whitespace/CMakeLists.txt'
114
--- tests/whitespace/CMakeLists.txt	2015-05-22 03:13:47 +0000
115
+++ tests/whitespace/CMakeLists.txt	2017-01-30 03:06:38 +0000
116
@@ -3,7 +3,8 @@
117
3
#
3
#
118
4
4
119
5
add_test(whitespace
5
add_test(whitespace
123
6
  ${CMAKE_CURRENT_SOURCE_DIR}/check_whitespace.py
6
  ${CMAKE_CURRENT_SOURCE_DIR}/check_whitespace.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
124
7
  ${CMAKE_SOURCE_DIR}
7
    ${CMAKE_SOURCE_DIR}/parts
125
8
  ${CMAKE_BINARY_DIR}
8
    ${CMAKE_SOURCE_DIR}/stage
126
9
    ${CMAKE_BINARY_DIR}/prime
127
9
)
10
)
Status:	Merged
Approved by:	James Henstridge on 2017-01-31
Approved revision:	371
Merged at revision:	369
Proposed branch:	lp:~michihenning/thumbnailer/snap
Merge into:	lp:thumbnailer/devel
Diff against target:	127 lines (+90/-5) 4 files modified .bzrignore (+5/-1) snapcraft.yaml (+80/-0) tests/copyright/check_copyright.sh (+1/-1) tests/whitespace/CMakeLists.txt (+4/-3)
To merge this branch:	bzr merge lp:~michihenning/thumbnailer/snap
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
James Henstridge		2017-01-25	Approve on 2017-01-31
unity-api-1-bot	continuous-integration		Approve on 2017-01-30
Review via email: mp+315538@code.launchpad.net