[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r6376 - in glibc-package/trunk/debian: . rules.d



Author: adconrad
Date: 2015-03-13 20:14:08 +0000 (Fri, 13 Mar 2015)
New Revision: 6376

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
debian/rules.d/debhelper.mk: Unconditionally create tmp.substvars.

Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2015-03-12 22:11:47 UTC (rev 6375)
+++ glibc-package/trunk/debian/changelog	2015-03-13 20:14:08 UTC (rev 6376)
@@ -1,6 +1,7 @@
 glibc (2.19-17) UNRELEASED; urgency=medium
 
-  * 
+  [ Adam Conrad ]
+  * debian/rules.d/debhelper.mk: Unconditionally create tmp.substvars.
 
  -- Aurelien Jarno <aurel32@debian.org>  Thu, 12 Mar 2015 23:11:38 +0100
 

Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk	2015-03-12 22:11:47 UTC (rev 6375)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk	2015-03-13 20:14:08 UTC (rev 6376)
@@ -178,8 +178,9 @@
 	perl -i -pe 'BEGIN {undef $$/; open(IN, "debian/tmp-libc/usr/share/i18n/SUPPORTED"); $$j=<IN>;} s/__PROVIDED_LOCALES__/$$j/g;' debian/locales.config debian/locales.postinst
 
 	# Generate common substvars files.
+	: > tmp.substvars
 ifeq ($(filter stage2,$(DEB_BUILD_PROFILES)),)
-	echo 'libgcc:Depends=libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]' > tmp.substvars
+	echo 'libgcc:Depends=libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]' >> tmp.substvars
 endif
 
 	for pkg in $(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES) $(DEB_UDEB_PACKAGES); do \


Reply to: