1
=== modified file 'debian/control'
2
--- debian/control	2014-05-09 16:08:13 +0000
3
+++ debian/control	2014-07-18 08:20:32 +0000
4
@@ -16,6 +16,9 @@
5
16
               qtbase5-dev,
16
               qtbase5-dev,
6
17
               qtdeclarative5-dev,
17
               qtdeclarative5-dev,
7
18
               python3-all,
18
               python3-all,
8
19
# for static linking of exiv2 in click mode
9
20
               libexpat1-dev,
10
21
               zlib1g-dev,
11
19
Standards-Version: 3.9.5
22
Standards-Version: 3.9.5
12
20
# If you don't have commit rights to lp:gallery-app but need to upload
23
# If you don't have commit rights to lp:gallery-app but need to upload
13
21
# packaging changes, just go ahead.  The developers will notice and sync
24
# packaging changes, just go ahead.  The developers will notice and sync
14
22
25
15
=== modified file 'src/medialoader/CMakeLists.txt'
16
--- src/medialoader/CMakeLists.txt	2014-03-07 17:42:35 +0000
17
+++ src/medialoader/CMakeLists.txt	2014-07-18 08:20:32 +0000
18
@@ -35,6 +35,14 @@
19
35
35
20
36
qt5_use_modules(${GALLERY_MEDIALOADER_LIB} Core Quick)
36
qt5_use_modules(${GALLERY_MEDIALOADER_LIB} Core Quick)
21
37
37
22
38
if(CLICK_MODE)
23
39
    set(EXIV2_LIBRARIES
24
40
        ${CMAKE_EXE_LINK_STATIC_CXX_FLAGS}
25
41
        ${EXIV2_STATIC_LIBRARIES}
26
42
        ${CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS})
27
43
    install(FILES exiv2.copyright DESTINATION ${CMAKE_INSTALL_PREFIX})
28
44
endif(CLICK_MODE)
29
45
30
38
target_link_libraries( ${GALLERY_MEDIALOADER_LIB}
46
target_link_libraries( ${GALLERY_MEDIALOADER_LIB}
31
39
    ${EXIV2_LIBRARIES}
47
    ${EXIV2_LIBRARIES}
32
40
    ${GSTLIB_LDFLAGS}
48
    ${GSTLIB_LDFLAGS}
33
41
49
34
=== added file 'src/medialoader/exiv2.copyright'
35
--- src/medialoader/exiv2.copyright	1970-01-01 00:00:00 +0000
36
+++ src/medialoader/exiv2.copyright	2014-07-18 08:20:32 +0000
37
@@ -0,0 +1,103 @@
38
1
The exiv2 library is linked statically into the gallery-app click package,
39
2
using the version of the Ubuntu libexiv2-dev package that was installed on
40
3
the build system at build time.  Its copyright and licensing information is
41
4
reproduced below.
42
5
43
6
44
7
Upstream Author:
45
8
46
9
    Andreas HUGGEL <ahuggel@gmx.net>
47
10
48
11
Copyright:
49
12
50
13
    (C) 2004-2008 Andreas Huggel <ahuggel@gmx.net>
51
14
52
15
Copyright for XMP sdk:
53
16
54
17
    (C) 2005-2007 Adobe Systems Incorporated
55
18
56
19
Copyright for MD5 algorithm tcode:
57
20
58
21
    (C) 1991-2, RSA Data Security, Inc.
59
22
60
23
exiv2 license:
61
24
62
25
   Exiv2 is free software; you can redistribute it and/or modify it under
63
26
   the terms of the GNU General Public License as published by the Free
64
27
   Software Foundation; either version 2 of the License, or (at your
65
28
   option) any later version.
66
29
67
30
   Alternatively, Exiv2 is also available with a commercial license,
68
31
   which allows it to be used in closed-source projects. Contact me for
69
32
   more information.
70
33
71
34
   Exiv2 is distributed in the hope that it will be useful, but WITHOUT
72
35
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
73
36
   FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
74
37
   for more details.
75
38
76
39
   You should have received a copy of the GNU General Public License
77
40
   along with this program; if not, write to the Free Software
78
41
   Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
79
42
80
43
On Debian systems, the complete text of the GNU General
81
44
Public License can be found in `/usr/share/common-licenses/GPL-2'.
82
45
83
46
XMP sdk license:
84
47
85
48
    NOTICE: Adobe permits you to use, modify, and distribute this file in
86
49
    accordance with the terms of the Adobe license agreement accompanying it.
87
50
88
51
Copyright (c) 1999 - 2007, Adobe Systems Incorporated
89
52
90
53
The BSD License
91
54
92
55
Redistribution and use in source and binary forms, with or without
93
56
modification, are permitted provided that the following conditions are
94
57
met:
95
58
96
59
* Redistributions of source code must retain the above copyright
97
60
  notice, this list of conditions and the following disclaimer.
98
61
99
62
* Redistributions in binary form must reproduce the above copyright
100
63
  notice, this list of conditions and the following disclaimer in the
101
64
  documentation and/or other materials provided with the distribution.
102
65
103
66
* Neither the name of Adobe Systems Incorporated, nor the names of its
104
67
  contributors may be used to endorse or promote products derived from
105
68
  this software without specific prior written permission.
106
69
107
70
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
108
71
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
109
72
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
110
73
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
111
74
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
112
75
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
113
76
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
114
77
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
115
78
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
116
79
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
117
80
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
118
81
119
82
MD5 algorithm license:
120
83
121
84
Copyright (C) 1991-2, RSA Data Security, Inc.
122
85
123
86
License to copy and use this software is granted provided that it is
124
87
identified as the "RSA Data Security, Inc. MD5 Message-Digest
125
88
Algorithm" in all material mentioning or referencing this software or
126
89
this function.
127
90
128
91
License is also granted to make and use derivative works provided that
129
92
such works are identified as "derived from the RSA Data Security,
130
93
Inc. MD5 Message-Digest Algorithm" in all material mentioning or
131
94
referencing the derived work.
132
95
133
96
RSA Data Security, Inc. makes no representations concerning either the
134
97
merchantability of this software or the suitability of this software
135
98
for any particular purpose. It is provided "as is" without express or
136
99
implied warranty of any kind.
137
100
138
101
These notices must be retained in any copies of any part of this
139
102
documentation and/or software.
140
103
Reviewer	Review Type	Date Requested	Status
Oliver Grawert		2014-07-18	Approve on 2014-07-18
PS Jenkins bot	continuous-integration		Approve on 2014-07-18
Review via email: mp+227275@code.launchpad.net