[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-185-gf6717f7
The following commit has been merged in the debian-experimental-3.5 branch:
commit a76724068ee2347ae40e488a82683113454109e0
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 cd201a9..b70a3b2 100755
--- a/rules
+++ b/rules
@@ -318,7 +318,7 @@ define gen_no_archs
$$(_no_arch_macro) = $$(if $$(_no_arch_tmp_$1),$$(_empty) [$$(_no_arch_tmp_$1)])
endef
-PLATFORMID := $(shell grep PLATFORMID debian/scripts/vars.$(DEB_HOST_ARCH) | cut -d"=" -f2)
+PLATFORMID := $(shell grep PLATFORMID debian/vars.$(DEB_HOST_ARCH) | cut -d"=" -f2)
# ./configure defaults to STLport on i386 and we should keep it for
# ABI-compatability
@@ -1268,7 +1268,6 @@ ifeq "$(ENABLE_LDAP)" "y"
endif
for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
- [ "$$LNUM" = en-US -a "$(DEB_SOURCE)" = "libreoffice$(VER)-l10n" ] && continue; \
LNAME=`$(SOURCE_TREE)/bin/lo-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
LCODE=`$(SOURCE_TREE)/bin/lo-xlate-lang -i $$LNUM | tr A-Z a-z`; \
CCODE=`echo $$LCODE | sed 's/-.*//'`; \
@@ -1790,7 +1789,7 @@ endif
#
# Generate maintainer scripts
maintscripts: $(STAMP_DIR)/maintscripts
-$(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*.sh) $(wildcard debian/*.preinst.in) $(wildcard debian/*.postinst.in) $(wildcard debian/*.prerm.in) $(wildcard debian/*.postrm.in) debian/scripts/vars.$(DEB_HOST_ARCH) debian/control
+$(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*.sh) $(wildcard debian/*.preinst.in) $(wildcard debian/*.postinst.in) $(wildcard debian/*.prerm.in) $(wildcard debian/*.postrm.in) debian/vars.$(DEB_HOST_ARCH) debian/control
dh_testdir
rm -f debian/*.{pre,post}{inst,rm}
@@ -1802,7 +1801,7 @@ $(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*.sh) $(wildcard debian/*.
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 PLATFORMID debian/scripts/vars.$(DEB_HOST_ARCH) >> $$MAINTSCRIPT; \
+ grep PLATFORMID debian/vars.$(DEB_HOST_ARCH) >> $$MAINTSCRIPT; \
fi; \
echo "" >> $$MAINTSCRIPT; \
if egrep -q "(add|remove|validate|sync)_extension" $$MAINTSCRIPT.in; then \
@@ -2225,14 +2224,12 @@ endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
- ifneq "$(DEB_SOURCE)" "libreoffice$(VER)-l10n"
rm -rf $(PKGDIR)-gcj/usr/lib/gcj
mkdir -p $(PKGDIR)-gcj/usr/lib/gcj/$(OODIRNAME)
cp -p debian/tmp/native-jars/gcj/* $(PKGDIR)-gcj/usr/lib/gcj/$(OODIRNAME)
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/scripts/vars.alpha
deleted file mode 100644
index 610cd81..0000000
--- a/scripts/vars.alpha
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_alpha
diff --git a/scripts/vars.amd64 b/scripts/vars.amd64
deleted file mode 100644
index eca69cd..0000000
--- a/scripts/vars.amd64
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_x86_64
diff --git a/scripts/vars.arm b/scripts/vars.arm
deleted file mode 100644
index ad87d02..0000000
--- a/scripts/vars.arm
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_arm_oabi
diff --git a/scripts/vars.armel b/scripts/vars.armel
deleted file mode 100644
index 9d54104..0000000
--- a/scripts/vars.armel
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_arm_eabi
diff --git a/scripts/vars.armhf b/scripts/vars.armhf
deleted file mode 100644
index 9d54104..0000000
--- a/scripts/vars.armhf
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_arm_eabi
diff --git a/scripts/vars.hppa b/scripts/vars.hppa
deleted file mode 100644
index 2efe694..0000000
--- a/scripts/vars.hppa
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_hppa
diff --git a/scripts/vars.i386 b/scripts/vars.i386
deleted file mode 100644
index 5462661..0000000
--- a/scripts/vars.i386
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_x86
diff --git a/scripts/vars.ia64 b/scripts/vars.ia64
deleted file mode 100644
index c6debb3..0000000
--- a/scripts/vars.ia64
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_ia64
diff --git a/scripts/vars.kfreebsd-amd64 b/scripts/vars.kfreebsd-amd64
deleted file mode 100644
index c13d6b5..0000000
--- a/scripts/vars.kfreebsd-amd64
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=kfreebsd_x86_64
diff --git a/scripts/vars.kfreebsd-i386 b/scripts/vars.kfreebsd-i386
deleted file mode 100644
index f8c2bbb..0000000
--- a/scripts/vars.kfreebsd-i386
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=kfreebsd_x86
diff --git a/scripts/vars.m68k b/scripts/vars.m68k
deleted file mode 100644
index a40c8a3..0000000
--- a/scripts/vars.m68k
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_m68k
diff --git a/scripts/vars.mips b/scripts/vars.mips
deleted file mode 100644
index e484a85..0000000
--- a/scripts/vars.mips
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_mips_eb
diff --git a/scripts/vars.mipsel b/scripts/vars.mipsel
deleted file mode 100644
index 0f4f5a8..0000000
--- a/scripts/vars.mipsel
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_mips_el
diff --git a/scripts/vars.powerpc b/scripts/vars.powerpc
deleted file mode 100644
index e43581b..0000000
--- a/scripts/vars.powerpc
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_powerpc
diff --git a/scripts/vars.powerpcspe b/scripts/vars.powerpcspe
deleted file mode 100644
index e43581b..0000000
--- a/scripts/vars.powerpcspe
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_powerpc
diff --git a/scripts/vars.ppc64 b/scripts/vars.ppc64
deleted file mode 100644
index c647bc6..0000000
--- a/scripts/vars.ppc64
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_powerpc64
diff --git a/scripts/vars.s390 b/scripts/vars.s390
deleted file mode 100644
index 7e52543..0000000
--- a/scripts/vars.s390
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_s390
diff --git a/scripts/vars.s390x b/scripts/vars.s390x
deleted file mode 100644
index 7c0d549..0000000
--- a/scripts/vars.s390x
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_s390x
diff --git a/scripts/vars.solaris-i386 b/scripts/vars.solaris-i386
deleted file mode 100644
index de92b2a..0000000
--- a/scripts/vars.solaris-i386
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=solaris_x86
diff --git a/scripts/vars.sparc b/scripts/vars.sparc
deleted file mode 100644
index a905e56..0000000
--- a/scripts/vars.sparc
+++ /dev/null
@@ -1 +0,0 @@
-PLATFORMID=linux_sparc
--
LibreOffice packaging repository
Reply to: