Merged with master.

debian/changelog

@@ -1,3 +1,13 @@
+wine-compholio (1.7.23) UNRELEASED; urgency=low
+  * Fix failing Junction Point test.
+  * Fix possible race conditions in strmbase/quartz.
+  * Fix race condition between EndOfStream and Pause.
+  * Return correct IMediaSeeking stream positions in quartz.
+  * Make sure LICENSE files are included in the Debian packages.
+  * Downgraded Arial replacement font to Liberation Sans v1.07.3.
+  * Remove relative Junction Point linking for now (breaks tests).
+ -- Erich E. Hoover <erich.e.hoover@gmail.com>  Tue, 22 Jul 2014 21:29:47 -0600
+
 wine-compholio (1.7.22) unstable; urgency=low
   * Implement passing ACLs to CreateProcess.
   * Removed several patches (accepted upstream).

debian/tools/patchupdate.py

@@ -265,7 +265,7 @@ def generate_makefile(patches, fp):
 README_template = """wine-compholio
 ==============
 
-The Wine \"Compholio\" Edition repository includes a variety of patches ") for
+The Wine \"Compholio\" Edition repository includes a variety of patches for
 Wine to run common Windows applications under Linux.
 
 These patches fix the following Wine bugs:

debian/wine-compholio.docs

@@ -1,4 +1,8 @@
 documentation/README.*
 ANNOUNCE
 AUTHORS
-README
+LICENSE
+LICENSE.wine-compholio
+LICENSE.Liberation
+LICENSE.LGPLv2.1
+README