r52854 - in /desktop/unstable/pango1.0/debian: changelog control control.in libpango1.0-doc.install rules

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Sat Aug 19 13:57:43 2017
New Revision: 52854

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52854
Log:
Revert to building with autotools. See https://bugzilla.gnome.org/786494

Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/control
    desktop/unstable/pango1.0/debian/control.in
    desktop/unstable/pango1.0/debian/libpango1.0-doc.install
    desktop/unstable/pango1.0/debian/rules

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=52854&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog	[utf-8] Sat Aug 19 13:57:43 2017
@@ -1,7 +1,6 @@
 pango1.0 (1.40.10-1) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * Build with meson.
   * Bump Standards-Version to 4.0.1.
   * Add fix-sentence-break-function.patch:
     - Fix regression caught by gtk3 build tests (LP: #1709225)

Modified: desktop/unstable/pango1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control?rev=52854&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control	[utf-8] Sat Aug 19 13:57:43 2017
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 10.3),
+Build-Depends: debhelper (>= 10),
                dpkg-dev (>= 1.17.14),
                fonts-cantarell <!nocheck>,
                gnome-pkg-tools (>= 0.11),
@@ -25,7 +25,6 @@
                libxft-dev (>= 2.1.14-2),
                libxrender-dev (>= 1:0.9.0.2-2),
                libxt-dev,
-               meson (>= 0.40.1),
                perl,
                pkg-config
 Build-Depends-Indep: libglib2.0-doc

Modified: desktop/unstable/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control.in?rev=52854&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control.in	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control.in	[utf-8] Sat Aug 19 13:57:43 2017
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 10.3),
+Build-Depends: debhelper (>= 10),
                dpkg-dev (>= 1.17.14),
                fonts-cantarell <!nocheck>,
                gnome-pkg-tools (>= 0.11),
@@ -21,7 +21,6 @@
                libxft-dev (>= 2.1.14-2),
                libxrender-dev (>= 1:0.9.0.2-2),
                libxt-dev,
-               meson (>= 0.40.1),
                perl,
                pkg-config
 Build-Depends-Indep: libglib2.0-doc

Modified: desktop/unstable/pango1.0/debian/libpango1.0-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/libpango1.0-doc.install?rev=52854&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/libpango1.0-doc.install	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/libpango1.0-doc.install	[utf-8] Sat Aug 19 13:57:43 2017
@@ -1 +1 @@
-usr/share/gtk-doc/html/pango usr/share/doc/libpango1.0-doc
+usr/share/doc/libpango1.0-doc/pango/

Modified: desktop/unstable/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/rules?rev=52854&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/rules	[utf-8] Sat Aug 19 13:57:43 2017
@@ -9,14 +9,17 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with gnome,gir --buildsystem=meson --without autoreconf
+	dh $@ --with gnome,gir
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--libexecdir=/usr/lib/pango1.0 \
-		-Denable_docs=true
+		--libexecdir=\$${prefix}/lib/pango1.0 \
+		--with-html-dir=\$${prefix}/share/doc/libpango1.0-doc \
+		--enable-installed-tests \
+		--enable-static
 
 override_dh_install:
+	find debian -name '*.a' -delete
 	dh_install -X.la --fail-missing
 
 override_dh_makeshlibs: