[Git][debian-gis-team/osm-gps-map][master] 4 commits: Drop explicit build dependencies on libtool & automake.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / osm-gps-map


Commits:
53110f2e by Bas Couwenberg at 2020-04-29T12:44:38+02:00
Drop explicit build dependencies on libtool & automake.

- - - - -
d2b87673 by Bas Couwenberg at 2020-04-29T12:45:32+02:00
Reorder build dependencies.

- - - - -
65217fe1 by Bas Couwenberg at 2020-04-29T12:46:33+02:00
Don't use d-shlibmove.

- - - - -
b58c7bb0 by Bas Couwenberg at 2020-04-29T12:47:24+02:00
Set distribution to unstable.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/libosmgpsmap-1.0-1.install
- debian/libosmgpsmap-1.0-dev.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,13 +1,17 @@
-osm-gps-map (1.1.0-7) UNRELEASED; urgency=medium
+osm-gps-map (1.1.0-7) unstable; urgency=medium
 
+  * Team upload.
   * Bump Standards-Version to 4.5.0, no changes.
   * Drop Name field from upstream metadata.
   * Bump debhelper compat to 10, changes:
     - Drop --parallel option, enabled by default
     - Don't explicitly enable autoreconf, enabled by default
     - Drop dh-autoreconf build dependency
+  * Drop explicit build dependencies on libtool & automake.
+  * Reorder build dependencies.
+  * Don't use d-shlibmove.
 
- -- Bas Couwenberg <sebastic at debian.org>  Mon, 30 Sep 2019 19:36:43 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 29 Apr 2020 12:47:06 +0200
 
 osm-gps-map (1.1.0-6) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -6,17 +6,14 @@ Uploaders: David Paleino <dapal at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 10~),
-               libtool,
-               automake,
-               d-shlibs,
-               libgtk-3-dev,
-               libgirepository1.0-dev,
-               libglib2.0-dev,
-               libsoup2.4-dev,
-               libcairo2-dev,
                gnome-common,
+               gobject-introspection,
                gtk-doc-tools,
-               gobject-introspection
+               libcairo2-dev,
+               libgirepository1.0-dev,
+               libglib2.0-dev,
+               libgtk-3-dev,
+               libsoup2.4-dev
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/osm-gps-map
 Vcs-Git: https://salsa.debian.org/debian-gis-team/osm-gps-map.git
@@ -27,7 +24,10 @@ Architecture: any
 Section: libdevel
 Depends: libosmgpsmap-1.0-1 (= ${binary:Version}),
          gir1.2-osmgpsmap-1.0 (= ${binary:Version}),
-         ${devlibs:Depends},
+         libcairo2-dev,
+         libglib2.0-dev,
+         libgtk-3-dev,
+         libsoup2.4-dev,
          ${misc:Depends}
 Breaks: gir1.2-osmgpsmap-1.0 (<< 1.1.0-2~)
 Conflicts: libosmgpsmap-1.0-0-dev


=====================================
debian/libosmgpsmap-1.0-1.install
=====================================
@@ -0,0 +1 @@
+usr/lib/*/*.so.*


=====================================
debian/libosmgpsmap-1.0-dev.install
=====================================
@@ -1,3 +1,6 @@
 debian/tmp/usr/share/gtk-doc/html/libosmgpsmap/*
+usr/include/*
+usr/lib/*/*.a
+usr/lib/*/*.so
 usr/lib/*/pkgconfig/*
 usr/share/gir-*/*


=====================================
debian/rules
=====================================
@@ -25,17 +25,6 @@ override_dh_auto_configure:
 override_dh_install:
 	find debian/tmp -name '*.la' -delete
 
-	d-shlibmove --commit \
-		    --multiarch \
-		    --override s/libgtk-3-0-dev/libgtk-3-dev/ \
-		    --override s/libsoup-2.4-1-dev/libsoup2.4-dev/ \
-		    --override s/libcairo-gobject2-dev/libcairo2-dev/ \
-		    --override s/libfribidi0-dev/libfribidi-dev/ \
-		    --override s/libgdk-3-0-dev/libgtk-3-dev/ \
-		    --movedev debian/tmp/usr/include/* usr/include \
-		    --devunversioned \
-		    debian/tmp/usr/lib/*/lib*.so
-
 	# Explicitly remove files not included in any package
 	$(RM) debian/tmp/usr/share/doc/osm-gps-map/AUTHORS
 	$(RM) debian/tmp/usr/share/doc/osm-gps-map/ChangeLog



View it on GitLab: https://salsa.debian.org/debian-gis-team/osm-gps-map/-/compare/512bf19e6c0ea913d2746bc33a262504f36001ec...b58c7bb0ddfa46a6d0ddc6975fd225ca813ba844

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osm-gps-map/-/compare/512bf19e6c0ea913d2746bc33a262504f36001ec...b58c7bb0ddfa46a6d0ddc6975fd225ca813ba844
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/20200429/36c237da/attachment-0001.html>