[Pkg-mpd-commits] [pkg-mpc] 05/10: Switch build from autotools to meson

[Florian Schlichting]

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

fsfs pushed a commit to branch master
in repository pkg-mpc.

commit f2789cce429ca30deec4abe6c3926970cf7b3c50
Author: Florian Schlichting <fsfs at debian.org>
Date:   Mon Feb 12 21:05:54 2018 +0100

    Switch build from autotools to meson
---
 debian/control                        |  4 ++--
 debian/patches/Makefile.am.patch      | 17 -----------------
 debian/patches/check-m4-subunit.patch | 19 -------------------
 debian/patches/series                 |  2 --
 debian/rules                          | 12 +-----------
 5 files changed, 3 insertions(+), 51 deletions(-)

diff --git a/debian/control b/debian/control
index 56d2a41..b24dbfb 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,12 @@ Uploaders: Florian Schlichting <fsfs at debian.org>
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-mpd/pkg-mpc.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-mpd/pkg-mpc.git
 Homepage: https://www.musicpd.org/clients/mpc/
-Build-Depends: autoconf-archive,
- bash-completion,
+Build-Depends: bash-completion,
  check,
  debhelper (>= 9),
  dh-autoreconf,
  libmpdclient-dev (>= 2.9),
+ meson,
  pkg-config
 Standards-Version: 3.9.8
 
diff --git a/debian/patches/Makefile.am.patch b/debian/patches/Makefile.am.patch
deleted file mode 100644
index 9e59c9d..0000000
--- a/debian/patches/Makefile.am.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: prevent automake from installing doc/* files in wrong location
- It puts them all into /usr/share/doc/mpc/; dh can do better.
-Author: Florian Schlichting <fsfs at debian.org>
-Forwarded: not-needed
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,9 +2,6 @@
- AUTOMAKE_OPTIONS = foreign 1.11 dist-xz subdir-objects
- 
- man_MANS = doc/mpc.1
--doc_DATA = AUTHORS COPYING NEWS README \
--	doc/mpd-m3u-handler.sh doc/mpd-pls-handler.sh doc/mppledit \
--	doc/mpc-completion.bash
- EXTRA_DIST = $(man_MANS) $(doc_DATA)
- 
- bin_PROGRAMS = src/mpc
diff --git a/debian/patches/check-m4-subunit.patch b/debian/patches/check-m4-subunit.patch
deleted file mode 100644
index 5c808f9..0000000
--- a/debian/patches/check-m4-subunit.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: also link against libsubunit
- check 0.10.0-1 enabled subunit without updating the deprecated
- AM_PATH_CHECK macro. This is a minimal fix for Debian, but the check
- maintainers seem to advocate switching to PKG_CHECK_MODULES (see
- #646093).
-Author: Florian Schlichting <fsfs at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798279
-
---- a/m4/check.m4
-+++ b/m4/check.m4
-@@ -22,7 +22,7 @@
-       CHECK_LIBS="-L$with_check/lib -lcheck"
-     else
-       CHECK_CFLAGS=""
--      CHECK_LIBS="-lcheck"
-+      CHECK_LIBS="-lcheck -lsubunit"
-     fi
- 
-     ac_save_CFLAGS="$CFLAGS"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index eda4bc6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-check-m4-subunit.patch
-Makefile.am.patch
diff --git a/debian/rules b/debian/rules
index 737bc5a..fe184c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,18 +3,8 @@
 %:
 	dh $@ --with autoreconf --with bash-completion
 
-# uncomment as needed for user customization:
-
-#DEB_CONFIGURE_USER_FLAGS += --disable-iconv  #  disable iconv support
-
-# Use as host when MPD_HOST environment variable is not set
-#DEB_CONFIGURE_USER_FLAGS += --with-default-host=HOST
-
-# Use as port when MPD_PORT environment variable is not set
-#DEB_CONFIGURE_USER_FLAGS += --with-default-port=PORT
-
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-test $(DEB_CONFIGURE_USER_FLAGS)
+	dh_auto_configure -- -Dtest=true
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS

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