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

./packages/openofficeorg/3.1.1/unstable r1769: bump libmysqlcppconn-dev builddep to rebuild against visibility-fixed one. closes #558240



------------------------------------------------------------
revno: 1769
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-12-02 22:06:20 +0100
message:
  bump libmysqlcppconn-dev builddep to rebuild against visibility-fixed one. closes #558240
modified:
  changelog
  control
  rules
=== modified file 'changelog'
--- a/changelog	2009-11-30 10:05:48 +0000
+++ b/changelog	2009-12-02 21:06:20 +0000
@@ -8,9 +8,11 @@
     - reenable sparc
     - fix install on no-Java builds
     - add BUILD_HPPA conditional, don't enable it yet
+    - build-depend on libmysqlcppconn*-dev (>= 1.1.0~r791) to build against
+      version with fixed visibility of (e.g.) SQLException (closes: #558240)
   * debian/scripts/vars.hppa: add
 
- -- Rene Engelhard <rene@debian.org>  Mon, 16 Nov 2009 20:49:08 +0100
+ -- Rene Engelhard <rene@debian.org>  Wed, 02 Dec 2009 22:04:58 +0100
 
 openoffice.org (1:3.1.1-8) unstable; urgency=low
 

=== modified file 'control'
--- a/control	2009-11-30 09:22:03 +0000
+++ b/control	2009-12-02 21:06:20 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], 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, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
  6.0.7~) , openjdk-6-jdk , gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 armel amd64 ia64 s390x sparc] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libsac-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libxml-java-openoffice
 .org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , xulrunne
 r-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc], libnss3-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64], libmono-dev (>= 2.0.1) [i386 amd64 ia64], mono-utils (>= 2.0.1) [i386 amd64 ia64], cli-common-dev (>= 0.5.7) [i386 amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.0.6~r768) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc], libmysqlcppconn-stlport-dev [i386] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd6
 4 ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 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 , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], 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, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
  6.0.7~) , openjdk-6-jdk , gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 armel amd64 ia64 s390x sparc] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libsac-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libxml-java-openoffice
 .org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , xulrunne
 r-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc], libnss3-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64 sparc], libmono-dev (>= 2.0.1) [i386 amd64 ia64 sparc], mono-utils (>= 2.0.1) [i386 amd64 ia64 sparc], cli-common-dev (>= 0.5.7) [i386 amd64 ia64 sparc] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc], libmysqlcppconn-stlport-dev (>= 1.1.0~r791) [i386] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [
 i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 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 , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev
 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), base-files (= 5)
 Standards-Version: 3.8.3
 XS-Python-Version: current

=== modified file 'rules'
--- a/rules	2009-11-30 10:05:48 +0000
+++ b/rules	2009-12-02 21:06:20 +0000
@@ -247,6 +247,7 @@
 ENABLE_MYSQLNATIVE=y
 USE_SYSTEM_MYSQLCLIENT=y
 USE_SYSTEM_MYSQLCPPCONN=y
+MYSQLCPPCONN_MINVER= (>= 1.1.0~r791)
 DICT_DIR=/usr/share/hunspell
 HYPH_DIR=/usr/share/hyphen
 THES_DIR=/usr/share/mythes
@@ -972,7 +973,7 @@
   endif
   ifeq "$(USE_SYSTEM_MYSQLCPPCONN)" "y"
 	CONFIGURE_FLAGS += --with-system-mysql-cppconn
-	BUILD_DEPS += , libmysqlcppconn-dev (>= 1.0.6~r768) [$(filter-out $(OOO_STLPORT_ARCHS),$(OOO_ARCHS))], libmysqlcppconn-stlport-dev [$(OOO_STLPORT_ARCHS)]
+	BUILD_DEPS += , libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER) [$(filter-out $(OOO_STLPORT_ARCHS),$(OOO_ARCHS))], libmysqlcppconn-stlport-dev $(MYSQLCPPCONN_MINVER) [$(OOO_STLPORT_ARCHS)]
   endif
 endif
 


Reply to: