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

./packages/libreoffice/3.3.0/experimental r2233: stop versioning libreoffice-build and ext-sources-libreoffice-build



------------------------------------------------------------
revno: 2233
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2010-12-15 17:12:36 +0100
message:
  stop versioning libreoffice-build and ext-sources-libreoffice-build
modified:
  changelog
  control
  patches/buildfix-patches.diff
  patches/hack-no-rm-fr-of-smoketest-userconfig.diff
  patches/installer-globals-max-1-regcomp.diff
  patches/splash-progressbarcolor.diff
  rules
  source/components
=== modified file 'changelog'
--- a/changelog	2010-12-13 18:28:31 +0000
+++ b/changelog	2010-12-15 16:12:36 +0000
@@ -1,5 +1,9 @@
 libreoffice (1:3.3.0~rc1-2) UNRELEASED; urgency=low
 
+  * stop versioning libreoffice-build and ext-sources-libreoffice-build
+    as releases of them now match LibO releases, makes building from git
+    easier, thanks Chris Halls
+
   * debian/rules:
     - re-enable sdbc-postgresql
     - add conditional for squeeze-backports (Daniel Baumann)

=== modified file 'control'
--- a/control	2010-12-13 18:28:31 +0000
+++ b/control	2010-12-15 16:12:36 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
 Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) , libgl1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpo
 ppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 7.2.3~) , epm , libcppunit-dev (>= 1.12) , openjdk-6-jdk [i386 powerpc powerpcspe s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 ar
 mel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libsac-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreeb
 sd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s
 390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], mono-utils (>= 2.
 4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], cli-common-dev (>= 0.5.7) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libmdds-dev , libvigraimpex-dev , libwpd-dev (>= 0.9.0) , libmythes-dev (>= 2:1.2) , libwps-dev (>= 0.2.0) , libwpg-dev (>= 0.2.0) , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 pp
 c64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , librdf0-dev (>= 1.0.8) , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) , libgl1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpo
 ppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 7.2.3~) , epm , libcppunit-dev (>= 1.12) , openjdk-6-jdk [i386 powerpc powerpcspe s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 ar
 mel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libsac-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreeb
 sd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s
 390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], mono-utils (>= 2.
 4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], cli-common-dev (>= 0.5.7) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libmdds-dev , libvigraimpex-dev , libmythes-dev (>= 2:1.2) , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc powerpcspe s
 390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , librdf0-dev (>= 1.0.8) , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
 Build-Depends-Indep: fdupes, xml-core, imagemagick, , libtextcat-data-utf8 , fontforge
 Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5), libhsqldb-java (>= 1.8.1~)
 Standards-Version: 3.8.4

=== modified file 'patches/buildfix-patches.diff'
--- a/patches/buildfix-patches.diff	2010-12-01 19:22:12 +0000
+++ b/patches/buildfix-patches.diff	2010-12-15 16:12:36 +0000
@@ -1,5 +1,5 @@
---- libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply-old	2010-10-18 09:11:18.000000000 +0200
-+++ libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply	2010-10-18 09:11:30.000000000 +0200
+--- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply-old	2010-10-18 09:11:18.000000000 +0200
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply	2010-10-18 09:11:30.000000000 +0200
 @@ -1878,7 +1878,7 @@
  [ Fixes ]
  fix-ppt-linespacing-import-export.diff, n#355302, rodo

=== modified file 'patches/hack-no-rm-fr-of-smoketest-userconfig.diff'
--- a/patches/hack-no-rm-fr-of-smoketest-userconfig.diff	2010-12-01 19:22:12 +0000
+++ b/patches/hack-no-rm-fr-of-smoketest-userconfig.diff	2010-12-15 16:12:36 +0000
@@ -1,5 +1,5 @@
 --- /dev/null	2010-10-31 21:59:47.283126105 +0100
-+++ libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/hack-no-rm-fr-of-smoketest-userconfig.diff	2010-11-09 21:21:23.000000000 +0100
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/hack-no-rm-fr-of-smoketest-userconfig.diff	2010-11-09 21:21:23.000000000 +0100
 @@ -0,0 +1,39 @@
 +diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
 +index 80de446..3a7be7f 100644
@@ -40,8 +40,8 @@
 + .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
 +     $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
 + javatest : $(MISC)/$(TARGET)/installation.flag
---- libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply-old	2010-11-10 11:46:58.000000000 +0100
-+++ libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply	2010-11-10 11:47:21.000000000 +0100
+--- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply-old	2010-11-10 11:46:58.000000000 +0100
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply	2010-11-10 11:47:21.000000000 +0100
 @@ -2411,3 +2411,6 @@
  sd_effects_styles.diff, pixie
  symbols-20-august.diff, i#11167, jopsen

=== modified file 'patches/installer-globals-max-1-regcomp.diff'
--- a/patches/installer-globals-max-1-regcomp.diff	2010-12-01 19:22:12 +0000
+++ b/patches/installer-globals-max-1-regcomp.diff	2010-12-15 16:12:36 +0000
@@ -1,5 +1,5 @@
 --- /dev/null	2010-05-24 16:58:35.275686347 +0200
-+++ openoffice.org-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/installer-globals-max-1-regcomp.diff	2010-06-11 00:39:33.000000000 +0200
++++ openoffice.org-3.3.0/libreoffice-build/patches/dev300/installer-globals-max-1-regcomp.diff	2010-06-11 00:39:33.000000000 +0200
 @@ -0,0 +1,14 @@
 +diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
 +--- solenv/bin/modules/installer/globals.pm
@@ -17,8 +17,8 @@
 + 	$fix_number_of_cab_files = 1;
 diff --git a/patches/dev300/apply b/patches/dev300/apply
 index 3a732ae..5f1c32a 100644
---- openoffice.org-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply
-+++ openoffice.org-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply
+--- openoffice.org-3.3.0/libreoffice-build/patches/dev300/apply
++++ openoffice.org-3.3.0/libreoffice-build/patches/dev300/apply
 @@ -307,6 +307,10 @@ gcc-HelpLinker.diff
  # configmgr paths are not yet existing then
  speed-sal-fewer-lstats.diff, i#89730, jholesov

=== modified file 'patches/splash-progressbarcolor.diff'
--- a/patches/splash-progressbarcolor.diff	2010-12-01 19:22:12 +0000
+++ b/patches/splash-progressbarcolor.diff	2010-12-15 16:12:36 +0000
@@ -1,5 +1,5 @@
 --- /dev/null	2010-09-28 02:28:57.560060918 +0200
-+++ libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/debian-splash.diff	2010-10-07 19:19:42.000000000 +0200
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/debian-splash.diff	2010-10-07 19:19:42.000000000 +0200
 @@ -0,0 +1,11 @@
 +--- instsetoo_native/util/openoffice.lst-old	2008-08-06 00:03:46.000000000 +0200
 ++++ instsetoo_native/util/openoffice.lst	2008-08-06 00:04:01.000000000 +0200
@@ -14,8 +14,8 @@
 + 			PROGRESSFRAMECOLOR 207,208,211
 diff --git a/patches/dev300/apply b/patches/dev300/apply
 index 485e60d..536caec 100644
---- libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply
-+++ libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply
+--- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply
 @@ -572,6 +572,10 @@
  pushfont-psstream.diff
  scp2-user-config-ooo3.diff

=== modified file 'rules'
--- a/rules	2010-12-08 21:32:15 +0000
+++ b/rules	2010-12-15 16:12:36 +0000
@@ -77,7 +77,7 @@
 #OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
 OOO_BUILD_TARBALL_VERSION=3.3.0.1
 OOO_BUILD_TAG=LIBREOFFICE_3_3_0_1
-OOO_BUILD_TREE=libreoffice-build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
+OOO_BUILD_TREE=libreoffice-build
 SOURCE_TREE=$(OOO_BUILD_TREE)/build/libreoffice-$(OOO_BUILD_TARBALL_VERSION)
 STAMP_DIR=debian/stampdir
 TARFILE_LOCATION=$(CURDIR)/ext-sources

=== modified file 'source/components'
--- a/source/components	2010-12-01 19:22:12 +0000
+++ b/source/components	2010-12-15 16:12:36 +0000
@@ -1,4 +1,4 @@
 ext-sources
-libreoffice-build-3-3-0-1
-ext-sources-libreoffice-build-3-3-0-1
+libreoffice-build
+ext-sources-libreoffice-build
 translation-updates-20100529


Reply to: