------------------------------------------------------------
revno: 1975
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Wed 2010-05-12 00:40:01 +0200
message:
  remove libmythes-dev again, mythes 1.2 is through NEW
modified:
  changelog
  control
  control.in
  rules
=== modified file 'changelog'
--- a/changelog 2010-05-10 16:22:48 +0000
+++ b/changelog 2010-05-11 22:40:01 +0000
@@ -1,3 +1,10 @@
+openoffice.org (1:3.2.1~rc1-2) UNRELEASED; urgency=low
+
+  * debian/rules, debian/control.in: stop building libmythes-dev (now built
+    again by mythes)
+
+ -- Rene Engelhard <r...@debian.org>  Wed, 12 May 2010 00:31:27 +0200
+
 openoffice.org (1:3.2.1~rc1-1) experimental; urgency=low
 
   * OpenOffice.org 3.2.1 rc1 (aka OOO320_m17)

=== modified file 'control'
--- a/control   2010-05-04 00:50:10 +0000
+++ b/control   2010-05-11 22:40:01 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <ha...@debian.org>, Rene Engelhard <r...@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], 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, 
imagemagick, 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] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 
1.15.1) , libgl1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64 
ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 kfreebsd-i386 
amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) ,
  libgraphite-dev [i386 m68k mips mipsel powerpc 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, python-all , 
debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc 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 s390 kfreebsd-i386 alpha 
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 
1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 
armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390 
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
mingw32-runtime [i386 mips mipsel powerpc s390 kfreebsd-i386 alp
 ha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , 
libcommons-codec-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java 
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel 
hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc 
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x 
sparc], libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , 
libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc s390 
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
libsac-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org 
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel 
hppa ia64 ppc64 s39
 0x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc s390 
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc 
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x 
sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc s390 
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
libloader-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
libformula-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
librepository-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
libfonts-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha 
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 
 s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc s390 
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , 
libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha 
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , 
xulrunner-dev [i386 mips mipsel powerpc s390 alpha amd64 kfreebsd-amd64 armel 
hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc 
s390 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 
kfreebsd-i386], libmono-dev (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 
kfreebsd-amd64 ia64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [i386 kfreebsd-i386 
amd64 kfreebsd-amd64 ia64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [i386 
kfreebsd-i386 amd64 kfreebsd-amd64 ia64 kfreebsd-i386] , libhunspell-dev (>= 
1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2
 -3) [i386] , libboost-dev (>= 1.38) , libvigraimpex-dev , libwpd8-dev (>= 
0.8.3-3) , libwps-dev , libwpg-dev , 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 s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 
s390x sparc] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) 
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel 
hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel 
powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 
s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc 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 , libn
 eon27-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, 
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], 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, 
imagemagick, 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] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 
1.15.1) , libgl1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64 
ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 kfreebsd-i386 
amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) ,
  libgraphite-dev [i386 m68k mips mipsel powerpc 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, python-all , 
debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc 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 s390 kfreebsd-i386 alpha 
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 
1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 
armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390 
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
mingw32-runtime [i386 mips mipsel powerpc s390 kfreebsd-i386 alp
 ha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , 
libcommons-codec-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java 
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel 
hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc 
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x 
sparc], libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , 
libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc s390 
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
libsac-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org 
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel 
hppa ia64 ppc64 s39
 0x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc s390 
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc 
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x 
sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc s390 
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
libloader-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
libformula-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
librepository-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], 
libfonts-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha 
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 
 s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc s390 
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , 
libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha 
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , 
xulrunner-dev [i386 mips mipsel powerpc s390 alpha amd64 kfreebsd-amd64 armel 
hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc 
s390 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 
kfreebsd-i386], libmono-dev (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 
kfreebsd-amd64 ia64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [i386 kfreebsd-i386 
amd64 kfreebsd-amd64 ia64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [i386 
kfreebsd-i386 amd64 kfreebsd-amd64 ia64 kfreebsd-i386] , libhunspell-dev (>= 
1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2
 -3) [i386] , libboost-dev (>= 1.38) , libvigraimpex-dev , libwpd8-dev (>= 
0.8.3-3) , libmythes-dev (>= 2:1.2) , libwps-dev , libwpg-dev , 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 s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa 
ia64 ppc64 s390x sparc] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 
2.3.2) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 
armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips 
mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 
ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc 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-Indep: fdupes, xml-core, netpbm, , libtextcat-data-utf8
 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)
 Standards-Version: 3.8.4
@@ -473,21 +473,6 @@
   * PocketWord
   * PocketExcel
 
-Package: libmythes-dev
-Section: libdevel
-Suggests: perl
-Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
-Depends: ${misc:Depends}
-Description: simple thesaurus library -- development files
- MyThes is a simple thesaurus that uses a structured
- text data file and an index file with binary search
- to lookup words and phrases and return information
- on part of speech, meanings, and synonyms
- .
- This package contains the static library and header file needed
- to develop applications using mythes and the perl script to create
- the index files.
-
 Package: openoffice.org-dtd-officedocument1.0
 Section: text
 Priority: extra

=== modified file 'control.in'
--- a/control.in        2010-05-04 00:50:10 +0000
+++ b/control.in        2010-05-11 22:40:01 +0000
@@ -765,21 +765,6 @@
   * PocketWord
   * PocketExcel
 
-Package: libmythes-dev
-Section: libdevel
-Suggests: perl
-Architecture: %OOO_ARCHS%
-Depends: ${misc:Depends}
-Description: simple thesaurus library -- development files
- MyThes is a simple thesaurus that uses a structured
- text data file and an index file with binary search
- to lookup words and phrases and return information
- on part of speech, meanings, and synonyms
- .
- This package contains the static library and header file needed
- to develop applications using mythes and the perl script to create
- the index files.
-
 Package: openoffice.orgVER-dtd-officedocument1.0
 Section: text
 Priority: extra

=== modified file 'rules'
--- a/rules     2010-05-09 16:41:20 +0000
+++ b/rules     2010-05-11 22:40:01 +0000
@@ -153,7 +153,7 @@
 LIBWPD8_MINVER= (>= 0.8.3-3)
 USE_SYSTEM_SABLOT=n
 USE_LIBXSLT=y
-USE_EXTERNAL_MYTHES=n
+USE_EXTERNAL_MYTHES=y
 USE_SYSTEM_ICU=y
 ICU_MINVER= (>= 4.0)
 USE_SYSTEM_LIBWPG=y
@@ -1032,9 +1032,8 @@
        CONFIGURE_FLAGS += --with-system-sablot
   endif
   ifeq "$(USE_EXTERNAL_MYTHES)" "y"
-       BUILD_DEPS += , libmythes-dev (>= 1:1.0-3)
+       BUILD_DEPS += , libmythes-dev (>= 2:1.2)
        CONFIGURE_FLAGS += --with-system-mythes
-       DEBHELPER_OPTIONS+= -Nlibmythes-dev
   endif
   ifeq "$(USE_SYSTEM_LIBWPS)" "y"
        BUILD_DEPS += , libwps-dev
@@ -2006,15 +2005,6 @@
                PATH=$(BUILD_PATH) DPKG="dpkg" PKGFORMAT="deb" 
NO_PKG_MANGLE=go-away \
                ../solenv/bin/build.pl && ../solenv/bin/deliver.pl
 
-ifneq "$(USE_EXTERNAL_MYTHES)" "y"
-       # build non-PIC version of libmythes
-       cd $(SOURCE_TREE)/lingucomponent/source/thesaurus/mythes && \
-               $(CXX) -O2 -Wall -ansi -pedantic -I. -I../../../inc/pch \
-                       -c mythes.cxx && \
-               ar rc libmythes_nopic.a mythes.o && ranlib libmythes_nopic.a && 
\
-               mv libmythes_nopic.a $(CURDIR)/$(SOURCE_TREE)
-endif
-
        touch $@
 
 test: $(STAMP_DIR)/test
@@ -2812,24 +2802,6 @@
        cp $(OOO_BUILD_TREE)/doc/data-from-remote-mysql-server.txt \
                $(PKGDIR)-base/usr/share/doc/openoffice.org$(VER)-base
 
-ifneq "$(USE_EXTERNAL_MYTHES)" "y"
-       # install libmythes and th_gen_idx.pl (on archs where we build OOo)
-       rm -rf debian/libmythes-dev
-       mkdir -p debian/libmythes-dev/usr/lib
-       mkdir -p debian/libmythes-dev/usr/include
-       mkdir -p debian/libmythes-dev/usr/share/mythes
-       install -m644 \
-               $(SOURCE_TREE)/lingucomponent/$(shell . $(SOURCE_TREE)/*.sh; 
echo $$OUTPATH$$PROEXT)/lib/libmythes.a \
-               debian/libmythes-dev/usr/lib/libmythes_pic.a
-       install -m644 \
-               $(SOURCE_TREE)/libmythes_nopic.a \
-               debian/libmythes-dev/usr/lib/libmythes.a
-       install -m644 
$(SOURCE_TREE)/lingucomponent/source/thesaurus/mythes/mythes.hxx \
-               debian/libmythes-dev/usr/include
-       install -m755 $(SOURCE_TREE)/dictionaries/util/th_gen_idx.pl \
-               debian/libmythes-dev/usr/share/mythes/th_gen_idx.pl
-endif
-
 ifeq "$(PACKAGE_SDK)" "y"
   ifeq "$(ENABLE_JAVA)" "y"
        # install the UNO Java sources for e.g. eclipse
@@ -3452,10 +3424,9 @@
          rm -rf debian/$$pkg/DEBIAN;\
        done
 
-       dh_installdocs -s -A -Nlibmythes-dev debian/README.Debian \
+       dh_installdocs -s -A debian/README.Debian \
                
$(SOURCE_TREE)/instsetoo_native/util/OpenOffice/replace_file/*/00/README \
                $(OOO_BUILD_TREE)/NEWS
-       dh_installdocs -plibmythes-dev debian/copyright
        for p in core pdfimport presenter-console mysql-connector 
filter-binfilter \
                evolution kab sdbc-postgresql presentation-minimizer; do \
                cat debian/openoffice.org-common.templates.in > 
debian/openoffice.org-$$p.templates; \
@@ -3473,13 +3444,10 @@
                done; \
        done
        if [ -s $(OOO_BUILD_TREE)/ChangeLog ]; then \
-               dh_installchangelogs -s -k -Nlibmythes-dev 
$(OOO_BUILD_TREE)/ChangeLog; \
+               dh_installchangelogs -s -k $(OOO_BUILD_TREE)/ChangeLog; \
        else \
-               dh_installchangelogs -s -k -Nlibmythes-dev; \
+               dh_installchangelogs -s -k; \
        fi
-ifneq "$(USE_EXTERNAL_MYTHES)" "y"
-       dh_installchangelogs -plibmythes-dev
-endif
        dh_installmime -s
        dh_installmenu -s
 ifeq "$(BUILD_JARS_NATIVE)" "y"

Reply via email to