[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.4-1-22-gf6487b6
The following commit has been merged in the master branch:
commit f6487b6af6a4753b6efd1edf21ff1df5f8958f46
Author: Rene Engelhard <rene@debian.org>
Date: Fri Dec 23 17:57:07 2011 +0100
cleanup: move scripts/vars.* to debian/directly, no scripts ;-)
diff --git a/rules b/rules
index 1511a9f..b0366f9 100755
--- a/rules
+++ b/rules
@@ -331,8 +331,8 @@ define gen_no_archs
$$(_no_arch_macro) = $$(if $$(_no_arch_tmp_$1),$$(_empty) [$$(_no_arch_tmp_$1)])
endef
-LIBSUFFIX := $(shell grep LIBSUFFIX debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
-PLATFORMID := $(shell grep PLATFORMID debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
+LIBSUFFIX := $(shell grep LIBSUFFIX debian/vars.$(ARCH) | cut -d"=" -f2)
+PLATFORMID := $(shell grep PLATFORMID debian/vars.$(ARCH) | cut -d"=" -f2)
# ./configure defaults to STLport on i386 and we should keep it for
# ABI-compatability
@@ -2078,7 +2078,7 @@ endif
#
# Generate maintainer scripts
maintscripts: $(STAMP_DIR)/maintscripts
-$(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*Env*.sh) $(wildcard debian/*.preinst.in) $(wildcard debian/*.postinst.in) $(wildcard debian/*.prerm.in) $(wildcard debian/*.postrm.in) debian/scripts/vars.$(ARCH) debian/control
+$(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*Env*.sh) $(wildcard debian/*.preinst.in) $(wildcard debian/*.postinst.in) $(wildcard debian/*.prerm.in) $(wildcard debian/*.postrm.in) debian/vars.$(ARCH) debian/control
dh_testdir
rm -f debian/*.{pre,post}{inst,rm}
@@ -2090,8 +2090,8 @@ $(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*Env*.sh) $(wildcard debia
if [ -e $$MAINTSCRIPT.in ]; then \
sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' > $$MAINTSCRIPT; \
if echo $(ARCH_DEP_PACKAGES) | grep -q $$PKG; then \
- grep LIBSUFFIX debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
- grep PLATFORMID debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
+ grep LIBSUFFIX debian/vars.$(ARCH) >> $$MAINTSCRIPT; \
+ grep PLATFORMID debian/vars.$(ARCH) >> $$MAINTSCRIPT; \
fi; \
echo "" >> $$MAINTSCRIPT; \
if egrep -q "(add|remove|validate|sync)_extension" $$MAINTSCRIPT.in; then \
@@ -2655,7 +2655,6 @@ ifeq "$(ENABLE_JAVA)" "y"
mkdir -p $(PKGDIR)-gcj/usr/share/gcj/classmap.d
cp -p debian/tmp/native-jars/tmp.db \
$(PKGDIR)-gcj/usr/share/gcj/classmap.d/libreoffice.db
- endif
endif
endif
diff --git a/scripts/vars.alpha b/vars.alpha
similarity index 100%
rename from scripts/vars.alpha
rename to vars.alpha
diff --git a/scripts/vars.amd64 b/vars.amd64
similarity index 100%
rename from scripts/vars.amd64
rename to vars.amd64
diff --git a/scripts/vars.arm b/vars.arm
similarity index 100%
rename from scripts/vars.arm
rename to vars.arm
diff --git a/scripts/vars.armel b/vars.armel
similarity index 100%
rename from scripts/vars.armel
rename to vars.armel
diff --git a/scripts/vars.armhf b/vars.armhf
similarity index 100%
rename from scripts/vars.armhf
rename to vars.armhf
diff --git a/scripts/vars.hppa b/vars.hppa
similarity index 100%
rename from scripts/vars.hppa
rename to vars.hppa
diff --git a/scripts/vars.i386 b/vars.i386
similarity index 100%
rename from scripts/vars.i386
rename to vars.i386
diff --git a/scripts/vars.ia64 b/vars.ia64
similarity index 100%
rename from scripts/vars.ia64
rename to vars.ia64
diff --git a/scripts/vars.kfreebsd-amd64 b/vars.kfreebsd-amd64
similarity index 100%
rename from scripts/vars.kfreebsd-amd64
rename to vars.kfreebsd-amd64
diff --git a/scripts/vars.kfreebsd-i386 b/vars.kfreebsd-i386
similarity index 100%
rename from scripts/vars.kfreebsd-i386
rename to vars.kfreebsd-i386
diff --git a/scripts/vars.m68k b/vars.m68k
similarity index 100%
rename from scripts/vars.m68k
rename to vars.m68k
diff --git a/scripts/vars.mips b/vars.mips
similarity index 100%
rename from scripts/vars.mips
rename to vars.mips
diff --git a/scripts/vars.mipsel b/vars.mipsel
similarity index 100%
rename from scripts/vars.mipsel
rename to vars.mipsel
diff --git a/scripts/vars.powerpc b/vars.powerpc
similarity index 100%
rename from scripts/vars.powerpc
rename to vars.powerpc
diff --git a/scripts/vars.powerpcspe b/vars.powerpcspe
similarity index 100%
rename from scripts/vars.powerpcspe
rename to vars.powerpcspe
diff --git a/scripts/vars.ppc64 b/vars.ppc64
similarity index 100%
rename from scripts/vars.ppc64
rename to vars.ppc64
diff --git a/scripts/vars.s390 b/vars.s390
similarity index 100%
rename from scripts/vars.s390
rename to vars.s390
diff --git a/scripts/vars.s390x b/vars.s390x
similarity index 100%
rename from scripts/vars.s390x
rename to vars.s390x
diff --git a/scripts/vars.solaris-i386 b/vars.solaris-i386
similarity index 100%
rename from scripts/vars.solaris-i386
rename to vars.solaris-i386
diff --git a/scripts/vars.sparc b/vars.sparc
similarity index 100%
rename from scripts/vars.sparc
rename to vars.sparc
--
LibreOffice packaging repository
Reply to: