r54492 - in /desktop/experimental/gtk+4.0/debian: changelog control control.in rules

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Thu Oct 19 01:04:17 2017
New Revision: 54492

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54492
Log:
Switch to meson

Modified:
    desktop/experimental/gtk+4.0/debian/changelog
    desktop/experimental/gtk+4.0/debian/control
    desktop/experimental/gtk+4.0/debian/control.in
    desktop/experimental/gtk+4.0/debian/rules

Modified: desktop/experimental/gtk+4.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/changelog?rev=54492&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/changelog	[utf-8] Thu Oct 19 01:04:17 2017
@@ -1,6 +1,7 @@
 gtk+4.0 (3.92.1-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Switch to meson
 
  -- Jeremy Bicha <jbicha at debian.org>  Wed, 18 Oct 2017 18:07:11 -0400
 

Modified: desktop/experimental/gtk+4.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/control?rev=54492&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/control	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/control	[utf-8] Thu Oct 19 01:04:17 2017
@@ -2,12 +2,13 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>, Jeremy Bicha <jbicha at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 10.3~),
                gnome-pkg-tools (>= 0.11),
                dpkg-dev (>= 1.17.14),
                autoconf-archive,
                gtk-doc-tools (>= 1.26),
+               meson (>= 0.42.1),
                pkg-config,
                dbus <!nocheck>,
                gsettings-desktop-schemas <!nocheck>,

Modified: desktop/experimental/gtk+4.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/control.in?rev=54492&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/control.in	[utf-8] Thu Oct 19 01:04:17 2017
@@ -8,6 +8,7 @@
                dpkg-dev (>= 1.17.14),
                autoconf-archive,
                gtk-doc-tools (>= 1.26),
+               meson (>= 0.42.1),
                pkg-config,
                dbus <!nocheck>,
                gsettings-desktop-schemas <!nocheck>,

Modified: desktop/experimental/gtk+4.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/rules?rev=54492&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/rules	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/rules	[utf-8] Thu Oct 19 01:04:17 2017
@@ -91,48 +91,42 @@
 
 configure_flags_common = \
 	--libdir=/$(LIBDIR) \
-	--enable-test-print-backend
+	-Denable-test-print-backend=yes
 
 configure_flags_deb = \
-	--enable-broadway-backend \
-	--enable-x11-backend \
-	--enable-gtk-doc \
-	--enable-man \
-	--enable-shared \
-	--enable-introspection \
-	--enable-cloudprint \
-	--disable-static
+	-Denable-broadway-backend=true \
+	-Denable-x11-backend=true \
+	-Ddocumentation=true \
+	-Dman-pages=true \
+	-Dintrospection=true \
+	-Denable-cloudprint-print-backend=yes
 
 ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
-configure_flags_deb += --enable-colord
+configure_flags_deb += -Denable-colord=yes
 else
-configure_flags_deb += --disable-colord
+configure_flags_deb += -Denable-colord=no
 endif
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))
-configure_flags_deb += --enable-wayland-backend
+configure_flags_deb += -Denable-wayland-backend=true
 else
-configure_flags_deb += --disable-wayland-backend
+configure_flags_deb += -Denable-wayland-backend=true
 endif
 
 ifeq ($(filter %-doc,$(binaries)),)
-configure_flags_deb += --disable-gtk-doc --disable-man
+configure_flags_deb += -Ddocumentation=no -Dman-pages=no
 endif
 
 configure_flags_udeb = \
-	--disable-broadway-backend \
-	--disable-wayland-backend \
-	--enable-x11-backend \
-	--disable-introspection \
-	--disable-cloudprint \
-	--disable-colord \
-	--disable-xcomposite \
-	--disable-xdamage \
-	--disable-xfixes \
-	--disable-xrandr
+	-Denable-broadway-backend=false \
+	-Denable-wayland-backend=false \
+	-Denable-x11-backend=true \
+	-Dintrospection=true \
+	-Denable-cloudprint-print-backend=no \
+	-Dcolord=no
 
 %:
-	dh $@ --with gir
+	dh $@ --with gir --buildsystem=meson
 
 override_dh_clean: debian/control
 	# gross kludge to force control generation with the %.in target
@@ -144,9 +138,6 @@
 
 # Add dependencies to generate files from the debian/*.in ones
 override_dh_auto_build: $(call dh_subst_files,$(binaries))
-
-override_dh_autoreconf:
-	dh_autoreconf "NOCONFIGURE=true ./autogen.sh"
 
 override_dh_auto_configure: debian/control
 	dh_auto_configure \