@@ -28,10 +28,10 @@
 
 grob properties, top 50 rounded to 10
 
-TOTAL                         :  70960
+TOTAL                         :  70950
 note-heads                    :  17550
 staff-symbol                  :  12030
-elements                      :   8710
+elements                      :   8700
 pure-Y-common                 :   7240
 X-common                      :   6620
 beam                          :   1850

HEAD is:

	
115c203a8bb962bd1de51460fb6d115b03bc526a Bump fontforge to 20071210.




diff --git a/gub/loggedos.py b/gub/loggedos.py
index 429ed7b..cdd4b07 100644
--- a/gub/loggedos.py
+++ b/gub/loggedos.py
@@ -12,7 +12,8 @@ def system (logger, cmd, env=os.environ, ignore_errors=False):
                              stderr=subprocess.STDOUT,
                              close_fds=True)
 
-    if 0:
+    if 1:
+
         # Although this looks nice, it still delays or eats log entries.
         # Output (from stdout?) is not immediately available, in case of
         # cron-builder's make bootstrap eg, we see in log/cron-builder.log
diff --git a/gub/repository.py b/gub/repository.py
index 7743378..ceab847 100644
--- a/gub/repository.py
+++ b/gub/repository.py
@@ -556,6 +556,7 @@ class Git (Repository):
             self.git ('update-ref refs/heads/master %(revision)s' % locals (),
                       dir=destdir)
             self.git ('checkout master', dir=destdir)
+            self.git ('reset --hard', dir=destdir)
 
     def get_diff_from_tag (self, tag):
         return self.git_pipe ('diff %(tag)s HEAD' % locals ())
diff --git a/patches/fontforge-20060501-execprefix.patch b/patches/fontforge-200
index 4952424..8839e8e 100644
--- a/patches/fontforge-20060501-execprefix.patch
+++ b/patches/fontforge-20060501-execprefix.patch
@@ -16,13 +16,3 @@
  
  ../libgdraw.la: $(libgdraw_OBJECTS)
  	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) @LDFLAGS@ -o ../libgdraw.la $(libgdraw
---- fontforge-20060501/Unicode/Makefile.in~	Fri Sep 30 15:10:58 2005
-+++ fontforge-20060501/Unicode/Makefile.in	Wed May  3 10:15:24 2006
-@@ -2,6 +2,7 @@
- top_builddir = ..
- libdir = @libdir@
- VPATH = @srcdir@
-+exec_prefix = @exec_prefix@
- prefix = @prefix@
- bindir = @bindir@
- 
diff --git a/test-lily/dist-check.py b/test-lily/dist-check.py
index bb9992a..4a175fc 100644
--- a/test-lily/dist-check.py
+++ b/test-lily/dist-check.py
@@ -41,9 +41,6 @@ def parse_options ():
     o.repository = os.path.abspath (o.repository)
     return (o, a)
 
-def check_cvs ():
-    pass
-
 def system (s):
     print s
     if os.system (s):
@@ -102,8 +99,8 @@ def check_files (tarball, repo):
             continue
 
         filename = os.path.join (tarball_dirname, filename)
-        if not file_dict.has_key (filename):
-            print ('file from CVS not distributed: %s' % filename)
+        if filename not in file_dict:
+            print ('file from VC not distributed: %s' % filename)
             error_found = True
 
     system ('rm -rf %(dir)s' % locals ())

HEAD is:

	
6b001d171cd88c54af15ef4bb92ea38bc270128f After doing a pull, do a git-reset --ha




diff --git a/gub/loggedos.py b/gub/loggedos.py
index 429ed7b..cdd4b07 100644
--- a/gub/loggedos.py
+++ b/gub/loggedos.py
@@ -12,7 +12,8 @@ def system (logger, cmd, env=os.environ, ignore_errors=False):
                              stderr=subprocess.STDOUT,
                              close_fds=True)
 
-    if 0:
+    if 1:
+
         # Although this looks nice, it still delays or eats log entries.
         # Output (from stdout?) is not immediately available, in case of
         # cron-builder's make bootstrap eg, we see in log/cron-builder.log
diff --git a/lilypond.make b/lilypond.make
index 9a726ef..ae26ae6 100644
--- a/lilypond.make
+++ b/lilypond.make
@@ -101,7 +101,7 @@ update-versions:
 	$(PYTHON) gub/with-lock.py --skip $(LILYPOND_VERSIONS).lock $(MAKE) unlocked-u
 
 download:
-	$(foreach p, $(PLATFORMS), $(call INVOKE_GUB,$(p)) --online --download-only li
+	$(foreach p, $(PLATFORMS), $(call INVOKE_GUB,$(p)) --online --download-only $(
 	$(MAKE) downloads/genini
 	rm -f target/*/status/lilypond*
 	rm -f log/lilypond-$(LILYPOND_VERSION)*.*.test.pdf
diff --git a/patches/fontforge-20060501-execprefix.patch b/patches/fontforge-200
index 4952424..8839e8e 100644
--- a/patches/fontforge-20060501-execprefix.patch
+++ b/patches/fontforge-20060501-execprefix.patch
@@ -16,13 +16,3 @@
  
  ../libgdraw.la: $(libgdraw_OBJECTS)
  	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) @LDFLAGS@ -o ../libgdraw.la $(libgdraw
---- fontforge-20060501/Unicode/Makefile.in~	Fri Sep 30 15:10:58 2005
-+++ fontforge-20060501/Unicode/Makefile.in	Wed May  3 10:15:24 2006
-@@ -2,6 +2,7 @@
- top_builddir = ..
- libdir = @libdir@
- VPATH = @srcdir@
-+exec_prefix = @exec_prefix@
- prefix = @prefix@
- bindir = @bindir@
- 
diff --git a/test-lily/test-binary.py b/test-lily/test-binary.py
old mode 100644
new mode 100755