Merge lp:~jbicha/timezonemap/convert-to-dh-and-more into lp:timezonemap

Proposed by Jeremy Bicha
Status: Needs review
Proposed branch: lp:~jbicha/timezonemap/convert-to-dh-and-more
Merge into: lp:timezonemap
Diff against target: 575 lines (+444/-55)
9 files modified
debian/changelog (+14/-1)
debian/compat (+1/-1)
debian/control (+6/-7)
debian/copyright (+342/-19)
debian/docs (+1/-0)
debian/gir1.2-timezonemap-1.0.install (+1/-1)
debian/libtimezonemap1-dev.install (+4/-4)
debian/libtimezonemap1.symbols (+47/-0)
debian/rules (+28/-22)
To merge this branch: bzr merge lp:~jbicha/timezonemap/convert-to-dh-and-more
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Pending
Review via email: mp+359750@code.launchpad.net

Description of the change

I already pushed to https://launchpad.net/ubuntu/+source/libtimezonemap/0.4.6

Sorry that I didn't respect the usual order things should happen.

To post a comment you must log in.

Unmerged revisions

68. By Jeremy Bicha

releasing package libtimezonemap version 0.4.6

67. By Jeremy Bicha

debian/gir1.2-timezonemap-1.0.install: Install to multiarch directory

66. By Jeremy Bicha

Add debian/docs to install README

65. By Jeremy Bicha

Have libtimezonemap1-dev depend on gir1.2-timezonemap-1.0

64. By Jeremy Bicha

Bump Standards-Version to 4.2.1

63. By Jeremy Bicha

Switch to copyright format 1.0

62. By Jeremy Bicha

Enable all hardening flags

61. By Jeremy Bicha

Add a symbols file

60. By Jeremy Bicha

Bump debhelper compat to 11

59. By Jeremy Bicha

Convert from cdbs to dh

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 2015-12-23 18:53:29 +0000
3+++ debian/changelog 2018-11-28 13:47:10 +0000
4@@ -1,3 +1,16 @@
5+libtimezonemap (0.4.6) disco; urgency=medium
6+
7+ * Convert from cdbs to dh
8+ * Bump debhelper compat to 11
9+ * Add a symbols file
10+ * debian/gir1.2-timezonemap-1.0.install: Install to multiarch directory
11+ * Add debian/docs to install README
12+ * Have libtimezonemap1-dev depend on gir1.2-timezonemap-1.0
13+ * Switch to copyright format 1.0
14+ * Bump Standards-Version to 4.2.1
15+
16+ -- Jeremy Bicha <jbicha@debian.org> Tue, 27 Nov 2018 23:44:22 -0500
17+
18 libtimezonemap (0.4.5) xenial; urgency=medium
19
20 [ David Shea ]
21@@ -85,7 +98,7 @@
22 libtimezonemap (0.3.1) precise; urgency=low
23
24 * Ship m4/ directory, which accidentally got dropped when making the
25- tarball for 0.3. Fixes FTBFS
26+ tarball for 0.3. Fixes FTBFS
27
28 -- Michael Terry <mterry@ubuntu.com> Mon, 09 Jan 2012 15:53:35 +0100
29
30
31=== modified file 'debian/compat'
32--- debian/compat 2014-05-02 10:12:41 +0000
33+++ debian/compat 2018-11-28 13:47:10 +0000
34@@ -1,1 +1,1 @@
35-9
36+11
37
38=== modified file 'debian/control'
39--- debian/control 2015-05-07 13:47:16 +0000
40+++ debian/control 2018-11-28 13:47:10 +0000
41@@ -2,8 +2,8 @@
42 Section: misc
43 Priority: optional
44 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
45-Build-Depends: cdbs,
46- debhelper (>= 9),
47+Build-Depends: debhelper (>= 11),
48+ gnome-pkg-tools,
49 gobject-introspection,
50 libgirepository1.0-dev (>= 0.9.3),
51 gir1.2-glib-2.0,
52@@ -14,9 +14,8 @@
53 libcairo2-dev (>= 1.10),
54 libjson-glib-dev,
55 libsoup2.4-dev (>= 2.42.0),
56- dh-autoreconf
57-Standards-Version: 3.9.5
58-Vcs-Bzr: http://bazaar.launchpad.net/~timezonemap-team/timezonemap/trunk
59+Standards-Version: 4.2.1
60+Vcs-Bzr: https://code.launchpad.net/~timezonemap-team/timezonemap/trunk
61
62 Package: gir1.2-timezonemap-1.0
63 Section: introspection
64@@ -54,8 +53,8 @@
65 Package: libtimezonemap1-dev
66 Section: libdevel
67 Architecture: any
68-Depends: ${shlibs:Depends},
69- ${misc:Depends},
70+Depends: ${misc:Depends},
71+ gir1.2-timezonemap-1.0 (= ${binary:Version}),
72 libtimezonemap1 (= ${binary:Version}),
73 libglib2.0-dev (>= 2.25.0),
74 libgtk-3-dev (>= 3.1.4),
75
76=== modified file 'debian/copyright'
77--- debian/copyright 2011-08-03 09:04:51 +0000
78+++ debian/copyright 2018-11-28 13:47:10 +0000
79@@ -1,19 +1,342 @@
80-Copyright:
81-
82- Copyright (C) 2010 Intel, Inc
83- Copyright (C) 2011 Canonical Ltd
84-
85-License:
86-
87- This program is free software; you can redistribute it and/or
88- modify it under the terms of the GNU General Public License
89- as published by the Free Software Foundation; either version 3
90- of the License, or (at your option) any later version.
91-
92- This program is distributed in the hope that it will be useful,
93- but WITHOUT ANY WARRANTY; without even the implied warranty of
94- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
95- GNU General Public License for more details.
96-
97-The Debian packaging is (C) 2010, Canonical Ltd. and is licensed under the
98-GPLv3, see /usr/share/common-licenses/GPL-3.
99+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
100+Upstream-Name: timezonemap
101+Source: https://launchpad.net/timezonemap
102+
103+Files: *
104+Copyright: Canonical
105+License: GPL-3
106+
107+Files: src/cc-timezone-location.*
108+ src/tz.*
109+Copyright: 2000-2001, Ximian, Inc.
110+License: GPL-2+
111+
112+Files: src/timezone-completion.*
113+Copyright: 2011, Canonical Ltd.
114+License: GPL-3
115+
116+Files: src/cc-timezone-map.c
117+Copyright: 2009, 2011 Canonical Ltd.
118+ 2010 Intel, Inc
119+License: GPL-2+
120+
121+Files: src/cc-timezone-map.h
122+Copyright: 2010 Intel, Inc
123+License: GPL-2+
124+
125+Files: src/backward
126+Copyright: The Internet Assigned Numbers Authority (IANA)
127+License: public-domain
128+ Copied from tzdata: https://www.iana.org/time-zones
129+ This file is in the public domain, so clarified as of
130+ 2009-05-17 by Arthur David Olson.
131+
132+Files: src/data/admin1Codes.txt
133+ src/data/cities15000.txt
134+ src/data/countryInfo.txt
135+Copyright: geonames.org community
136+License: CC-BY-4.0
137+Comment: These 3 files come from https://download.geonames.org/export/dump/
138+
139+License: GPL-2+
140+ This package is free software; you can redistribute it and/or modify
141+ it under the terms of the GNU General Public License as published by
142+ the Free Software Foundation; either version 2 of the License, or
143+ (at your option) any later version.
144+ .
145+ This package is distributed in the hope that it will be useful,
146+ but WITHOUT ANY WARRANTY; without even the implied warranty of
147+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
148+ GNU General Public License for more details.
149+ .
150+ You should have received a copy of the GNU General Public License
151+ along with this program. If not, see <https://www.gnu.org/licenses/>
152+ .
153+ On Debian systems, the complete text of the GNU General
154+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
155+
156+License: GPL-3
157+ This program is free software: you can redistribute it and/or modify
158+ it under the terms of the GNU General Public License as published by
159+ the Free Software Foundation, version 3 of the License.
160+ .
161+ This program is distributed in the hope that it will be useful,
162+ but WITHOUT ANY WARRANTY; without even the implied warranty of
163+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
164+ GNU General Public License for more details.
165+ .
166+ You should have received a copy of the GNU General Public License
167+ along with this program. If not, see <https://www.gnu.org/licenses/>.
168+ .
169+ On Debian systems, the complete text of the GNU General
170+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
171+
172+License: CC-BY-4.0
173+ Creative Commons Attribution 4.0 International Public License
174+ .
175+ By exercising the Licensed Rights (defined below), You accept and agree to
176+ be bound by the terms and conditions of this Creative Commons Attribution
177+ 4.0 International Public License ("Public License"). To the extent this
178+ Public License may be interpreted as a contract, You are granted the
179+ Licensed Rights in consideration of Your acceptance of these terms and
180+ conditions, and the Licensor grants You such rights in consideration of
181+ benefits the Licensor receives from making the Licensed Material available
182+ under these terms and conditions.
183+ .
184+ Section 1 – Definitions.
185+ .
186+ a. Adapted Material means material subject to Copyright and Similar
187+ Rights that is derived from or based upon the Licensed Material and in
188+ which the Licensed Material is translated, altered, arranged,
189+ transformed, or otherwise modified in a manner requiring permission
190+ under the Copyright and Similar Rights held by the Licensor. For
191+ purposes of this Public License, where the Licensed Material is a
192+ musical work, performance, or sound recording, Adapted Material is
193+ always produced where the Licensed Material is synched in timed
194+ relation with a moving image.
195+ b. Adapter's License means the license You apply to Your Copyright and
196+ Similar Rights in Your contributions to Adapted Material in accordance
197+ with the terms and conditions of this Public License.
198+ c. Copyright and Similar Rights means copyright and/or similar rights
199+ closely related to copyright including, without limitation,
200+ performance, broadcast, sound recording, and Sui Generis Database
201+ Rights, without regard to how the rights are labeled or categorized.
202+ For purposes of this Public License, the rights specified in Section
203+ 2(b)(1)-(2) are not Copyright and Similar Rights.
204+ d. Effective Technological Measures means those measures that, in the
205+ absence of proper authority, may not be circumvented under laws
206+ fulfilling obligations under Article 11 of the WIPO Copyright Treaty
207+ adopted on December 20, 1996, and/or similar international agreements.
208+ e. Exceptions and Limitations means fair use, fair dealing, and/or any
209+ other exception or limitation to Copyright and Similar Rights that
210+ applies to Your use of the Licensed Material.
211+ f. Licensed Material means the artistic or literary work, database, or
212+ other material to which the Licensor applied this Public License.
213+ g. Licensed Rights means the rights granted to You subject to the terms
214+ and conditions of this Public License, which are limited to all
215+ Copyright and Similar Rights that apply to Your use of the Licensed
216+ Material and that the Licensor has authority to license.
217+ h. Licensor means the individual(s) or entity(ies) granting rights under
218+ this Public License.
219+ i. Share means to provide material to the public by any means or process
220+ that requires permission under the Licensed Rights, such as
221+ reproduction, public display, public performance, distribution,
222+ dissemination, communication, or importation, and to make material
223+ available to the public including in ways that members of the public
224+ may access the material from a place and at a time individually chosen
225+ by them.
226+ j. Sui Generis Database Rights means rights other than copyright
227+ resulting from Directive 96/9/EC of the European Parliament and of the
228+ Council of 11 March 1996 on the legal protection of databases, as
229+ amended and/or succeeded, as well as other essentially equivalent
230+ rights anywhere in the world.
231+ k. You means the individual or entity exercising the Licensed Rights
232+ under this Public License. Your has a corresponding meaning.
233+ .
234+ Section 2 – Scope.
235+ .
236+ a. License grant.
237+ 1. Subject to the terms and conditions of this Public License, the
238+ Licensor hereby grants You a worldwide, royalty-free,
239+ non-sublicensable, non-exclusive, irrevocable license to exercise
240+ the Licensed Rights in the Licensed Material to:
241+ A. reproduce and Share the Licensed Material, in whole or in
242+ part; and
243+ B. produce, reproduce, and Share Adapted Material.
244+ 2. Exceptions and Limitations. For the avoidance of doubt, where
245+ Exceptions and Limitations apply to Your use, this Public License
246+ does not apply, and You do not need to comply with its terms and
247+ conditions.
248+ 3. Term. The term of this Public License is specified in Section
249+ 6(a).
250+ 4. Media and formats; technical modifications allowed. The Licensor
251+ authorizes You to exercise the Licensed Rights in all media and
252+ formats whether now known or hereafter created, and to make
253+ technical modifications necessary to do so. The Licensor waives
254+ and/or agrees not to assert any right or authority to forbid You
255+ from making technical modifications necessary to exercise the
256+ Licensed Rights, including technical modifications necessary to
257+ circumvent Effective Technological Measures. For purposes of this
258+ Public License, simply making modifications authorized by this
259+ Section 2(a)(4) never produces Adapted Material.
260+ 5. Downstream recipients.
261+ A. Offer from the Licensor – Licensed Material. Every recipient
262+ of the Licensed Material automatically receives an offer
263+ from the Licensor to exercise the Licensed Rights under the
264+ terms and conditions of this Public License.
265+ B. No downstream restrictions. You may not offer or impose any
266+ additional or different terms or conditions on, or apply any
267+ Effective Technological Measures to, the Licensed Material
268+ if doing so restricts exercise of the Licensed Rights by any
269+ recipient of the Licensed Material.
270+ 6. No endorsement. Nothing in this Public License constitutes or may
271+ be construed as permission to assert or imply that You are, or
272+ that Your use of the Licensed Material is, connected with, or
273+ sponsored, endorsed, or granted official status by, the Licensor
274+ or others designated to receive attribution as provided in
275+ Section 3(a)(1)(A)(i).
276+ b. Other rights.
277+ .
278+ 1. Moral rights, such as the right of integrity, are not licensed
279+ under this Public License, nor are publicity, privacy, and/or
280+ other similar personality rights; however, to the extent
281+ possible, the Licensor waives and/or agrees not to assert any
282+ such rights held by the Licensor to the limited extent necessary
283+ to allow You to exercise the Licensed Rights, but not otherwise.
284+ 2. Patent and trademark rights are not licensed under this Public
285+ License.
286+ 3. To the extent possible, the Licensor waives any right to collect
287+ royalties from You for the exercise of the Licensed Rights,
288+ whether directly or through a collecting society under any
289+ voluntary or waivable statutory or compulsory licensing scheme.
290+ In all other cases the Licensor expressly reserves any right to
291+ collect such royalties.
292+ .
293+ Section 3 – License Conditions.
294+ .
295+ Your exercise of the Licensed Rights is expressly made subject to the
296+ following conditions.
297+ .
298+ a. Attribution.
299+ .
300+ 1. If You Share the Licensed Material (including in modified form),
301+ You must:
302+ .
303+ A. retain the following if it is supplied by the Licensor with
304+ the Licensed Material:
305+ i. identification of the creator(s) of the Licensed
306+ Material and any others designated to receive
307+ attribution, in any reasonable manner requested by the
308+ Licensor (including by pseudonym if designated);
309+ ii. a copyright notice;
310+ iii. a notice that refers to this Public License;
311+ iv. a notice that refers to the disclaimer of warranties;
312+ v. a URI or hyperlink to the Licensed Material to the
313+ extent reasonably practicable;
314+ B. indicate if You modified the Licensed Material and retain an
315+ indication of any previous modifications; and
316+ C. indicate the Licensed Material is licensed under this Public
317+ License, and include the text of, or the URI or hyperlink
318+ to, this Public License.
319+ 2. You may satisfy the conditions in Section 3(a)(1) in any
320+ reasonable manner based on the medium, means, and context in
321+ which You Share the Licensed Material. For example, it may be
322+ reasonable to satisfy the conditions by providing a URI or
323+ hyperlink to a resource that includes the required information.
324+ 3. If requested by the Licensor, You must remove any of the
325+ information required by Section 3(a)(1)(A) to the extent
326+ reasonably practicable.
327+ 4. If You Share Adapted Material You produce, the Adapter's License
328+ You apply must not prevent recipients of the Adapted Material
329+ from complying with this Public License.
330+ .
331+ Section 4 – Sui Generis Database Rights.
332+ .
333+ Where the Licensed Rights include Sui Generis Database Rights that apply
334+ to Your use of the Licensed Material:
335+ .
336+ a. for the avoidance of doubt, Section 2(a)(1) grants You the right to
337+ extract, reuse, reproduce, and Share all or a substantial portion of
338+ the contents of the database;
339+ b. if You include all or a substantial portion of the database contents
340+ in a database in which You have Sui Generis Database Rights, then the
341+ database in which You have Sui Generis Database Rights (but not its
342+ individual contents) is Adapted Material; and
343+ c. You must comply with the conditions in Section 3(a) if You Share all
344+ or a substantial portion of the contents of the database.
345+ For the avoidance of doubt, this Section 4 supplements and does not
346+ replace Your obligations under this Public License where the Licensed
347+ Rights include other Copyright and Similar Rights.
348+ .
349+ Section 5 – Disclaimer of Warranties and Limitation of Liability.
350+ .
351+ a. Unless otherwise separately undertaken by the Licensor, to the extent
352+ possible, the Licensor offers the Licensed Material as-is and
353+ as-available, and makes no representations or warranties of any kind
354+ concerning the Licensed Material, whether express, implied, statutory,
355+ or other. This includes, without limitation, warranties of title,
356+ merchantability, fitness for a particular purpose, non-infringement,
357+ absence of latent or other defects, accuracy, or the presence or
358+ absence of errors, whether or not known or discoverable. Where
359+ disclaimers of warranties are not allowed in full or in part, this
360+ disclaimer may not apply to You.
361+ b. To the extent possible, in no event will the Licensor be liable to You
362+ on any legal theory (including, without limitation, negligence) or
363+ otherwise for any direct, special, indirect, incidental,
364+ consequential, punitive, exemplary, or other losses, costs, expenses,
365+ or damages arising out of this Public License or use of the Licensed
366+ Material, even if the Licensor has been advised of the possibility of
367+ such losses, costs, expenses, or damages. Where a limitation of
368+ liability is not allowed in full or in part, this limitation may not
369+ apply to You.
370+ c. The disclaimer of warranties and limitation of liability provided
371+ above shall be interpreted in a manner that, to the extent possible,
372+ most closely approximates an absolute disclaimer and waiver of all
373+ liability.
374+ .
375+ Section 6 – Term and Termination.
376+ .
377+ a. This Public License applies for the term of the Copyright and Similar
378+ Rights licensed here. However, if You fail to comply with this Public
379+ License, then Your rights under this Public License terminate
380+ automatically.
381+ b. Where Your right to use the Licensed Material has terminated under
382+ Section 6(a), it reinstates:
383+ .
384+ 1. automatically as of the date the violation is cured, provided it
385+ is cured within 30 days of Your discovery of the violation; or
386+ 2. upon express reinstatement by the Licensor.
387+ For the avoidance of doubt, this Section 6(b) does not affect any
388+ right the Licensor may have to seek remedies for Your violations of
389+ this Public License.
390+ c. For the avoidance of doubt, the Licensor may also offer the Licensed
391+ Material under separate terms or conditions or stop distributing the
392+ Licensed Material at any time; however, doing so will not terminate
393+ this Public License.
394+ d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
395+ .
396+ Section 7 – Other Terms and Conditions.
397+ .
398+ a. The Licensor shall not be bound by any additional or different terms
399+ or conditions communicated by You unless expressly agreed.
400+ b. Any arrangements, understandings, or agreements regarding the Licensed
401+ Material not stated herein are separate from and independent of the
402+ terms and conditions of this Public License.
403+ .
404+ Section 8 – Interpretation.
405+ .
406+ a. For the avoidance of doubt, this Public License does not, and shall
407+ not be interpreted to, reduce, limit, restrict, or impose conditions
408+ on any use of the Licensed Material that could lawfully be made
409+ without permission under this Public License.
410+ b. To the extent possible, if any provision of this Public License is
411+ deemed unenforceable, it shall be automatically reformed to the
412+ minimum extent necessary to make it enforceable. If the provision
413+ cannot be reformed, it shall be severed from this Public License
414+ without affecting the enforceability of the remaining terms and
415+ conditions.
416+ c. No term or condition of this Public License will be waived and no
417+ failure to comply consented to unless expressly agreed to by the
418+ Licensor.
419+ d. Nothing in this Public License constitutes or may be interpreted as a
420+ limitation upon, or waiver of, any privileges and immunities that
421+ apply to the Licensor or You, including from the legal processes of
422+ any jurisdiction or authority.
423+ .
424+ Creative Commons is not a party to its public licenses. Notwithstanding,
425+ Creative Commons may elect to apply one of its public licenses to material
426+ it publishes and in those instances will be considered the “Licensor.” The
427+ text of the Creative Commons public licenses is dedicated to the public
428+ domain under the CC0 Public Domain Dedication. Except for the limited
429+ purpose of indicating that material is shared under a Creative Commons
430+ public license or as otherwise permitted by the Creative Commons policies
431+ published at creativecommons.org/policies, Creative Commons does not
432+ authorize the use of the trademark “Creative Commons” or any other
433+ trademark or logo of Creative Commons without its prior written consent
434+ including, without limitation, in connection with any unauthorized
435+ modifications to any of its public licenses or any other arrangements,
436+ understandings, or agreements concerning use of licensed material. For the
437+ avoidance of doubt, this paragraph does not form part of the public
438+ licenses.
439+ .
440+ Creative Commons may be contacted at creativecommons.org.
441
442=== added file 'debian/docs'
443--- debian/docs 1970-01-01 00:00:00 +0000
444+++ debian/docs 2018-11-28 13:47:10 +0000
445@@ -0,0 +1,1 @@
446+README
447
448=== modified file 'debian/gir1.2-timezonemap-1.0.install'
449--- debian/gir1.2-timezonemap-1.0.install 2014-05-02 10:12:41 +0000
450+++ debian/gir1.2-timezonemap-1.0.install 2018-11-28 13:47:10 +0000
451@@ -1,1 +1,1 @@
452-usr/lib/*/girepository-1.0/* /usr/lib/girepository-1.0/
453+usr/lib/*/girepository-1.0/*
454
455=== modified file 'debian/libtimezonemap1-dev.install'
456--- debian/libtimezonemap1-dev.install 2014-05-02 10:12:41 +0000
457+++ debian/libtimezonemap1-dev.install 2018-11-28 13:47:10 +0000
458@@ -1,4 +1,4 @@
459-debian/tmp/usr/lib/*/libtimezonemap.so
460-debian/tmp/usr/share/gir-1.0
461-debian/tmp/usr/include
462-debian/tmp/usr/lib/*/pkgconfig
463+usr/lib/*/libtimezonemap.so
464+usr/share/gir-1.0
465+usr/include
466+usr/lib/*/pkgconfig
467
468=== added file 'debian/libtimezonemap1.symbols'
469--- debian/libtimezonemap1.symbols 1970-01-01 00:00:00 +0000
470+++ debian/libtimezonemap1.symbols 2018-11-28 13:47:10 +0000
471@@ -0,0 +1,47 @@
472+libtimezonemap.so.1 libtimezonemap1 #MINVER#
473+* Build-Depends-Package: libtimezonemap1-dev
474+ cc_timezone_completion_get_type@Base 0.4.5
475+ cc_timezone_completion_new@Base 0.4.5
476+ cc_timezone_completion_watch_entry@Base 0.4.5
477+ cc_timezone_location_get_comment@Base 0.4.5
478+ cc_timezone_location_get_country@Base 0.4.5
479+ cc_timezone_location_get_dist@Base 0.4.5
480+ cc_timezone_location_get_en_name@Base 0.4.5
481+ cc_timezone_location_get_full_country@Base 0.4.5
482+ cc_timezone_location_get_latitude@Base 0.4.5
483+ cc_timezone_location_get_longitude@Base 0.4.5
484+ cc_timezone_location_get_state@Base 0.4.5
485+ cc_timezone_location_get_type@Base 0.4.5
486+ cc_timezone_location_get_zone@Base 0.4.5
487+ cc_timezone_location_new@Base 0.4.5
488+ cc_timezone_location_set_comment@Base 0.4.5
489+ cc_timezone_location_set_country@Base 0.4.5
490+ cc_timezone_location_set_dist@Base 0.4.5
491+ cc_timezone_location_set_en_name@Base 0.4.5
492+ cc_timezone_location_set_full_country@Base 0.4.5
493+ cc_timezone_location_set_latitude@Base 0.4.5
494+ cc_timezone_location_set_longitude@Base 0.4.5
495+ cc_timezone_location_set_state@Base 0.4.5
496+ cc_timezone_location_set_zone@Base 0.4.5
497+ cc_timezone_map_clear_location@Base 0.4.5
498+ cc_timezone_map_get_location@Base 0.4.5
499+ cc_timezone_map_get_selected_offset@Base 0.4.5
500+ cc_timezone_map_get_timezone_at_coords@Base 0.4.5
501+ cc_timezone_map_get_type@Base 0.4.5
502+ cc_timezone_map_new@Base 0.4.5
503+ cc_timezone_map_set_coords@Base 0.4.5
504+ cc_timezone_map_set_location@Base 0.4.5
505+ cc_timezone_map_set_selected_offset@Base 0.4.5
506+ cc_timezone_map_set_timezone@Base 0.4.5
507+ cc_timezone_map_set_watermark@Base 0.4.5
508+ parse_admin1Codes@Base 0.4.5
509+ parse_cities15000@Base 0.4.5
510+ parse_countrycode@Base 0.4.5
511+ parse_file@Base 0.4.5
512+ tz_db_free@Base 0.4.5
513+ tz_get_locations@Base 0.4.5
514+ tz_info_free@Base 0.4.5
515+ tz_info_from_location@Base 0.4.5
516+ tz_load_db@Base 0.4.5
517+ tz_location_get_utc_offset@Base 0.4.5
518+ tz_location_set_locally@Base 0.4.5
519
520=== modified file 'debian/rules'
521--- debian/rules 2014-05-02 10:12:41 +0000
522+++ debian/rules 2018-11-28 13:47:10 +0000
523@@ -1,24 +1,30 @@
524 #!/usr/bin/make -f
525
526-DEB_BUILDDIR = build
527-
528-include /usr/share/cdbs/1/rules/autoreconf.mk
529-include /usr/share/cdbs/1/rules/debhelper.mk
530-include /usr/share/cdbs/1/class/gnome.mk
531-
532-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
533-
534-DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
535-DEB_CONFIGURE_EXTRA_FLAGS += --disable-static --enable-introspection
536-
537-# To generate dependencies tight enough so that consumers of the object
538-# properties can access them.
539-DEB_DH_MAKESHLIBS_ARGS = -V
540-
541-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
542-
543-debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3)
544-
545-common-install-arch::
546- find debian/tmp -name \*.la -delete
547- find debian/tmp -name \*.a -delete
548+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
549+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
550+
551+%:
552+ dh $@ --with gir,gnome
553+
554+override_dh_auto_configure:
555+ dh_auto_configure -- \
556+ --with-gtk=3 \
557+ --disable-static \
558+ --enable-introspection
559+
560+override_dh_install:
561+ find debian/tmp -name '*.a' -print -delete
562+ find debian/tmp -name '*.la' -print -delete
563+ dh_install
564+
565+override_dh_missing:
566+ dh_missing --list-missing
567+
568+override_dh_makeshlibs:
569+ dh_makeshlibs -- -c4
570+
571+override_dh_gnome:
572+ dh_gnome --no-gnome-versions
573+
574+override_dh_gnome_clean:
575+ dh_gnome_clean --no-control

Subscribers

People subscribed via source and target branches