[Git][debian-gis-team/opencpn][master] 7 commits: Restructure control file with cme.

Bas Couwenberg gitlab at salsa.debian.org
Sun Dec 8 10:56:20 GMT 2019



Bas Couwenberg pushed to branch master at Debian GIS Project / opencpn


Commits:
64021358 by Bas Couwenberg at 2019-12-08T10:15:13Z
Restructure control file with cme.

- - - - -
fdafe576 by Bas Couwenberg at 2019-12-08T10:15:40Z
Close bug in changelog.

- - - - -
4b565802 by Bas Couwenberg at 2019-12-08T10:31:11Z
Change libgtk2.0-dev build dependency to libgtk-3-dev.

- - - - -
d7e49528 by Bas Couwenberg at 2019-12-08T10:38:57Z
Update watch file to handle common issues.

- - - - -
104c9f80 by Bas Couwenberg at 2019-12-08T10:39:21Z
Rename install file to opencpn.install.

- - - - -
812e9b08 by Bas Couwenberg at 2019-12-08T10:41:27Z
Drop obsolete include-binaries file.

- - - - -
4050ebe2 by Bas Couwenberg at 2019-12-08T10:42:49Z
Fix typo in lintian override comment.

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/install → debian/opencpn.install
- − debian/source/include-binaries
- debian/source/lintian-overrides
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,9 @@
 opencpn (5.0.0+dfsg.1-1) unstable; urgency=medium
 
+  [ Alec Leamas ]
   * New upstream release
   * Move to gtk3
+    (closes: #946018)
   * Drop all patches besides two after being upstreamed
   * Drop some lintian overrides after upstream fixes.
   * Add a patch for broken include paths.
@@ -12,6 +14,14 @@ opencpn (5.0.0+dfsg.1-1) unstable; urgency=medium
   * Bump Standards-Version to 4.4.1, no changes.
   * Move to compat level 12.
 
+  [ Bas Couwenberg ]
+  * Restructure control file with cme.
+  * Change libgtk2.0-dev build dependency to libgtk-3-dev.
+  * Update watch file to handle common issues.
+  * Rename install file to opencpn.install.
+  * Drop obsolete include-binaries file.
+  * Fix typo in lintian override comment.
+
  -- Alec Leamas <leamas.alec at gmail.com>  Tue, 19 Nov 2019 08:49:56 -0500
 
 opencpn (4.8.8+dfsg.2-1) unstable; urgency=medium


=====================================
debian/control
=====================================
@@ -4,35 +4,35 @@ Uploaders: Alec Leamas <leamas.alec at gmail.com>
 Section: misc
 Priority: optional
 Build-Depends: debhelper (>= 12),
- cmake,
- libarchive-dev,
- libbz2-dev,
- libcurl4-gnutls-dev,
- libelf-dev,
- libexif-dev,
- libgdk-pixbuf2.0-dev,
- libgtk2.0-dev,
- liblz4-dev,
- liblzma-dev,
- libpango1.0-dev,
- libsqlite3-dev,
- libtinyxml-dev,
- libunarr-dev,
- libwxsvg-dev (>=  2:1.5.21),
- libwxgtk3.0-gtk3-dev,
- portaudio19-dev
+               cmake,
+               libarchive-dev,
+               libbz2-dev,
+               libcurl4-gnutls-dev,
+               libelf-dev,
+               libexif-dev,
+               libgdk-pixbuf2.0-dev,
+               libgtk-3-dev,
+               liblz4-dev,
+               liblzma-dev,
+               libpango1.0-dev,
+               libsqlite3-dev,
+               libtinyxml-dev,
+               libunarr-dev,
+               libwxgtk3.0-gtk3-dev,
+               libwxsvg-dev (>= 2:1.5.21),
+               portaudio19-dev
 Standards-Version: 4.4.1
-Homepage: https://opencpn.org
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/opencpn
 Vcs-Git: https://salsa.debian.org/debian-gis-team/opencpn.git
+Homepage: https://opencpn.org
 
 Package: opencpn
 Architecture: any
-Depends:
- opencpn-data (= ${source:Version}),
- bzip2,
- wx3.0-i18n,
- ${shlibs:Depends}, ${misc:Depends}
+Depends: opencpn-data (>= ${source:Version}),
+         bzip2,
+         wx3.0-i18n,
+         ${shlibs:Depends},
+         ${misc:Depends}
 Breaks: opencpn-plugins (<< 4.8.6~20180801.8d20a06+dfsg.1)
 Replaces: opencpn-plugins (<< 4.8.6~20180801.8d20a06+dfsg.1)
 Suggests: binutils
@@ -63,6 +63,7 @@ Description: Open Source Chartplotter and Marine GPS Navigation Software (data)
 
 Package: opencpn-plugins
 Architecture: all
-Depends: opencpn (>= 4.8.6~20180801.8d20a06+dfsg.1), ${misc:Depends}
+Depends: opencpn (>= ${source:Version}),
+         ${misc:Depends}
 Description: Open Source Chartplotter and Marine GPS Navigation Software (transition)
  This package is a transitional, empty package.


=====================================
debian/install → debian/opencpn.install
=====================================


=====================================
debian/source/include-binaries deleted
=====================================
@@ -1 +0,0 @@
-debian/patches/0008-Add-appdata-metafile-gnome-software-support.patch


=====================================
debian/source/lintian-overrides
=====================================
@@ -1,4 +1,4 @@
-# Package does not define a testsuit.
+# Package does not define a testsuite.
 testsuite-autopkgtest-missing
 
 # Used to work around #831870


=====================================
debian/watch
=====================================
@@ -1,20 +1,8 @@
 version=4
-
-#
-# Using git tag (see #1132, upstream does not always tag...)
-#
-
-opts="repacksuffix=+dfsg.1,dversionmangle=s/\+dfsg.[0-9]$//,\
-  filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%opencpn-$1.tar.gz%" \
-    https://github.com/OpenCPN/OpenCPN/tags \
-    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
-
-
-
-# Pre/post-release git snapshots
-#
-# opts="mode=git,pretty=0~%cd.%h,\
-#     dversionmangle=s/\+dfsg.[0-9]$//,repacksuffix=+dfsg.1" \
-#         https://github.com/OpenCPN/OpenCPN.git HEAD
-
-
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\.?\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;,\
+filenamemangle=s/(?:.*?\/)?(?:rel|v|opencpn)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/opencpn-$1.$2/,\
+repacksuffix=+dfsg \
+https://github.com/OpenCPN/OpenCPN/releases \
+(?:.*?/archive/)?(?:rel|v|opencpn)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))



View it on GitLab: https://salsa.debian.org/debian-gis-team/opencpn/compare/f71fd3b2a6445499e3196756c91ab654d4769f60...4050ebe2cd1cb1a5fcb5bf150aaf9f7bd156eb9a

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/opencpn/compare/f71fd3b2a6445499e3196756c91ab654d4769f60...4050ebe2cd1cb1a5fcb5bf150aaf9f7bd156eb9a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20191208/6cb0a0be/attachment-0001.html>


More information about the Pkg-grass-devel mailing list