[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-1-27-g11a5901

Rene Engelhard Sun, 11 Sep 2011 08:10:15 -0700

The following commit has been merged in the debian-experimental-3.5 branch:
commit 11a590179c0a45964522f4f044816b5b1901b75f
Author: Rene Engelhard <[email protected]>
Date:   Sun Sep 11 17:09:35 2011 +0200


    LIBSUFFIX is gone (well, 'lo' anywhere)

diff --git a/changelog b/changelog
index 7607062..01fbb84 100644
--- a/changelog
+++ b/changelog
@@ -5,15 +5,16 @@ libreoffice (1:3.5.0~git20110911-1) UNRELEASED; urgency=low
   * debian/patches/*: move from patches/hotfixes to patch the code
     directly without libreoffice-build
 
+  * debian/rules, debian/vars.*, debian/*.links.in:
+    - loads of updates for new envfile name and gone LIBSUFFIX
   * debian/rules:
-    - loads of updates for new envfile name
     - enable new build against Gtk3
     - bump python b-d to >= 2.6 as we don't work with earlier anymore.
       Also build python3-uno
     - add new conditionals and build-deps for new libvisio,librsvg and gettext
       usage
 
- -- Rene Engelhard <[email protected]>  Sun, 11 Sep 2011 16:06:51 +0200
+ -- Rene Engelhard <[email protected]>  Sun, 11 Sep 2011 17:08:29 +0200
 
 libreoffice (1:3.4.3-2) UNRELEASED; urgency=low
 
diff --git a/libreoffice-evolution.links.in b/libreoffice-evolution.links.in
index 0776926..46992e5 100644
--- a/libreoffice-evolution.links.in
+++ b/libreoffice-evolution.links.in
@@ -1 +1 @@
-@OOBASISDIR@/program/libevoab@[email protected] 
@OOBASISDIR@/registered-components/libevoab@[email protected]
+@OOBASISDIR@/program/libevoablo.so 
@OOBASISDIR@/registered-components/libevoablo.so
diff --git a/libreoffice-filter-binfilter.links.in 
b/libreoffice-filter-binfilter.links.in
index 1d0c254..7d4d6b1 100644
--- a/libreoffice-filter-binfilter.links.in
+++ b/libreoffice-filter-binfilter.links.in
@@ -1,2 +1,2 @@
-@OOBASISDIR@/program/libbf_migratefilter@[email protected] 
@OOBASISDIR@/registered-components/libbf_migratefilter@[email protected] 
-@OOBASISDIR@/program/libbindet@[email protected] 
@OOBASISDIR@/registered-components/libbindet@[email protected]
+@OOBASISDIR@/program/libbf_migratefilterlo.so 
@OOBASISDIR@/registered-components/libbf_migratefilterlo.so 
+@OOBASISDIR@/program/libbindetlo.so 
@OOBASISDIR@/registered-components/libbindetlo.so
diff --git a/rules b/rules
index c06f15d..185a14b 100755
--- a/rules
+++ b/rules
@@ -347,7 +347,6 @@ 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)
 
 # ./configure defaults to STLport on i386 and we should keep it for
@@ -2101,7 +2100,6 @@ $(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 LIBSUFFIX debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
                grep PLATFORMID debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
              fi; \
              echo "" >> $$MAINTSCRIPT; \
@@ -2823,8 +2821,7 @@ endif
        for PKG in $(ARCH_DEP_PACKAGES); do \
          LINKS=debian/$$PKG.links ; \
          if [ -e $$LINKS.in ]; then \
-           sed -e "s/\@LIBSUFFIX\@/$(LIBSUFFIX)/g" \
-               -e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
+           sed -e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
                < $$LINKS.in > $$LINKS ; \
          fi; \
        done
@@ -3233,8 +3230,7 @@ endif
        for PKG in $(ARCH_INDEP_PACKAGES); do \
          LINKS=debian/$$PKG.links ; \
          if [ -e $$LINKS.in ]; then \
-           sed -e "s/\@LIBSUFFIX\@/$(LIBSUFFIX)/g" \
-               -e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
+           sed -e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
                < $$LINKS.in > $$LINKS ; \
          fi; \
        done
diff --git a/scripts/vars.alpha b/scripts/vars.alpha
index da3ab20..610cd81 100644
--- a/scripts/vars.alpha
+++ b/scripts/vars.alpha
@@ -1,2 +1 @@
-LIBSUFFIX=ll
 PLATFORMID=linux_alpha
diff --git a/scripts/vars.amd64 b/scripts/vars.amd64
index b769e56..eca69cd 100644
--- a/scripts/vars.amd64
+++ b/scripts/vars.amd64
@@ -1,2 +1 @@
-LIBSUFFIX=lx
 PLATFORMID=linux_x86_64
diff --git a/scripts/vars.arm b/scripts/vars.arm
index b5d7309..ad87d02 100644
--- a/scripts/vars.arm
+++ b/scripts/vars.arm
@@ -1,2 +1 @@
-LIBSUFFIX=lr
 PLATFORMID=linux_arm_oabi
diff --git a/scripts/vars.armel b/scripts/vars.armel
index c387e31..9d54104 100644
--- a/scripts/vars.armel
+++ b/scripts/vars.armel
@@ -1,2 +1 @@
-LIBSUFFIX=lr
 PLATFORMID=linux_arm_eabi
diff --git a/scripts/vars.hppa b/scripts/vars.hppa
index 8b289be..2efe694 100644
--- a/scripts/vars.hppa
+++ b/scripts/vars.hppa
@@ -1,2 +1 @@
-LIBSUFFIX=lh
 PLATFORMID=linux_hppa
diff --git a/scripts/vars.i386 b/scripts/vars.i386
index 61ca47d..5462661 100644
--- a/scripts/vars.i386
+++ b/scripts/vars.i386
@@ -1,2 +1 @@
-LIBSUFFIX=li
 PLATFORMID=linux_x86
diff --git a/scripts/vars.ia64 b/scripts/vars.ia64
index 9899751..c6debb3 100644
--- a/scripts/vars.ia64
+++ b/scripts/vars.ia64
@@ -1,2 +1 @@
-LIBSUFFIX=la
 PLATFORMID=linux_ia64
diff --git a/scripts/vars.kfreebsd-amd64 b/scripts/vars.kfreebsd-amd64
index c485540..c13d6b5 100644
--- a/scripts/vars.kfreebsd-amd64
+++ b/scripts/vars.kfreebsd-amd64
@@ -1,2 +1 @@
-LIBSUFFIX=lx
 PLATFORMID=kfreebsd_x86_64
diff --git a/scripts/vars.kfreebsd-i386 b/scripts/vars.kfreebsd-i386
index 5e7a888..f8c2bbb 100644
--- a/scripts/vars.kfreebsd-i386
+++ b/scripts/vars.kfreebsd-i386
@@ -1,2 +1 @@
-LIBSUFFIX=li
 PLATFORMID=kfreebsd_x86
diff --git a/scripts/vars.m68k b/scripts/vars.m68k
index 605ee9e..a40c8a3 100644
--- a/scripts/vars.m68k
+++ b/scripts/vars.m68k
@@ -1,2 +1 @@
-LIBSUFFIX=lm
 PLATFORMID=linux_m68k
diff --git a/scripts/vars.mips b/scripts/vars.mips
index 120fa5a..e484a85 100644
--- a/scripts/vars.mips
+++ b/scripts/vars.mips
@@ -1,2 +1 @@
-LIBSUFFIX=lm
 PLATFORMID=linux_mips_eb
diff --git a/scripts/vars.mipsel b/scripts/vars.mipsel
index 54b0cac..0f4f5a8 100644
--- a/scripts/vars.mipsel
+++ b/scripts/vars.mipsel
@@ -1,2 +1 @@
-LIBSUFFIX=lm
 PLATFORMID=linux_mips_el
diff --git a/scripts/vars.powerpc b/scripts/vars.powerpc
index 550c2b3..e43581b 100644
--- a/scripts/vars.powerpc
+++ b/scripts/vars.powerpc
@@ -1,2 +1 @@
-LIBSUFFIX=lp
 PLATFORMID=linux_powerpc
diff --git a/scripts/vars.powerpcspe b/scripts/vars.powerpcspe
index 550c2b3..e43581b 100644
--- a/scripts/vars.powerpcspe
+++ b/scripts/vars.powerpcspe
@@ -1,2 +1 @@
-LIBSUFFIX=lp
 PLATFORMID=linux_powerpc
diff --git a/scripts/vars.ppc64 b/scripts/vars.ppc64
index 4203d0f..c647bc6 100644
--- a/scripts/vars.ppc64
+++ b/scripts/vars.ppc64
@@ -1,2 +1 @@
-LIBSUFFIX=lp
 PLATFORMID=linux_powerpc64
diff --git a/scripts/vars.s390 b/scripts/vars.s390
index 67dd49e..7e52543 100644
--- a/scripts/vars.s390
+++ b/scripts/vars.s390
@@ -1,2 +1 @@
-LIBSUFFIX=l3
 PLATFORMID=linux_s390
diff --git a/scripts/vars.s390x b/scripts/vars.s390x
index 65111c2..7c0d549 100644
--- a/scripts/vars.s390x
+++ b/scripts/vars.s390x
@@ -1,2 +1 @@
-LIBSUFFIX=l3
 PLATFORMID=linux_s390x
diff --git a/scripts/vars.solaris-i386 b/scripts/vars.solaris-i386
index e648206..de92b2a 100644
--- a/scripts/vars.solaris-i386
+++ b/scripts/vars.solaris-i386
@@ -1,2 +1 @@
-LIBSUFFIX=si
 PLATFORMID=solaris_x86
diff --git a/scripts/vars.sparc b/scripts/vars.sparc
index d1661e8..a905e56 100644
--- a/scripts/vars.sparc
+++ b/scripts/vars.sparc
@@ -1,2 +1 @@
-LIBSUFFIX=ls
 PLATFORMID=linux_sparc

-- 
LibreOffice packaging repository


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-1-27-g11a5901

Reply via email to