[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.1_rc1-2-38-g08958e4



The following commit has been merged in the debian-experimental-4.0 branch:
commit 6a595e7f48836db6f84c039aa1fdbe8fcff40d0c
Author: Benjamin Drung <bdrung@debian.org>
Date:   Mon Mar 11 13:36:42 2013 +0100

    Drop VER replacement for maintainerscripts.

diff --git a/libreoffice-core.postrm.in b/libreoffice-core.postrm.in
index 4fdd20a..95ed9cb 100755
--- a/libreoffice-core.postrm.in
+++ b/libreoffice-core.postrm.in
@@ -5,7 +5,7 @@ set -e
 #INCLUDE_SHELL_LIB#
 
 if [ "$1" = "remove" ]; then
-	rm -rf /var/spool/libreoffice@VER@
+	rm -rf /var/spool/libreoffice
 fi
 
 #DEBHELPER#
diff --git a/rules b/rules
index 6cea262..c1346d2 100755
--- a/rules
+++ b/rules
@@ -1932,7 +1932,6 @@ $(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*.sh) $(wildcard debian/*.
 	      sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >> $$MAINTSCRIPT; \
 	      perl -pi -e "s/\@LANGPACKISOS\@/$(LANGPACKISOS)/" $$MAINTSCRIPT; \
 	      perl -pi -e "s,\@OODIR\@,$(OODIR),g" $$MAINTSCRIPT; \
-	      perl -pi -e "s/\@VER\@//g" $$MAINTSCRIPT; \
 	    fi; \
 	  done; \
 	done

-- 
LibreOffice packaging repository


Reply to: