diff -Nru culmus-0.121/debian/changelog culmus-0.121/debian/changelog
--- culmus-0.121/debian/changelog	2012-01-31 22:59:08.000000000 +0100
+++ culmus-0.121/debian/changelog	2012-10-24 15:21:33.000000000 +0200
@@ -1,3 +1,9 @@
+culmus (0.121-1ubuntu1) quantal-proposed; urgency=low
+
+  * Fix incorrect syntax for disjunction in fontconfig .conf file (LP: #1034928)
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Wed, 24 Oct 2012 15:20:46 +0200
+
 culmus (0.121-1) unstable; urgency=low
 
   * New upstream release
diff -Nru culmus-0.121/debian/control culmus-0.121/debian/control
--- culmus-0.121/debian/control	2012-01-31 22:53:02.000000000 +0100
+++ culmus-0.121/debian/control	2012-10-24 15:21:45.000000000 +0200
@@ -1,7 +1,8 @@
 Source: culmus
 Section: fonts
 Priority: optional
-Maintainer: Debian Hebrew Packaging Team <debian-hebrew-package@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Hebrew Packaging Team <debian-hebrew-package@lists.alioth.debian.org>
 Uploaders: Baruch Even <baruch@debian.org>, Lior Kaplan <kaplan@debian.org>, Shachar Shemesh <shachar@debian.org>, Tzafrir Cohen <tzafrir@debian.org>
 Build-Depends: debhelper (>= 5.0.35)
 Standards-Version: 3.9.2
diff -Nru culmus-0.121/debian/patches/series culmus-0.121/debian/patches/series
--- culmus-0.121/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ culmus-0.121/debian/patches/series	2012-10-24 15:13:39.000000000 +0200
@@ -0,0 +1 @@
+single_alias_test_tags.patch
diff -Nru culmus-0.121/debian/patches/single_alias_test_tags.patch culmus-0.121/debian/patches/single_alias_test_tags.patch
--- culmus-0.121/debian/patches/single_alias_test_tags.patch	1970-01-01 01:00:00.000000000 +0100
+++ culmus-0.121/debian/patches/single_alias_test_tags.patch	2012-10-24 15:20:41.000000000 +0200
@@ -0,0 +1,191 @@
+Description: Fix incorrect syntax for disjunction in fontconfig .conf file.
+Author: Benjamin Drung <bdrung@ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/1034928
+
+--- culmus-0.121.orig/culmus.conf
++++ culmus-0.121/culmus.conf
+@@ -8,6 +8,16 @@
+ 	<match target="pattern" >
+ 		<test name="family" >
+ 			<string>Guttman Adii</string>
++		</test>
++		<edit mode="append" binding="same" name="family" >
++			<string>David CLM</string>
++		</edit>
++		<edit mode="assign" binding="same" name="slant" >
++			<const>italic</const>
++		</edit>
++	</match>
++	<match target="pattern" >
++		<test name="family" >
+ 			<string>Guttman Adii-Light</string>
+ 		</test>
+ 		<edit mode="append" binding="same" name="family" >
+@@ -30,6 +40,13 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Guttman Stam</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Stam Ashkenaz CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Stam1</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -40,6 +57,13 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Guttman Hodes</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Hadasim CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Monotype Hadassah</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -50,7 +74,21 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Aharoni</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Aharoni CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Aharoni</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Aharoni CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman-Aharoni</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -61,7 +99,21 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>FrankRuehl</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Frank Ruehl CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Frank</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Frank Ruehl CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Frnew</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -72,7 +124,21 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>David</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>David CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>David Transparent</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>David CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman David</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -83,8 +149,29 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Fixed Miriam Transparent</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam Mono CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Myamfix</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam Mono CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman-CourMir</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam Mono CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Miriam Fixed</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -95,8 +182,29 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Guttman Miryam</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Levenim MT</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Miriam</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Miriam CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Miriam Transparent</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >
+@@ -107,6 +215,13 @@
+         <match target="pattern" >
+                 <test name="family" >
+                         <string>Guttman Drogolin</string>
++                </test>
++                <edit mode="append" binding="same" name="family" >
++                        <string>Drugulin CLM</string>
++                </edit>
++        </match>
++        <match target="pattern" >
++                <test name="family" >
+                         <string>Guttman Vilna</string>
+                 </test>
+                 <edit mode="append" binding="same" name="family" >