------------------------------------------------------------
revno: 858
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2007-08-17 00:53:22 +0200
message:
* debian/control.in:
- fix libpq-dev builddep, thanks calc
* debian/rules:
- remove some more occurances of conditionals I missed to remove
in 2.3.0~src680m225-1
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2007-08-16 15:29:06 +0000
+++ b/changelog 2007-08-16 22:53:22 +0000
@@ -1,3 +1,13 @@
+openoffice.org (1:2.3.0~oog680m1-1.2pre) experimental; urgency=low
+
+ * debian/control.in:
+ - fix libpq-dev builddep, thanks calc
+ * debian/rules:
+ - remove some more occurances of conditionals I missed to remove
+ in 2.3.0~src680m225-1
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 17 Aug 2007 00:38:11 +0200
+
openoffice.org (1:2.3.0~oog680m1-1) experimental; urgency=low
* new upstream snapshot (OOG680_m1)
=== modified file 'control'
--- a/control 2007-08-15 10:18:10 +0000
+++ b/control 2007-08-16 22:53:22 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc
sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386
powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf
[i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64],
pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64
ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64],
libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc
amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386
powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64],
libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc
sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev
[i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64
ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386
powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64],
libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc
amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386
powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64],
netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64
ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc
sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64],
x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11)
[i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64
ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc
amd64 ppc64], , libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] ,
libdb4.4-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386
powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386
powerpc sparc amd64 ppc64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>=
1.0.65-4) [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc
amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] ,
libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1)
[i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] ,
libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc
amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64] , mono-mcs (>=
1.2.3) [i386 amd64], mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3)
[i386 amd64], mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4)
[i386 amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] ,
libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64 ppc64] ,
libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64 ppc64] ,
libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386
powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64
ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libwpg-dev [i386 powerpc
sparc amd64 ppc64] , libsvg-dev [i386 powerpc sparc amd64 ppc64] , libicu-dev
[i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64
ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64], libglitz-glx1-dev
[i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc
sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc amd64
ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev
(>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4)
[i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64
ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] ,
libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] ,
libneon26-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386
powerpc sparc amd64 ppc64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc
sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386
powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf
[i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64],
pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64
ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64],
libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc
amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386
powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64],
libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc
sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev
[i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64
ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386
powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64],
libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc
amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386
powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64],
netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64
ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc
sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64],
x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11)
[i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64
ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc
amd64 ppc64] , libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] ,
libdb4.4-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386
powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386
powerpc sparc amd64 ppc64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>=
1.0.65-4) [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc
amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] ,
libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1)
[i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] ,
libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc
amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64] , mono-mcs (>=
1.2.3) [i386 amd64], mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3)
[i386 amd64], mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4)
[i386 amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] ,
libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64 ppc64] ,
libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64 ppc64] ,
libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386
powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64
ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libwpg-dev [i386 powerpc
sparc amd64 ppc64] , libsvg-dev [i386 powerpc sparc amd64 ppc64] , libicu-dev
[i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64
ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64], libglitz-glx1-dev
[i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc
sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc amd64
ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev
(>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4)
[i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64
ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] ,
libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] ,
libneon26-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386
powerpc sparc amd64 ppc64]
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2)
Standards-Version: 3.7.2
XS-Python-Version: current
=== modified file 'control.in'
--- a/control.in 2007-08-15 10:18:10 +0000
+++ b/control.in 2007-08-16 22:53:22 +0000
@@ -49,7 +49,7 @@
unixodbc-dev (>= 2.2.11) [%OOO_ARCHS%],
libxml-parser-perl [%OOO_ARCHS%],
gperf [%OOO_ARCHS%],
- libpq-dev [%OOO_ARCHS%],
+ libpq-dev [%OOO_ARCHS%]
%BUILD_DEPS%
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2)
Standards-Version: 3.7.2
=== modified file 'rules'
--- a/rules 2007-08-15 17:31:59 +0000
+++ b/rules 2007-08-16 22:53:22 +0000
@@ -304,14 +304,12 @@
DBG_DBG_SUGGESTS+= , python-dbg
else
BUILD_DEPS += , debhelper (>= 5)
- BUILD_DEPS += python [$(OOO_ARCHS)]
+ BUILD_DEPS += , python [$(OOO_ARCHS)]
endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
- ifneq "$(PKGSOURCE)" "openoffice.org$(VER)-l10n"
STAMP_NATIVE_JARS = $(STAMP_DIR)/native-jars
- endif
BUILD_DEPS += , dpkg-dev (>= 1.13.19)
JAVA_GCJ_DEPENDS = libgcj-common (>= 1:4.1.1-14)
endif
@@ -795,13 +793,6 @@
dh_testdir
rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
rm -f $(STAMP_DIR)/setup
-ifeq "$(PKGSOURCE)" "openoffice.org$(VER)-l10n"
- rm -rf debian/ttf-opensymbol \
- debian/openoffice.org$(VER)-common \
- debian/openoffice.org$(VER)-dev-doc \
- debian/openoffice.org$(VER)-java-common \
- debian/openoffice.org$(VER)-l10n-en-us
-endif
dh_clean
# Clean compilation results, but leave solver (about 600Mb in addition to
instsetoo)
@@ -882,14 +873,6 @@
rm -rf $(OOO_L10N_DIR)
endif
-ifeq "$(PKGSOURCE)" "openoffice.org$(VER)-l10n"
- rm -rf debian/ttf-opensymbol \
- debian/openoffice.org$(VER)-common \
- debian/openoffice.org$(VER)-dev-doc \
- debian/openoffice.org$(VER)-java-common \
- debian/openoffice.org$(VER)-l10n-en-us
-endif
-
# uuencode upstream ooo-build binary files
set -e; \
cd ooo-build ; \
@@ -1001,19 +984,6 @@
-e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
< debian/control.in > debian/control
-ifeq "$(DISTREL)" "dapper"
- cat debian/control.2.in >> debian/control
-endif
-
-ifeq "$(PKGSOURCE)" "openoffice.org$(VER)-l10n"
- awk '{print} /^ *$$/ {exit}' debian/control > debian/control.l10n
- sed 's/Build-Depends:/Build-Depends-Indep:/' debian/control.l10n >
debian/control
- rm -f debian/control.l10n
-
- sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
- >> debian/control < debian/control.l10n.in
-endif
-
for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
[ "$$LNUM" = en-US -a "$(PKGSOURCE)" = "openoffice.org$(VER)-l10n"
] && continue; \
LNAME=`ooo-build/bin/openoffice-xlate-lang -l $$LNUM | perl -e
'print ucfirst(<STDIN>);'`; \
@@ -1085,40 +1055,38 @@
perl -pi -e 's|(Depends: openoffice.org$(VER)-writer,
openoffice.org$(VER)-l10n-en-us)|\1, ttf-devanagari-fonts|' \
debian/control
endif
-ifeq "$(PKGSOURCE)" "openoffice.org$(VER)"
- ifeq "$(ENABLE_JAVA)" "y"
- ifeq "$(BUILD_JARS_NATIVE)" "y"
+ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(BUILD_JARS_NATIVE)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.gcj.in
- endif
endif
- ifeq "$(ENABLE_MONO)" "y"
+endif
+ifeq "$(ENABLE_MONO)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.mono.in
- endif
- ifeq "$(PACKAGE_QA_TOOLS)" "y"
+endif
+ifeq "$(PACKAGE_QA_TOOLS)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.qa.in
- endif
- ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
+endif
+ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.mozilla.in
- endif
- ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
+endif
+ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.fonts.in
- endif
- ifeq "$(BUILD_DBG_PACKAGE)" "y"
+endif
+ifeq "$(BUILD_DBG_PACKAGE)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.debug.in
- endif
- ifeq "$(PACKAGE_SDK)" "y"
+endif
+ifeq "$(PACKAGE_SDK)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.sdk.in
- endif
+endif
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.postgresql.in
-endif
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_MONO_ARCHS%,$(OOO_MONO_ARCHS),g" debian/control
