[garmindev] 11/12: Imported Debian patch 0.3.4+svn3432-1

Jaromír Mikeš mira-guest at moszumanska.debian.org
Sat Apr 25 15:28:43 UTC 2015


This is an automated email from the git hooks/post-receive script.

mira-guest pushed a commit to branch master
in repository garmindev.

commit b9df84f0d09a173ffaae5eb49ab24d0ac824fe1b
Merge: 3ad61d2 46ec864
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Jul 20 14:52:46 2012 +0200

    Imported Debian patch 0.3.4+svn3432-1

 .kdev4/GarminDev.kdev4                    |  14 --
 CMakeLists.txt                            |   3 +-
 CMakeLists.txt.user                       | 164 -------------
 GarminDev.kdev4                           |   3 -
 debian/changelog                          |  16 ++
 debian/compat                             |   2 +-
 debian/control                            |  21 +-
 debian/copyright                          |  93 +++++---
 debian/gbp.conf                           |   2 +
 debian/patches/fix_76csx_screenshot       |   8 +-
 debian/rules                              |   2 +-
 src/CMakeLists.txt                        |   1 +
 src/CUSB.cpp                              | 184 ++++++---------
 src/CUSB.h                                |  13 +-
 src/CUSB_MacOSX.cpp                       |  55 +----
 src/CUSB_common.cpp                       | 152 ++++++++++++
 src/EtrexLegend/CDevice.cpp               |  12 +-
 src/EtrexLegendC/CDevice.cpp              |  12 +-
 src/ForeRunner/CMakeLists.txt             |   2 +-
 src/ForeRunner/loader.cpp                 |  16 ++
 src/GPSMap60CSx/CDevice.cpp               |  10 +-
 src/GPSMap60CSx/CMakeLists.txt            |   1 +
 src/GPSMap60CSx/loader.cpp                |  19 ++
 src/GPSMap76/CDevice.cpp                  |  12 +-
 src/{ForeRunner => Oregon}/CMakeLists.txt |  15 +-
 src/Oregon/Oregon.cpp                     | 264 +++++++++++++++++++++
 src/Oregon/Oregon.h                       |  78 +++++++
 src/Oregon/Oregon.txt                     | 122 ++++++++++
 src/{ForeRunner => Oregon}/loader.cpp     |  35 ++-
 src/Platform.h                            | 370 ++++++++++++++++++++----------
 30 files changed, 1157 insertions(+), 544 deletions(-)

diff --cc debian/changelog
index f1bf698,0000000..905b53c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,33 -1,0 +1,49 @@@
++garmindev (0.3.4+svn3432-1) experimental; urgency=low
++
++  * Upload svn 3432 (Closes: #681357)
++  * Set myself as uploader (Closes: #654749)
++  * Update copyright file
++  * Add Forerunner 305 to description
++  * Remove manually set flags
++  * Set compat level to 9 and dh 9 to fix hardening 
++  * Little improvement to gitignore file
++  * Refresh patch
++  * Added gbp.conf file
++  * Added local-option file
++  * Bump Standards
++
++ -- Jaromír Mikeš <mira.mikes at seznam.cz>  Fri, 20 Jul 2012 14:52:46 +0200
++
 +garmindev (0.3.4-2) unstable; urgency=low
 +
 +  * Fix mis-oriented device screenshots of GPSMAP76CSx devices
 +   (Closes: #577644). Thanks to Jonas Stein for reporting.
 +
 + -- Michael Hanke <michael.hanke at gmail.com>  Mon, 07 Jun 2010 07:14:58 -0400
 +
 +garmindev (0.3.4-1) unstable; urgency=low
 +
 +  * New upstream release. New API version.
 +  * Switch from CDBS to debhelper's dh. Bump compat level to 7.
 +  * Switch to source package format 3.0 (quilt).
 +
 + -- Michael Hanke <michael.hanke at gmail.com>  Sun, 06 Jun 2010 17:50:47 -0400
 +
 +garmindev (0.3.3-1) unstable; urgency=low
 +
 +  * New upstream release. Added support for GPSMap60C.
 +
 + -- Michael Hanke <michael.hanke at gmail.com>  Sat, 06 Mar 2010 10:09:21 -0500
 +
 +garmindev (0.3.2-1) unstable; urgency=low
 +
 +  * New upstream release (Missed 0.3.1).
 +  * Updated debian/copyright.
 +
 + -- Michael Hanke <michael.hanke at gmail.com>  Sat, 30 Jan 2010 11:58:05 -0500
 +
 +garmindev (0.3.0-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #532619).
 +
 + -- Michael Hanke <michael.hanke at gmail.com>  Mon, 31 Aug 2009 09:05:51 -0400
diff --cc debian/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --cc debian/control
index 9844a97,0000000..2496e6f
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,19 -1,0 +1,26 @@@
 +Source: garmindev
 +Section: utils
 +Priority: optional
- Maintainer: Michael Hanke <michael.hanke at gmail.com>
- Uploaders: Yaroslav Halchenko <yoh at debian.org>
- Build-Depends: debhelper (>= 7.0.50~), cmake (>= 2.4), libusb-dev
- Standards-Version: 3.8.4
++Maintainer: Jaromír Mikeš <mira.mikes at seznam.cz>
++Uploaders:
++ Michael Hanke <michael.hanke at gmail.com>,
++ Yaroslav Halchenko <yoh at debian.org>
++Build-Depends:
++ cmake (>= 2.4),
++ debhelper (>= 9.20120417~),
++ libusb-dev
++Standards-Version: 3.9.3
 +Homepage: http://www.qlandkarte.org
 +XS-DM-Upload-Allowed: yes
 +Vcs-Browser: http://git.debian.org/?p=collab-maint/garmindev.git
 +Vcs-Git: git://git.debian.org/git/collab-maint/garmindev.git
 +
- 
 +Package: qlandkartegt-garmin
 +Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
++Depends:
++ ${misc:Depends},
++ ${shlibs:Depends}
 +Description: QLandkarteGT plugins to access Garmin devices
 + A collection of plugins for QLandkarteGT to talk to various Garmin GPS devices,
-  including GPSMap60CSx, GPSMap76, eTrexH, eTrexLegend and similar GPSr.
++ including GPSMap60CSx, GPSMap76, eTrexH, eTrexLegend, Forerunner 305 
++ and similar GPSr.
diff --cc debian/copyright
index f210d99,0000000..4ce5be3
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,47 -1,0 +1,84 @@@
- Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 +Upstream-Name: GarminDev
- Upstream-Source: http://www.qlandkarte.org
++Upstream-Contact: Oliver Eichler <oliver.eichler at gmx.de>
++Source:  http://www.qlandkarte.org
++Copyright: 2007-2010 Oliver Eichler <oliver.eichler at gmx.de>
 +
 +
 +Files: *
- Copyright: 2007-2010, Oliver Eichler <oliver.eichler at gmx.de>
++Copyright:
++ 2007-2010 Oliver Eichler <oliver.eichler at gmx.de>
 +License: GPL-2+
-   On Debian systems, the complete text of the GNU General
-   Public License can be found in `/usr/share/common-licenses/GPL'.
 +
++Files: debian/*
++Copyright:
++ 2009-2010 Michael Hanke <michael.hanke at gmail.com>
++ 2012 Jaromír Mikeš <mira.mikes at seznam.cz>
++License: GPL-2+
 +
 +Files: src/CTcp.*
- Copyright: 2007, Juan Pablo Daniel Borgna <jpdborgna at e-mips.com.ar>
++Copyright:
++ 2007 Juan Pablo Daniel Borgna <jpdborgna at e-mips.com.ar>
 +License: GPL-2+
-   On Debian systems, the complete text of the GNU General
-   Public License can be found in `/usr/share/common-licenses/GPL'.
- 
 +
 +Files: src/EtrexH/*
- Copyright: 2007-2008, Frank Seidel <fseidel at suse.de>
++Copyright:
++ 2007-2008, Frank Seidel <fseidel at suse.de>
 +License: GPL-2+
-   On Debian systems, the complete text of the GNU General
-   Public License can be found in `/usr/share/common-licenses/GPL'.
 +
- 
- Files: src/{CUSB_MacOSX.cpp,Platform.h}
- Copyright: 2008, Albrecht Dress <albrecht.dress at arcor.de>
++Files: 
++ src/CUSB_MacOSX.cpp
++ src/Platform.h
++Copyright:
++ 2008 Albrecht Dress <albrecht.dress at arcor.de>
 +License: GPL-2+
-   On Debian systems, the complete text of the GNU General
-   Public License can be found in `/usr/share/common-licenses/GPL'.
- 
 +
 +Files: cmake/Modules/*
- Copyright: 2006-2009, Andreas Schneider <mail at cynapses.org>,
-            2006, Alexander Neundorf <neundorf at kde.org>,
-            2006-2007  Wengo
++Copyright:
++ 2006-2009 Andreas Schneider <mail at cynapses.org>
++ 2006 Alexander Neundorf <neundorf at kde.org>
++ 2006-2007  Wengo
 +License: BSD
-   On Debian systems, the complete text of the BSD License can be found
-   in `/usr/share/common-licenses/BSD'.
 +
- 
- Files: debian/*
- Copyright: 2009-2010, Michael Hanke <michael.hanke at gmail.com>
 +License: GPL-2+
-   On Debian systems the full text of the GNU General Public License can be found
-   in the `/usr/share/common-licenses/GPL' file.
++ 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 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.
++Comment: You should have received a copy of the GNU General Public License
++ along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ .
++ On Debian systems, the complete text of the GNU General
++ Public License can be found in `/usr/share/common-licenses/GPL-2'.
++
++License: BSD
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions
++ are met:
++ .
++ 1. Redistributions of source code must retain the copyright
++    notice, this list of conditions and the following disclaimer.
++ .
++ 2. Redistributions in binary form must reproduce the copyright
++    notice, this list of conditions and the following disclaimer in the
++    documentation and/or other materials provided with the distribution.
++ .
++ 3. The name of the author may not be used to endorse or promote products 
++    derived from this software without specific prior written permission.
++ .
++ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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..cec628c
new file mode 100644
--- /dev/null
+++ b/debian/gbp.conf
@@@ -1,0 -1,0 +1,2 @@@
++[DEFAULT]
++pristine-tar = True
diff --cc debian/patches/fix_76csx_screenshot
index 1ce2e72,0000000..96f0778
mode 100644,000000..100644
--- a/debian/patches/fix_76csx_screenshot
+++ b/debian/patches/fix_76csx_screenshot
@@@ -1,38 -1,0 +1,40 @@@
 +Description: Upstream changes introduced in version 0.3.4-1
 + This patch has been created by dpkg-source during the package build.
 + Here's the last changelog entry, hopefully it gives details on why
 + those changes were made:
 + .
 + garmindev (0.3.4-1) unstable; urgency=low
 + .
 +   * New upstream release. New API version.
 +   * Switch from CDBS to debhelper's dh. Bump compat level to 7.
 +   * Switch to source package format 3.0 (quilt).
 + .
 + The person named in the Author field signed this changelog entry.
 +Author: Michael Hanke <michael.hanke at gmail.com>
 +
 +---
 +The information above should follow the Patch Tagging Guidelines, please
 +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
 +are templates for supplementary fields that you might want to add:
 +
 +Origin: <vendor|upstream|other>, <url of original patch>
 +Bug: <url in upstream bugtracker>
 +Bug-Debian: http://bugs.debian.org/<bugnumber>
 +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
 +Forwarded: <no|not-needed|url proving that it has been forwarded>
 +Reviewed-By: <name and email of someone who approved the patch>
 +Last-Update: <YYYY-MM-DD>
 +
- --- garmindev-0.3.4.orig/src/GPSMap60CSx/loader.cpp
- +++ garmindev-0.3.4/src/GPSMap60CSx/loader.cpp
- @@ -62,6 +62,8 @@ extern "C" WIN_EXPORT Garmin::IDevice *
++Index: garmindev/src/GPSMap60CSx/loader.cpp
++===================================================================
++--- garmindev.orig/src/GPSMap60CSx/loader.cpp	2012-07-20 15:08:53.524744446 +0200
+++++ garmindev/src/GPSMap60CSx/loader.cpp	2012-07-20 15:12:36.181848541 +0200
++@@ -80,6 +80,8 @@
 +     GPSMap60CSx::device->devid          = 0x0124;
 +     GPSMap60CSx::device->screenwidth    = 160;
 +     GPSMap60CSx::device->screenheight   = 240;
 ++    GPSMap60CSx::device->screenhflip    = false;
 ++    GPSMap60CSx::device->screenvflip    = true;
 +     return GPSMap60CSx::device;
 + }
 + 
diff --cc debian/rules
index d0d0e72,0000000..b53118b
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,11 -1,0 +1,11 @@@
 +#!/usr/bin/make -f
 +
- export LDFLAGS = -Wl,--no-undefined
++#export LDFLAGS = -Wl,--no-undefined
 +
 +# one ring to rule them all ...
 +%:
 +	dh $@
 +
 +override_dh_auto_install:
 +	# install into temp dir to filter out plugins only
 +	dh_auto_install --destdir=$(CURDIR)/debian/tmp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/garmindev.git



More information about the Pkg-grass-devel mailing list