Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory vz-cvs-3.sog:/tmp/cvs-serv32492/stable/main/finkinfo/devel

Modified Files:
        automake1.11.info 
Added Files:
        automake1.11.patch 
Log Message:
fix selftest "FAIL: vala-vapi.test" (bug in test not in am)


Index: automake1.11.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/automake1.11.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- automake1.11.info   19 Sep 2012 01:27:46 -0000      1.8
+++ automake1.11.info   19 Sep 2012 07:07:45 -0000      1.9
@@ -10,8 +10,12 @@
 Replaces: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, automake1.12
 Provides: automaken
 
+PatchFile: %n.patch
+PatchFile-MD5: 22386c11a27201c9b4d05f13890a8898
 PatchScript: <<
   #!/bin/sh -ev
+  %{default_script}
+
   # Fix a test case
   /usr/bin/sed -i.orig -e 's|AC_FC_LIBRARY_LDFLAGS||g' 
tests/compile_f90_c_cxx.test
   # Disable one failing test: Fails because our install-info tries to create
@@ -73,6 +77,8 @@
 DescPackaging: <<
 Previous versions by Christoph Pfisterer, Max Horn.
 Desc adapted from debian :-)
+
+  Import patches from automake1.12 changes to vala-vapi.test
 <<
 License: GPL
 Maintainer: Chris Zubrzycki <bere...@users.sourceforge.net>

--- NEW FILE: automake1.11.patch ---
diff -Nurd -x'*~' automake-1.11.6.orig/tests/vala-vapi.test 
automake-1.11.6/tests/vala-vapi.test
--- automake-1.11.6.orig/tests/vala-vapi.test   2012-07-09 11:39:58.000000000 
-0400
+++ automake-1.11.6/tests/vala-vapi.test        2012-09-19 02:15:05.000000000 
-0400
@@ -42,7 +42,9 @@
 }
 END
 
-echo '#define BARBAR "Zardoz!\n"' > foo.h
+# Use printf, not echo, to avoid '\n' being considered and escape
+# sequence and printed as a newline in 'foo.h'.
+printf '%s\n' '#define BARBAR "Zardoz!\n"' > foo.h
 
 cat > foo.vapi <<'END'
 [CCode (cprefix="", lower_case_cprefix="", cheader_filename="foo.h")]
@@ -76,7 +78,9 @@
 
 # Simple check on remake rules.
 $sleep
-echo '#define BAZBAZ "Quux!\n"' > foo.h
+# Use printf, not echo, to avoid '\n' being considered and escape
+# sequence and printed as a newline in 'foo.h'.
+printf '%s\n' '#define BAZBAZ "Quux!\n"' > foo.h
 sed 's/BARBAR/BAZBAZ/' zardoz.vala > t && mv -f t zardoz.vala || Exit 99
 $MAKE && Exit 1
 sed 's/BARBAR/BAZBAZ/' foo.vapi > t && mv -f t foo.vapi || Exit 99


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to