From: Gaudenz Steinlin Date: Thu, 22 Dec 2016 07:55:05 +0000 (+0000) Subject: openorienteering-mapper (0.6.7-1) unstable; urgency=medium X-Git-Tag: archive/raspbian/0.8.1.1-1+rpi1^2^2^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=209926290bbc4515458bceb783b0a3e67b5061c4;p=openorienteering-mapper.git openorienteering-mapper (0.6.7-1) unstable; urgency=medium * [ffc784] New upstream release [dgit import unpatched openorienteering-mapper 0.6.7-1] --- 209926290bbc4515458bceb783b0a3e67b5061c4 diff --cc debian/Mapper index 0000000,0000000..e22f187 new file mode 100644 --- /dev/null +++ b/debian/Mapper @@@ -1,0 -1,0 +1,5 @@@ ++#!/bin/sh ++ ++export QT_SELECT=5 ++ ++exec /usr/lib/openorienteering-mapper/bin/Mapper $@ diff --cc debian/changelog index 0000000,0000000..2f36401 new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,45 @@@ ++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..ec63514 new file mode 100644 --- /dev/null +++ b/debian/compat @@@ -1,0 -1,0 +1,1 @@@ ++9 diff --cc debian/control index 0000000,0000000..7deeb73 new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,43 @@@ ++Source: openorienteering-mapper ++Section: graphics ++Priority: optional ++Maintainer: Gaudenz Steinlin ++Build-Depends: debhelper (>= 9), ++ cmake, ++ doxygen, ++ libproj-dev, ++ qtbase5-dev, ++ qtbase5-private-dev, ++ libcups2-dev, ++ qttools5-dev, ++ qttools5-dev-tools, ++ libqt5sql5-sqlite, ++ libpolyclipping-dev, ++ pkg-config, ++ xvfb, ++ xauth, ++ zlib1g-dev, ++Standards-Version: 3.9.8 ++Homepage: http://www.openorienteering.org/apps/mapper/ ++Vcs-Git: git://anonscm.debian.org/collab-maint/openorienteering-mapper.git ++Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/openorienteering-mapper.git;a=summary ++ ++Package: openorienteering-mapper ++Architecture: any ++Depends: ${shlibs:Depends}, ${misc:Depends}, qttools5-dev-tools ++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..8d89028 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,130 @@@ ++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ++Upstream-Name: openorienteering-mapper ++Source: http://oorienteering.sourceforge.net/ ++ ++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/qbezier/src/private ++Copyright: 2013 Digia Plc and/or its subsidiary(-ies) ++License: QT-Comercial or LGPL-2.1 or 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 Gaudenz Steinlin ++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: QT-Comercial ++ Commercial License Usage ++ Licensees holding valid commercial Qt licenses may use this file in ++ accordance with the commercial license agreement provided with the ++ Software or, alternatively, in accordance with the terms contained in ++ a written agreement between you and Digia. For licensing terms and ++ conditions see http://qt.digia.com/licensing. For further information ++ use the contact form at http://qt.digia.com/contact-us. ++ ++License: LGPL-2.1 ++ GNU Lesser General Public License Usage ++ Alternatively, this file may be used under the terms of the GNU Lesser ++ General Public License version 2.1 as published by the Free Software ++ Foundation and appearing in the file LICENSE.LGPL included in the ++ packaging of this file. Please review the following information to ++ ensure the GNU Lesser General Public License version 2.1 requirements ++ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++ . ++ In addition, as a special exception, Digia gives you certain additional ++ rights. These rights are described in the Digia Qt LGPL Exception ++ version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++ . ++ On Debian systems, the complete text of the GNU Lesser General Public ++ License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". ++ ++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.desktop index 0000000,0000000..8a0c874 new file mode 100644 --- /dev/null +++ b/debian/openorienteering-mapper.desktop @@@ -1,0 -1,0 +1,8 @@@ ++[Desktop Entry] ++Name=OpenOrienteering Mapper ++Comment=Orienteering map drawing application ++Comment[de]=Programm zum Zeichnen von Orientierungslaufkarten ++Exec=Mapper %F ++Icon=openorienteering-mapper.png ++Type=Application ++Categories=Graphics;VectorGraphics;Qt 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..90e6a0e new file mode 100644 --- /dev/null +++ b/debian/patches/fix-help-data-dir.patch @@@ -1,0 -1,0 +1,50 @@@ ++Description: Fix path to help files and QT assistant ++ Instead of assuming relative paths work, use the paths configured by CMake. ++ This is important to make the wrapper work on Debian where the executable is ++ moved to /usr/lib/openorienteering-mapper/bin and invoked from a wrapper in ++ /usr/bin. ++Author: Gaudenz Steinlin ++Forwarded: no ++Last-Update: 2015-09-22 ++--- ++This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ++Index: openorienteering-mapper/src/mapper_resource.cpp ++=================================================================== ++--- openorienteering-mapper.orig/src/mapper_resource.cpp +++++ openorienteering-mapper/src/mapper_resource.cpp ++@@ -122,8 +122,8 @@ QStringList MapperResource::getLocations ++ #endif ++ ++ #if defined(MAPPER_PACKAGE_NAME) ++- // Linux: program in xxx/bin, resources in xxx/bin/../share/PACKAGE_NAME ++- QString linux_dir(app_dir.absoluteFilePath(QLatin1String("../share/") + QString::fromUtf8(MAPPER_PACKAGE_NAME) + resource_path)); +++ // Linux: resources in MAPPER_DATA_DESTINATION +++ QString linux_dir(app_dir.absoluteFilePath(QString::fromUtf8(MAPPER_DATA_DESTINATION) + resource_path)); ++ addIfExists(locations, linux_dir); ++ #endif ++ ++@@ -175,8 +175,9 @@ QStringList MapperResource::getProgramLo ++ QDir app_dir(QCoreApplication::applicationDirPath()); ++ ++ #if defined(Mapper_PACKAGE_ASSISTANT) and defined(MAPPER_PACKAGE_NAME) ++- // Linux: extra binaries in xxx/bin/../share/PACKAGE_NAME/bin ++- addIfExists(locations, app_dir.absoluteFilePath(QLatin1String("../lib/") + QString::fromUtf8(MAPPER_PACKAGE_NAME) + QLatin1String("/bin/") + program_name)); +++ // Linux: extra binaries in MAPPER_LIBRARY_DESTINATION/bin +++ addIfExists(locations, app_dir.absoluteFilePath(QString::fromUtf8(MAPPER_LIBRARY_DESTINATION) + QLatin1String("/bin/") + program_name)); +++ ++ #endif ++ ++ // Find the program which is in the same directory as Mapper ++Index: openorienteering-mapper/src/mapper_config.h.in ++=================================================================== ++--- openorienteering-mapper.orig/src/mapper_config.h.in +++++ openorienteering-mapper/src/mapper_config.h.in ++@@ -26,6 +26,8 @@ ++ #define APP_NAME qApp->translate("Global", QT_TRANSLATE_NOOP("Global", "OpenOrienteering Mapper")) ++ #define APP_VERSION "@Mapper_VERSION_DISPLAY@" ++ #define MAPPER_HELP_NAMESPACE "@Mapper_HELP_NAMESPACE@" +++#define MAPPER_DATA_DESTINATION "@MAPPER_DATA_DESTINATION@" +++#define MAPPER_LIBRARY_DESTINATION "@MAPPER_LIBRARY_DESTINATION@" ++ ++ #cmakedefine Mapper_BUILD_PROJ ++ #cmakedefine Mapper_TRANSLATIONS_EMBEDDED 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..c04b98c new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,64 @@@ ++#!/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 $@ --parallel ++ ++# 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 COPYING file not needed on Debian ++ rm $(PKGDIR)/usr/share/doc/openorienteering-mapper/COPYING ++ ++ # install icon and desktop file (should be done by upstream build system) ++ for size in 16 24 32 48 96 128 256 512 ; do \ ++ mkdir -p $(PKGDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps ;\ ++ cp $(CURDIR)/images/mapper-icon/Mapper-$${size}.png $(PKGDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/openorienteering-mapper.png ;\ ++ done ++ mkdir -p $(PKGDIR)/usr/share/applications ++ cp $(CURDIR)/debian/openorienteering-mapper.desktop $(PKGDIR)/usr/share/applications/ ++ ++ # install start wrapper to set QT_SELECT=5 environment variable ++ mkdir -p $(PKGDIR)/usr/lib/openorienteering-mapper/bin ++ mv $(PKGDIR)/usr/bin/Mapper $(PKGDIR)/usr/lib/openorienteering-mapper/bin ++ cp $(CURDIR)/debian/Mapper $(PKGDIR)/usr/bin ++ chmod +x $(PKGDIR)/usr/bin/Mapper ++ ++override_dh_auto_test: ++ # The tests need a running X server, so use Xvfb to run the tests in automated ++ # build environments. ++ # Currently the symbol_set_t test modifies source files, exclude it for now ++ # See https://github.com/OpenOrienteering/mapper/issues/579 ++ # https://github.com/OpenOrienteering/mapper/issues/580 ++ # The autosave_t test fails for unknown reasons ++ cd obj-$(DEB_HOST_GNU_TYPE) ; xvfb-run /usr/bin/ctest --force-new-ctest-process -j1 --extra-verbose --exclude-regex 'autosave_t|symbol_set_t' 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..1dad8d9 new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,0 +1,5 @@@ ++# Compulsory line, this is a version 3 file ++version=3 ++ ++opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/openorienteering-mapper-$1\.tar\.gz/ \ ++ https://github.com/OpenOrienteering/mapper/tags .*/v?(\d\S*)\.tar\.gz