From 6b71da731f0892b78a15f40d8fb42ee5054b2536 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Fri, 8 Jul 2022 13:47:39 +0200 Subject: [PATCH 1/2] Improvements from Debian packaging --- debian/compat | 1 - debian/control | 80 ++--- debian/copyright | 513 +++++++++++++++++++++++++++++++- debian/libloc-dev.install | 1 + debian/libloc1.install | 1 + debian/libloc1.symbols | 2 + debian/location-perl.install | 1 - debian/location.install | 7 +- debian/location.manpages | 1 - debian/location.postinst | 14 + debian/location.postrm | 15 + debian/python3-location.install | 2 +- debian/rules | 32 +- debian/watch | 2 +- 14 files changed, 599 insertions(+), 73 deletions(-) delete mode 100644 debian/compat delete mode 100644 debian/location-perl.install delete mode 100644 debian/location.manpages create mode 100644 debian/location.postinst create mode 100644 debian/location.postrm diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 89cac4f..918c0f6 100644 --- a/debian/control +++ b/debian/control @@ -1,40 +1,40 @@ Source: libloc Maintainer: Stefan Schantl -Section: misc +Section: net Priority: optional -Standards-Version: 4.3.0 +Standards-Version: 4.6.1 Build-Depends: - debhelper (>= 11), - dh-python , - asciidoc , - intltool (>=0.40.0), - libpython3-dev , + debhelper-compat (= 13), + dh-sequence-python3, + asciidoc, + intltool, libssl-dev, libsystemd-dev, - python3-dev:any , pkg-config, + python3-all-dev, systemd, - xsltproc , - docbook-xsl , - git, + xsltproc, + docbook-xsl, Rules-Requires-Root: no Homepage: https://location.ipfire.org/ -Vcs-Git: https://git.ipfire.org/pub/git/location/libloc.git -Vcs-Browser: https://git.ipfire.org/pub/git/location/libloc.git +Vcs-Git: https://salsa.debian.org/debian/libloc.git +Vcs-Browser: https://salsa.debian.org/debian/libloc +Description: IP geolocation query library + libloc is a lightweight library to query the IPFire Location database and + determine the location of someone else on the Internet based on their IP + address. Package: libloc1 Architecture: any Section: libs -Pre-Depends: - ${misc:Pre-Depends} Depends: ${shlibs:Depends}, - ${misc:Depends} -Recommends: - location (= ${binary:Version}) + ${misc:Depends}, Multi-Arch: same -Description: Location library - A library to determine the location of someone on the Internet +Description: ${source:Synopsis} + ${source:Extended-Description} + . + This package provides the shared library. Package: libloc-dev Architecture: any @@ -42,42 +42,46 @@ Section: libdevel Depends: libloc1 (= ${binary:Version}), ${misc:Depends}, -Suggests: - pkg-config Multi-Arch: same -Description: Development files for libloc - Install this package if you wish to develop your own programs using - libloc. +Description: ${source:Synopsis} (development files) + ${source:Extended-Description} + . + This package provides the headers and development files needed to use libloc + in your own programs. Package: location -Architecture: any -Pre-Depends: - ${misc:Pre-Depends} +Architecture: all Depends: python3-location, ${misc:Depends}, - ${python3:Depends} + ${python3:Depends}, +Recommends: + libloc-database, Replaces: location-importer (<< 0.9.14-1~) Breaks: location-importer (<< 0.9.14-1~) -Multi-Arch: same -Description: CLI utilities for libloc - Commands to determine someone's location on the Internet +Description: ${source:Synopsis} (CLI utilities) + ${source:Extended-Description} + . + This package provides CLI utilities based on libloc. Package: python3-location Architecture: any Section: python -Pre-Depends: - ${misc:Pre-Depends} Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, python3-psycopg2, -Replaces: location-python (<< 0.9.14-1~) -Breaks: location-python (<< 0.9.14-1~), location-importer (<< 0.9.14-1~) +Replaces: + location-python (<< 0.9.14-1~), +Breaks: + location-python (<< 0.9.14-1~), + location-importer (<< 0.9.14-1~), Multi-Arch: foreign -Description: Python modules for libloc - This package contains Python bindings for libloc +Description: ${source:Synopsis} (Python 3 bindings) + ${source:Extended-Description} + . + This package provides the Python 3 bindings for libloc. Package: location-python Depends: python3-location, ${misc:Depends} diff --git a/debian/copyright b/debian/copyright index 3bd7654..2877361 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,14 +4,516 @@ Upstream-Contact: Michael Tremer Source: https://location.ipfire.org/download Files: * -Copyright: 2017-2019 IPFire Development team -License: LGPL-2.1 +Copyright: 2017-2022, IPFire Development Team +License: LGPL-2.1+ + +Files: m4/* + src/test-address.c + src/test-as.c + src/test-country.c + src/test-database.c + src/test-libloc.c + src/test-network-list.c + src/test-network.c + src/test-signature.c + src/test-stringpool.c +Copyright: 2006-2008, Diego Pettenò + 2017-2022, IPFire Development Team + 2012, Lucas De Marchi + 2006-2008, xine project +License: GPL-2+ + +Files: src/perl/lib/* +Copyright: 2019, Stefan Schantl +License: Artistic-or-GPL + +Files: m4/ax_prog_perl_modules.m4 +Copyright: 2009, Dean Povey +License: FSFAP + +Files: m4/ld-version-script.m4 +Copyright: 2008-2015, Free Software Foundation, Inc +License: FSFULLR + +Files: tests/data/* +Copyright: 2017-2022, IPFire Development Team +License: CC-BY-SA-4 Files: debian/* -Copyright: 2019 Stefan Schantl -License: LGPL-2.1 +Copyright: 2022, Jochen Sprickerhof + 2019, Stefan Schantl +License: LGPL-2.1+ + +License: Artistic-or-GPL + This library is free software; you can redistribute it and/or modify + it under the same terms as Perl itself, either Perl version 5.28.1 or, + at your option, any later version of Perl 5 you may have available. + . + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL' and + the Artistic Licence in '/usr/share/common-licenses/Artistic'. -License: LGPL-2.1 +License: CC-BY-SA-4 + http://creativecommons.org/licenses/by-sa/4.0/ + . + Attribution-ShareAlike 4.0 International + . + ======================================================================= + . + Creative Commons Corporation ("Creative Commons") is not a law firm and + does not provide legal services or legal advice. Distribution of + Creative Commons public licenses does not create a lawyer-client or + other relationship. Creative Commons makes its licenses and related + information available on an "as-is" basis. Creative Commons gives no + warranties regarding its licenses, any material licensed under their + terms and conditions, or any related information. Creative Commons + disclaims all liability for damages resulting from their use to the + fullest extent possible. + . + Using Creative Commons Public Licenses + . + Creative Commons public licenses provide a standard set of terms and + conditions that creators and other rights holders may use to share + original works of authorship and other material subject to copyright + and certain other rights specified in the public license below. The + following considerations are for informational purposes only, are not + exhaustive, and do not form part of our licenses. + . + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + . + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + . + ======================================================================= + . + Creative Commons Attribution-ShareAlike 4.0 International Public + License + . + By exercising the Licensed Rights (defined below), You accept and agree + to be bound by the terms and conditions of this Creative Commons + Attribution-ShareAlike 4.0 International Public License ("Public + License"). To the extent this Public License may be interpreted as a + contract, You are granted the Licensed Rights in consideration of Your + acceptance of these terms and conditions, and the Licensor grants You + such rights in consideration of benefits the Licensor receives from + making the Licensed Material available under these terms and + conditions. + . + . + Section 1 -- Definitions. + . + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + . + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + . + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + . + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + . + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + . + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + . + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + . + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + . + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + . + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + . + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + . + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + . + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + . + . + Section 2 -- Scope. + . + a. License grant. + . + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + . + a. reproduce and Share the Licensed Material, in whole or + in part; and + . + b. produce, reproduce, and Share Adapted Material. + . + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + . + 3. Term. The term of this Public License is specified in Section + 6(a). + . + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + . + 5. Downstream recipients. + . + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + . + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + . + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + . + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + . + b. Other rights. + . + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + . + 2. Patent and trademark rights are not licensed under this + Public License. + . + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + . + . + Section 3 -- License Conditions. + . + Your exercise of the Licensed Rights is expressly made subject to the + following conditions. + . + a. Attribution. + . + 1. If You Share the Licensed Material (including in modified + form), You must: + . + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + . + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + . + ii. a copyright notice; + . + iii. a notice that refers to this Public License; + . + iv. a notice that refers to the disclaimer of + warranties; + . + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + . + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + . + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + . + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + . + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + . + b. ShareAlike. + . + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + . + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + . + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + . + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + . + . + Section 4 -- Sui Generis Database Rights. + . + Where the Licensed Rights include Sui Generis Database Rights that + apply to Your use of the Licensed Material: + . + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + . + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + . + including for purposes of Section 3(b); and + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + . + For the avoidance of doubt, this Section 4 supplements and does not + replace Your obligations under this Public License where the Licensed + Rights include other Copyright and Similar Rights. + . + . + Section 5 -- Disclaimer of Warranties and Limitation of Liability. + . + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + . + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + . + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + . + . + Section 6 -- Term and Termination. + . + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + . + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + . + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + . + 2. upon express reinstatement by the Licensor. + . + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + . + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + . + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + . + . + Section 7 -- Other Terms and Conditions. + . + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + . + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + . + . + Section 8 -- Interpretation. + . + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + . + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + . + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + . + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + . + . + ======================================================================= + . + Creative Commons is not a party to its public + licenses. Notwithstanding, Creative Commons may elect to apply one of + its public licenses to material it publishes and in those instances + will be considered the “Licensor.” The text of the Creative Commons + public licenses is dedicated to the public domain under the CC0 Public + Domain Dedication. Except for the limited purpose of indicating that + material is shared under a Creative Commons public license or as + otherwise permitted by the Creative Commons policies published at + creativecommons.org/policies, Creative Commons does not authorize the + use of the trademark "Creative Commons" or any other trademark or logo + of Creative Commons without its prior written consent including, + without limitation, in connection with any unauthorized modifications + to any of its public licenses or any other arrangements, + understandings, or agreements concerning use of licensed material. For + the avoidance of doubt, this paragraph does not form part of the + public licenses. + . + Creative Commons may be contacted at creativecommons.org. + +License: FSFAP + Copying and distribution of this file, with or without modification, are + permitted in any medium without royalty provided the copyright notice + and this notice are preserved. This file is offered as-is, without any + warranty. + +License: FSFULLR + This file is free software; the Free Software Foundation gives + unlimited permission to copy and/or distribute it, with or without + modifications, as long as this notice is preserved. + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + . + On Debian systems, the complete text of the GNU General Public + License version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +License: LGPL-2.1+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; version 2.1 of the License, or (at @@ -23,4 +525,3 @@ License: LGPL-2.1 . The complete text of the GNU General Public License can be found in /usr/share/common-licenses/LGPL-2.1 file. - . diff --git a/debian/libloc-dev.install b/debian/libloc-dev.install index d93d217..04e85fa 100644 --- a/debian/libloc-dev.install +++ b/debian/libloc-dev.install @@ -1,3 +1,4 @@ usr/include/libloc usr/lib/*/libloc.so usr/lib/*/pkgconfig +usr/share/man/man3 diff --git a/debian/libloc1.install b/debian/libloc1.install index 0f8eec4..e6cb2ac 100644 --- a/debian/libloc1.install +++ b/debian/libloc1.install @@ -1 +1,2 @@ usr/lib/*/libloc.so.* +usr/share/locale/*/LC_MESSAGES/libloc.mo diff --git a/debian/libloc1.symbols b/debian/libloc1.symbols index abdc32a..3770535 100644 --- a/debian/libloc1.symbols +++ b/debian/libloc1.symbols @@ -13,6 +13,7 @@ libloc.so.1 libloc1 #MINVER# loc_as_list_new@LIBLOC_1 0.9.5 loc_as_list_ref@LIBLOC_1 0.9.5 loc_as_list_size@LIBLOC_1 0.9.5 + loc_as_list_sort@LIBLOC_1 0.9.12 loc_as_list_unref@LIBLOC_1 0.9.5 loc_as_new@LIBLOC_1 0.9.4 loc_as_ref@LIBLOC_1 0.9.4 @@ -32,6 +33,7 @@ libloc.so.1 libloc1 #MINVER# loc_country_list_new@LIBLOC_1 0.9.5 loc_country_list_ref@LIBLOC_1 0.9.5 loc_country_list_size@LIBLOC_1 0.9.5 + loc_country_list_sort@LIBLOC_1 0.9.12 loc_country_list_unref@LIBLOC_1 0.9.5 loc_country_new@LIBLOC_1 0.9.4 loc_country_ref@LIBLOC_1 0.9.4 diff --git a/debian/location-perl.install b/debian/location-perl.install deleted file mode 100644 index 08e8cc4..0000000 --- a/debian/location-perl.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/perl/ diff --git a/debian/location.install b/debian/location.install index 716f0de..f9cb894 100644 --- a/debian/location.install +++ b/debian/location.install @@ -1,5 +1,4 @@ -usr/bin/location -usr/bin/location-importer +usr/bin var/lib/location/signing-key.pem -src/systemd/*.service /lib/systemd/system/ -src/systemd/*.timer /lib/systemd/system/ +lib/systemd/system +usr/share/man/man8 diff --git a/debian/location.manpages b/debian/location.manpages deleted file mode 100644 index 3e662bb..0000000 --- a/debian/location.manpages +++ /dev/null @@ -1 +0,0 @@ -man/location.8 diff --git a/debian/location.postinst b/debian/location.postinst new file mode 100644 index 0000000..913f39c --- /dev/null +++ b/debian/location.postinst @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + mkdir -p /var/lib/location || true + ln -s /usr/share/libloc-location/location.db /var/lib/location/database.db 2>/dev/null || true + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/location.postrm b/debian/location.postrm new file mode 100644 index 0000000..df1b03e --- /dev/null +++ b/debian/location.postrm @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +case "$1" in + purge) + rm -f /var/lib/location/database.db 2>/dev/null + rm -f /var/lib/location/signing-key.pem 2>/dev/null + rmdir /var/lib/location || true + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/python3-location.install b/debian/python3-location.install index a6004ca..4606faa 100644 --- a/debian/python3-location.install +++ b/debian/python3-location.install @@ -1 +1 @@ -usr/lib/python3*/site-packages +usr/lib/python3* diff --git a/debian/rules b/debian/rules index 6ec8d8a..e5e3f18 100755 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,17 @@ #!/usr/bin/make -f -# enable verbose mode -#export DH_VERBOSE=1 - -# enable all hardening build flags export DEB_BUILD_MAINT_OPTIONS=hardening=+all +export PYBUILD_SYSTEM=custom +export PYBUILD_CLEAN_ARGS=dh_auto_clean +export PYBUILD_CONFIGURE_ARGS=intltoolize --force --automake; \ + PYTHON={interpreter} dh_auto_configure -- \ + --disable-perl +export PYBUILD_BUILD_ARGS=dh_auto_build +export PYBUILD_INSTALL_ARGS=dh_auto_install --destdir={destdir}; \ + mkdir -p {destdir}/usr/lib/python{version}/dist-packages; \ + mv {destdir}/usr/lib/python3/dist-packages/_location.so {destdir}/usr/lib/python{version}/dist-packages/_location.so; \ + rm -f {destdir}/usr/lib/python3/dist-packages/_location.la {destdir}/usr/lib/*/libloc.la +export PYBUILD_TEST_ARGS=dh_auto_test %: - dh $@ --with python3 --with-systemd - -override_dh_auto_configure: - intltoolize --force --automake - dh_auto_configure -- --disable-perl - -override_dh_perl: - dh_perl -d - -override_dh_systemd_enable: - dh_systemd_enable location-update.timer - -override_dh_install: - dh_install - # lintian: unknown-file-in-python-module-directory - rm debian/python3-location/usr/lib/python3*/site-packages/_location.la + dh $@ --buildsystem=pybuild diff --git a/debian/watch b/debian/watch index 19ace6d..f466401 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=4 https://source.ipfire.org/releases/libloc/ \ - @PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate + @PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ -- 2.36.1