[Pkg-gnutls-commits] r1879 - in /packages/gnutls28/trunk/debian: rules source/options

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sat Aug 24 12:38:33 2013
New Revision: 1879

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1879
Log:
Fix building twicee in a row.

Added:
    packages/gnutls28/trunk/debian/source/options
Modified:
    packages/gnutls28/trunk/debian/rules

Modified: packages/gnutls28/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/rules?rev=1879&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/rules	(original)
+++ packages/gnutls28/trunk/debian/rules	Sat Aug 24 12:38:33 2013
@@ -5,7 +5,8 @@
 export DEB_CXXFLAGS_MAINT_APPEND := -Wall
 
 AMCONFBUILDINDEP := $(shell if dh_listpackages | grep -q gnutls-doc ; \
-	then echo "--enable-gtk-doc" ; else echo "--disable-gtk-doc"; fi)
+	then echo "--enable-gtk-doc" ; \
+	else echo "--disable-gtk-doc --disable-doc"; fi)
 AMCONFBUILDGUILE := $(shell if dh_listpackages | grep -q guile-gnutls ; \
 	then \
 	echo " --enable-guile --with-guile-site-dir=/usr/share/guile/site" ;\
@@ -45,7 +46,9 @@
 		t=`basename $$i .c` ;\
 		rm -v $$i src/$$t.h;\
 		done
-	rm -fv `grep -l 'has been AutoGen-ed ' doc/manpages/*.?` 
+	rm -fv `grep -l 'has been AutoGen-ed ' doc/manpages/*.?`
+	rm -f config.h config.log config.status lib/includes/gnutls/gnutls.h \
+		lib/gnutls.pc libdane/gnutls-dane.pc libtool stamp*
 
 override_dh_auto_build-indep:
 	$(MAKE) html
@@ -66,6 +69,7 @@
 				usr/share/info/ ; \
 		done ; \
 	fi
+	# See #658110
 	if [ "" != `ls debian/guile-gnutls/usr/lib/*/guile` ] ; then \
 	mv -v debian/guile-gnutls/usr/lib/*/guile debian/guile-gnutls/usr/lib \
 		&&\

Added: packages/gnutls28/trunk/debian/source/options
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/source/options?rev=1879&op=file
==============================================================================
--- packages/gnutls28/trunk/debian/source/options	(added)
+++ packages/gnutls28/trunk/debian/source/options	Sat Aug 24 12:38:33 2013
@@ -0,0 +1,2 @@
+# Don't store changes on autogenerated files
+extend-diff-ignore = "doc/.*\.(html|info.*)$|Makefile|doc/reference/version.xml|"