r28614 - in /desktop/unstable/pango1.0/debian: changelog rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jun 23 16:07:05 2011
New Revision: 28614

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28614
Log:
* debian/rules:
  - Remove .gir files which are shipped in the dist tarball. Those files
    were generated for gir format 1.1 and cause build failures when
    srcdir != builddir.

Modified:
    desktop/unstable/pango1.0/debian/changelog
    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=28614&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog [utf-8] Thu Jun 23 16:07:05 2011
@@ -10,6 +10,10 @@
     - Bump Depends on libglib2.0-dev to (>= 2.24.0) for libpango1.0-dev.
     - Bump Standards-Version to 3.9.2. No further changes.
     - Update Vcs-* fields.
+  * debian/rules:
+    - Remove .gir files which are shipped in the dist tarball. Those files
+      were generated for gir format 1.1 and cause build failures when
+      srcdir != builddir.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 22 Jun 2011 23:57:52 +0200
 

Modified: desktop/unstable/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/rules?rev=28614&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/rules [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/rules [utf-8] Thu Jun 23 16:07:05 2011
@@ -5,6 +5,7 @@
 DEB_MAKE_FLAVORS = shared static udeb
 DISABLE_UPDATE_UPLOADERS = 1
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
@@ -91,6 +92,11 @@
 		-e 's#@GNOME_TEAM@#$(UPLOADERS)#g' \
 		$@.in >$@
 
+# Remove pre-generated .gir files from dist tarball
+# https://bugzilla.gnome.org/show_bug.cgi?id=653245
+pre-build::
+	rm -f pango/*.gir
+
 clean:: debian/control
 	# gross kludge to force control generation with the %.in target
 	touch debian/control.in