move /var/spool/libreoffice into -core, not -commonlibreoffice_4.4.0_rc3-1

2 files changed, 17 insertions, 13 deletions

diff --git a/changelog b/changelog
index 1d35621..3a967d4 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,9 @@ libreoffice (1:4.4.0~rc3-1) experimental; urgency=medium
 
   * New upstream release candidate
 
+  * debian/rules:
+    - move /var/spool/libreoffice into -core, not -common (closes: #775150)
+
  -- Rene Engelhard <rene@debian.org>  Thu, 22 Jan 2015 23:45:29 +0100
 
 libreoffice (1:4.4.0~rc2-1) experimental; urgency=medium
diff --git a/rules b/rules
index cc3b072..38d573b 100755
--- a/rules
+++ b/rules
@@ -2209,6 +2209,20 @@ else
   endif
 endif
 
+	# move uno_packages/cache to /var and create symlink for for
+	# documentation referencing it...
+	rm -rf $(PKGDIR)-common/$(OODIR)/share/uno_packages
+	mkdir -p $(PKGDIR)-core/var/spool/$(OODIRNAME)/uno_packages/cache
+	mkdir -p $(PKGDIR)-core/$(OODIR)/share/uno_packages
+	ln -s /var/spool/$(OODIRNAME)/uno_packages/cache \
+		$(PKGDIR)-core/$(OODIR)/share/uno_packages/cache
+	perl -pi -e \
+	      's,\$$UNO_SHARED_PACKAGES/cache,file:///var/spool/$(OODIRNAME)/uno_packages/cache,g' \
+		$(PKGDIR)-common/$(OODIR)/program/unorc
+	# FIXME: What is this? unorc per default only mentiones
+	# share/uno_packages/cache...
+	rm -rf $(PKGDIR)-common/$(OODIR)/presets/uno_packages
+
 	find debian/tmp ! -perm -200 | xargs -r chmod u+w
 
 	touch $@
@@ -2780,19 +2794,6 @@ endif
 	chmod 644 $(PKGDIR)-common/$(OODIR)/NOTICE
 	rm -rf $(PKGDIR)-common/$(OODIR)/LICENSE
 
-	# move uno_packages/cache to /var and create symlink for for
-	# documentation referencing it...
-	rm -rf $(PKGDIR)-common/$(OODIR)/share/uno_packages/cache
-	mkdir -p $(PKGDIR)-common/var/spool/$(OODIRNAME)/uno_packages/cache
-	ln -s /var/spool/$(OODIRNAME)/uno_packages/cache \
-		$(PKGDIR)-common/$(OODIR)/share/uno_packages/cache
-	perl -pi -e \
-	      's,\$$UNO_SHARED_PACKAGES/cache,file:///var/spool/$(OODIRNAME)/uno_packages/cache,g' \
-		$(PKGDIR)-common/$(OODIR)/program/unorc
-	# FIXME: What is this? unorc per default only mentiones
-	# share/uno_packages/cache...
-	rm -rf $(PKGDIR)-common/$(OODIR)/presets/uno_packages
-
 	# set PYTHONPATH in unopkg
 	perl -pi -e 's,unset XENVIRONMENT,unset XENVIRONMENT\n\nexport PYTHONPATH=\"/$(OODIR)/program\"\n\n,' \
 		$(PKGDIR)-common/$(OODIR)/program/unopkg