From: Graham Inggs Date: Tue, 25 Dec 2018 11:21:02 +0000 (+0000) Subject: openorienteering-mapper (0.8.4-1) unstable; urgency=medium X-Git-Tag: archive/raspbian/0.8.4-1+rpi1^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c101b497a7a4366d572a8846b3467b1ed25c36a7;p=openorienteering-mapper.git openorienteering-mapper (0.8.4-1) unstable; urgency=medium * New upstream release * Refresh fix-help-data-dir.patch * Update debian/watch to ignore preview snapshots * Bump Standards-Version to 4.3.0, no changes [dgit import unpatched openorienteering-mapper 0.8.4-1] --- c101b497a7a4366d572a8846b3467b1ed25c36a7 diff --cc debian/README.source index 0000000,0000000..a101d80 new file mode 100644 --- /dev/null +++ b/debian/README.source @@@ -1,0 -1,0 +1,34 @@@ ++# Updating the Git repository to a new upstream version ++ ++1. Add the upstream git repository to our checkout as an additional ++ remote if not already present. ++ ++ # git remote add upstream git@github.com:OpenOrienteering/mapper.git ++ ++2. Update all remotes ++ ++ # git remote update ++ ++3. Download the new upstream release ++ ++ # uscan --download ++ ++ or, a particular upstream release ++ ++ # uscan --download-version X.Y.Z ++ ++4. Merge the upstream release tag to the debian branch ++ ++ # git checkout debian ++ # git merge vX.Y.Z ++ ++5. Commit the upstream tarball to the pristine-tar branch ++ ++ # pristine-tar commit ../openorienteering-mapper_X.Y.Z.orig.tar.gz vX.Y.Z ++ ++6. Push the changes to salsa ++ ++ # git push origin debian ++ # git push origin pristine-tar ++ ++ -- Gaudenz Steinlin , Mon, 26 Mar 2018 23:13:01 +0200 diff --cc debian/changelog index 0000000,0000000..6872ba3 new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,111 @@@ ++openorienteering-mapper (0.8.4-1) unstable; urgency=medium ++ ++ * New upstream release ++ * Refresh fix-help-data-dir.patch ++ * Update debian/watch to ignore preview snapshots ++ * Bump Standards-Version to 4.3.0, no changes ++ ++ -- Graham Inggs Tue, 25 Dec 2018 11:21:02 +0000 ++ ++openorienteering-mapper (0.8.1.1-1) unstable; urgency=medium ++ ++ [ Gaudenz Steinlin ] ++ * New upstream release ++ - Fix build on big-endian systems (Closes: #865180) ++ - Fix reproducible builds (Closes: #876934) ++ - Update for PROJ5 ++ * Change VCS URLs to salsa.debian.org ++ * Document updating to a new upstream release ++ ++ [ Graham Inggs ] ++ * Add Build-Depends on sqlite3 ++ * Switch to debhelper compat level 11 ++ * Skip tests when DEB_BUILD_OPTIONS=nocheck ++ * Bump Standards-Version to 4.1.3, no changes ++ ++ -- Graham Inggs Thu, 29 Mar 2018 13:49:31 +0000 ++ ++openorienteering-mapper (0.7.0-1) unstable; urgency=medium ++ ++ * New upstream release ++ * Add Build-Depends on libgdal-dev ++ * Update fix-help-data-dir.patch ++ * Do not build with -mno-rla on mips64el, no longer needed ++ * Remove extra license file and replace it with a symlink ++ * Strip RPATH from /usr/bin/Mapper ++ * Bump Standards-Version to 4.1.0, no changes ++ ++ -- Graham Inggs Mon, 11 Sep 2017 14:11:05 +0000 ++ ++openorienteering-mapper (0.6.8-3) unstable; urgency=medium ++ ++ * Build with -mno-lra on mips64el to avoid FTBFS, see #871514 ++ ++ -- Graham Inggs Thu, 31 Aug 2017 15:41:19 +0000 ++ ++openorienteering-mapper (0.6.8-2) unstable; urgency=medium ++ ++ * Upload to unstable, fixes build with GCC 7 (Closes: #871820) ++ * Add myself to Uploaders ++ * Remove duplicate .desktop entry and icons (Closes: #853952) ++ * Use secure URIs for VCS fields ++ * Switch to debhelper compat level 10 ++ * Update debian/copyright ++ * Bump Standards-Version to 4.0.1, no further changes ++ * Drop start wrapper that set QT_SELECT, no longer required, ++ fixes opening files with spaces in their names (Closes: #872291) ++ * Enable all build-time tests again, fixed upstream ++ ++ -- Graham Inggs Thu, 17 Aug 2017 12:41:15 +0000 ++ ++openorienteering-mapper (0.6.8-1) experimental; urgency=medium ++ ++ * [6d69f6] New upstream release ++ ++ -- Gaudenz Steinlin Thu, 16 Mar 2017 17:18:31 +0100 ++ ++openorienteering-mapper (0.6.7-1) unstable; urgency=medium ++ ++ * [ffc784] New upstream release ++ ++ -- Gaudenz Steinlin Thu, 22 Dec 2016 08:55:05 +0100 ++ ++openorienteering-mapper (0.6.6-1) unstable; urgency=medium ++ ++ * [9a1799] New upstream release (Closes: #847408) ++ ++ -- Gaudenz Steinlin Tue, 13 Dec 2016 15:52:35 +0100 ++ ++openorienteering-mapper (0.6.5-1) unstable; urgency=medium ++ ++ * [129c93] New upstream release (Closes: #839205) ++ * [9a7095] Update watch file to point to github (Closes: #839205) ++ ++ -- Gaudenz Steinlin Fri, 30 Sep 2016 10:36:50 +0200 ++ ++openorienteering-mapper (0.6.3-2) unstable; urgency=medium ++ ++ * [5723e4] Update copyright information ++ ++ -- Gaudenz Steinlin Fri, 01 Jul 2016 16:24:51 +0200 ++ ++openorienteering-mapper (0.6.3-1) unstable; urgency=medium ++ ++ * New upstream release ++ * [bd2e4e] Remove enable-tests-in-release-build.patch applied upstream ++ * [1ee6ca] Build-depend on qtbase5-private-dev and libcups2-dev ++ * [17b3b6] Add doxygen to build dependencies ++ * [d78d2b] Add zlib1g-dev to build dependencies ++ * [7a100f] Exclude test which currently fail ++ * [2ef3f5] Update Hompage control field ++ * [6dda6c] Update standards version to 3.9.8 (no changes) ++ * [b1fc9a] Refresh patch for upstream version 0.6.3 ++ * [1d5247] Disable currently failing autosave test ++ ++ -- Gaudenz Steinlin Thu, 30 Jun 2016 22:25:53 +0200 ++ ++openorienteering-mapper (0.5.96-1) unstable; urgency=low ++ ++ * Initial release (Closes: #773110) ++ ++ -- Gaudenz Steinlin Tue, 22 Sep 2015 23:09:55 +0200 diff --cc debian/compat index 0000000,0000000..b4de394 new file mode 100644 --- /dev/null +++ b/debian/compat @@@ -1,0 -1,0 +1,1 @@@ ++11 diff --cc debian/control index 0000000,0000000..06dc4c8 new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,47 @@@ ++Source: openorienteering-mapper ++Section: graphics ++Priority: optional ++Maintainer: Gaudenz Steinlin ++Uploaders: Graham Inggs ++Build-Depends: chrpath, ++ cmake, ++ debhelper (>= 11), ++ doxygen, ++ libcups2-dev, ++ libgdal-dev, ++ libpolyclipping-dev, ++ libproj-dev, ++ libqt5sql5-sqlite, ++ pkg-config, ++ qtbase5-dev, ++ qtbase5-private-dev, ++ qttools5-dev, ++ qttools5-dev-tools, ++ sqlite3, ++ xauth, ++ xvfb, ++ zlib1g-dev ++Standards-Version: 4.3.0 ++Homepage: http://www.openorienteering.org/apps/mapper/ ++Vcs-Git: https://salsa.debian.org/debian/openorienteering-mapper.git ++Vcs-Browser: https://salsa.debian.org/debian/openorienteering-mapper ++ ++Package: openorienteering-mapper ++Architecture: any ++Depends: qttools5-dev-tools, ${misc:Depends}, ${shlibs:Depends} ++Description: Orienteering map drawing application ++ OpenOrienteering Mapper is an application to draw maps for forest, ++ sprint, MTB and radio orienteering races. It comes with predefined ++ symbol sets implementing the IOF standards ISOM (1:15000, 1:10000) ++ and ISSOM (1:5000, 1:4000). It is easy to implement additional symbol ++ sets. ++ . ++ It provides a Free alternative to existing proprietary map drawing ++ applications and supports multiple platforms. It is available for ++ Android, Windows, Mac OS X and Linux. ++ . ++ While it is under continuous development and considered in beta ++ state, it has been used to produce maps for orienteering races. All ++ required functions for drawing maps are implemented and the program ++ works very stable. So it can be considered ready for productive use, ++ although it is like always a good idea to keep backups of your files. diff --cc debian/copyright index 0000000,0000000..7b43297 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,101 @@@ ++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ++Upstream-Name: openorienteering-mapper ++Source: https://github.com/OpenOrienteering/mapper ++ ++Files: * ++Copyright: 2012-2016 Thomas Schöps ++ 2012-2016 Kai Pastor ++ 2012, 2013 Pete Curtis ++ 2012, 2013 Jan Dalheimer ++License: GPL-3+ ++ ++Files: 3rd-party/qtsingleapplication/src/* ++Copyright: 2010 Nokia Corporation and/or its subsidiary(-ies) ++License: BSD-3-clause ++ ++Files: test/tst_qglobal.* ++Copyright: 2016 The Qt Company Ltd ++License: GPL-3 ++ ++Files: src/printsupport/qt-5.2.1/* ++Copyright: 2013 Digia Plc and/or its subsidiary(-ies) ++ 2015 The Qt Company Ltd ++License: GPL-3 ++ ++Files: src/util/qoverload.h ++Copyright: 2016 The Qt Company Ltd / 2016 Intel Corporation ++License: GPL-3 ++ ++Files: src/util/qasconst.h ++Copyright: 2016 The Qt Company Ltd / 2016 Intel Corporation ++License: GPL-3 ++ ++Files: debian/* ++Copyright: 2014-2017 Gaudenz Steinlin ++ 2017 Graham Inggs ++License: GPL-3+ ++ ++License: GPL-3+ ++ 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 3 of the License, or ++ (at your option) any later version. ++ . ++ This package 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, see . ++ . ++ On Debian systems, the complete text of the GNU General ++ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". ++ ++License: GPL-3 ++ This is a modified version of a file from the Qt Toolkit. ++ You can redistribute it and/or modify it under the terms of ++ the GNU General Public License, version 3, as published by ++ the Free Software Foundation. ++ . ++ OpenOrienteering 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 OpenOrienteering. If not, see ++ . ++ On Debian systems, the complete text of the GNU General ++ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". ++ ++License: BSD-3-clause ++ This file is part of a Qt Solutions component. ++ . ++ You may use this file under the terms of the BSD license as follows: ++ . ++ "Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions are ++ met: ++ * Redistributions of source code must retain the above copyright ++ notice, this list of conditions and the following disclaimer. ++ * Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in ++ the documentation and/or other materials provided with the ++ distribution. ++ * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor ++ the names of its contributors may be used to endorse or promote ++ products derived from this software without specific prior written ++ permission. ++ . ++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." diff --cc debian/gbp.conf index 0000000,0000000..37aab80 new file mode 100644 --- /dev/null +++ b/debian/gbp.conf @@@ -1,0 -1,0 +1,5 @@@ ++[DEFAULT] ++debian-branch = debian ++ ++[dch] ++git-log=--author=gaudenz@debian.org --no-max-parents diff --cc debian/openorienteering-mapper.manpages index 0000000,0000000..1c234a2 new file mode 100644 --- /dev/null +++ b/debian/openorienteering-mapper.manpages @@@ -1,0 -1,0 +1,1 @@@ ++doc/man/Mapper.1 diff --cc debian/patches/fix-help-data-dir.patch index 0000000,0000000..bad48dd new file mode 100644 --- /dev/null +++ b/debian/patches/fix-help-data-dir.patch @@@ -1,0 -1,0 +1,19 @@@ ++Description: Fix path to help files and QT assistant ++ Install Manual and About files to /usr/share/openorienteering-mapper/doc/ ++ instead of /usr/share/doc/openorienteering-mapper/. ++Author: Graham Inggs ++Forwarded: no ++Last-Update: 2018-12-25 ++--- ++This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ++--- a/CMakeLists.txt +++++ b/CMakeLists.txt ++@@ -152,7 +152,7 @@ ++ set(MAPPER_RUNTIME_DESTINATION "bin") ++ set(MAPPER_LIBRARY_DESTINATION "lib/${Mapper_PACKAGE_NAME}") ++ set(MAPPER_DATA_DESTINATION "share/${Mapper_PACKAGE_NAME}") ++- set(MAPPER_ABOUT_DESTINATION "share/doc/${Mapper_PACKAGE_NAME}") +++ set(MAPPER_ABOUT_DESTINATION "share/${Mapper_PACKAGE_NAME}/doc") ++ endif() ++ ++ if(CMAKE_CROSSCOMPILING) diff --cc debian/patches/series index 0000000,0000000..ab5fbcd new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,1 @@@ ++fix-help-data-dir.patch diff --cc debian/rules index 0000000,0000000..f1e7300 new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,51 @@@ ++#!/usr/bin/make -f ++# See debhelper(7) (uncomment to enable) ++# output every command that modifies files on the build system. ++#DH_VERBOSE = 1 ++ ++# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* ++DPKG_EXPORT_BUILDFLAGS = 1 ++include /usr/share/dpkg/default.mk ++ ++# see FEATURE AREAS in dpkg-buildflags(1) ++#export DEB_BUILD_MAINT_OPTIONS = hardening=+all ++ ++# see ENVIRONMENT in dpkg-buildflags(1) ++# package maintainers to append CFLAGS ++#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic ++# package maintainers to append LDFLAGS ++#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed ++ ++PKGDIR = $(CURDIR)/debian/openorienteering-mapper ++ ++# main packaging script based on dh7 syntax ++%: ++ dh $@ ++ ++# debmake generated override targets ++# This is example for Cmake (See http://bugs.debian.org/641051 ) ++override_dh_auto_configure: ++ dh_auto_configure -- \ ++ -DCMAKE_BUILD_TYPE=Release \ ++ -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \ ++ -DMapper_BUILD_QT=OFF \ ++ -DMapper_BUILD_CLIPPER=OFF \ ++ -DMapper_BUILD_PROJ=OFF \ ++ -DMapper_BUILD_PACKAGE=OFF \ ++ -DMapper_AUTORUN_UNIT_TESTS=OFF \ ++ -DMapper_AUTORUN_SYSTEM_TESTS=OFF ++ ++override_dh_auto_install: ++ dh_auto_install ++ # remove extra license file and replace it with a symlink ++ rm -f $(PKGDIR)/usr/share/openorienteering-mapper/doc/common-licenses/GPL-3.txt ++ ln -s /usr/share/common-licenses/GPL-3 $(PKGDIR)/usr/share/openorienteering-mapper/doc/common-licenses/GPL-3.txt ++ # strip RPATH from /usr/bin/Mapper ++ /usr/bin/chrpath -d $(PKGDIR)/usr/bin/Mapper ++ ++override_dh_auto_test: ++ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ++ # The tests need a running X server, so use Xvfb to run the tests in automated ++ # build environments. ++ cd obj-$(DEB_HOST_GNU_TYPE) ; xvfb-run /usr/bin/ctest --force-new-ctest-process -j1 --extra-verbose ++endif diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/watch index 0000000,0000000..0d87815 new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,0 +1,4 @@@ ++version=4 ++ ++opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/openorienteering-mapper-$1\.tar\.gz/ \ ++ https://github.com/OpenOrienteering/mapper/tags .*/v([\d\.]+)\.tar\.gz