diff -Nru libreoffice-3.6.1~rc2/debian/changelog libreoffice-3.6.1~rc2/debian/changelog
--- libreoffice-3.6.1~rc2/debian/changelog	2012-08-31 15:13:27.000000000 +0000
+++ libreoffice-3.6.1~rc2/debian/changelog	2012-09-01 03:18:30.000000000 +0000
@@ -1,3 +1,19 @@
+libreoffice (1:3.6.1~rc2-1ubuntu2) quantal-proposed; urgency=low
+
+  * test for ca-XV files before trying to use them
+    - ca-XV l10n files are special-cased in that they are merged in the ca l10n
+      packaged
+    - the libreoffice-l10n-* files are generated by gid2pkgdirs.sh
+    - for an binary-only, arch dep-only build ca-XV might be set in
+      LANGPACKISOS and HELPISOS, even though we do not pass such parameters to
+      ./autogen.sh and thus neither scp2 nor gid2pkgdirs.sh generate any l10n 
+      package files
+    - this wasnt discovered on the ppa builds because of ppa filesystem
+      limitations, we can only building with a subset of l10n (not ca-XV) there, 
+      thus shadowing the issue, even though we do binary-only, arch dep-only builds.
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Sat, 01 Sep 2012 02:19:11 +0200
+
 libreoffice (1:3.6.1~rc2-1ubuntu1) quantal-proposed; urgency=low
 
   * version bump for quantal main including upstream, debian and unitymenu
@@ -164,11 +180,8 @@
     - add ENABLE_HELP conditional now that we have --without-help; also
       add the new --disable-extensions and --disable-database-connectivity to
       their respective places
-<<<<<<< HEAD
-=======
     - split build into build-{arch,indep}
     - use generic python3.pc instead of pythonX.Y(mu).pc
->>>>>>> debian-experimental-3.6
   * debian/uno-libs3.symbols: update 
   * debian/libreoffice-common.links.in:
     - s/libreofficeoasis/libreoffice-oasis/, thanks Jakub Wilk
diff -Nru libreoffice-3.6.1~rc2/debian/rules libreoffice-3.6.1~rc2/debian/rules
--- libreoffice-3.6.1~rc2/debian/rules	2012-08-31 15:13:27.000000000 +0000
+++ libreoffice-3.6.1~rc2/debian/rules	2012-09-01 03:18:30.000000000 +0000
@@ -1740,13 +1740,13 @@
 
 	# and ca-XV in -ca...
 ifeq (ca-XV,$(findstring ca-XV,$(LANGPACKISOS)))
-	cat debian/libreoffice-l10n-ca-XV.dirs >> debian/libreoffice-l10n-ca.dirs
-	cat debian/libreoffice-l10n-ca-XV.install >> debian/libreoffice-l10n-ca.install
+	test -f debian/libreoffice-l10n-ca-VX.dirs && cat debian/libreoffice-l10n-ca-XV.dirs >> debian/libreoffice-l10n-ca.dirs || true
+	test -f debian/libreoffice-l10n-ca-VX.install && cat debian/libreoffice-l10n-ca-XV.install >> debian/libreoffice-l10n-ca.install || true
 	rm -f debian/libreoffice-l10n-ca-XV.dirs debian/libreoffice-l10n-ca-XV.install
 endif
 ifeq (ca-XV,$(findstring ca-XV,$(HELPISOS)))
-	cat debian/libreoffice-help-ca-XV.dirs >> debian/libreoffice-help-ca.dirs
-	cat debian/libreoffice-help-ca-XV.install >> debian/libreoffice-help-ca.install
+	test -f debian/libreoffice-help-ca-VX.dirs && cat debian/libreoffice-help-ca-XV.dirs >> debian/libreoffice-help-ca.dirs || true
+	test -f debian/libreoffice-help-ca-VX.install && debian/libreoffice-help-ca-XV.install >> debian/libreoffice-help-ca.install || true
 	rm -f debian/libreoffice-help-ca-XV.dirs debian/libreoffice-help-ca-XV.install
 endif