Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv8881
Modified Files:
Tag: OPENOFFICE_ORG_1_1_3
.cvsignore changelog rules
Added Files:
Tag: OPENOFFICE_ORG_1_1_3
openoffice.org-bin.templates
Removed Files:
Tag: OPENOFFICE_ORG_1_1_3
openoffice.org-bin.templates.master
openoffice.org-dev-doc-java.install
openoffice.org-dev-doc.install
Log Message:
- mention l10n-YTL.diff
- remove openoffice.org-dev-doc*.install
- remove po-debconf workaround for woody
- remove woody backport specifics from debian/rules
--- NEW FILE: openoffice.org-bin.templates ---
Template: openoffice.org-bin/prelink
Type: boolean
Default: false
_Description: Prelink OpenOffice.org binaries?
OpenOffice.org's binaries can be prelinked if the prelink package
is installed.
.
Advantages of this are a faster startup and lesser memory needs since
the dynamic linker does not need to do much relocations.
.
However, prelinking modifies the files itself. After prelinking,
the MD5 checksums in the package don't match reality anymore; then the
checksums in the package can't be used to verify the package integrity
until the prelinking is undone.
.
You need to undo prelinking with 'dpkg-reconfigure openoffice.org-bin'.
--- openoffice.org-dev-doc.install DELETED ---
Index: .cvsignore
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/.cvsignore,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -d -r1.12.2.2 -r1.12.2.3
--- .cvsignore 13 Sep 2004 10:53:12 -0000 1.12.2.2
+++ .cvsignore 15 Oct 2004 12:01:48 -0000 1.12.2.3
@@ -21,7 +21,6 @@
*.preinst
*.prerm
*.debhelper
-openoffice.org-bin.templates
openoffice.org-java
ttf-opensymbol
openoffice.org-dev.links
--- openoffice.org-dev-doc-java.install DELETED ---
--- openoffice.org-bin.templates.master DELETED ---
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.231.2.10
retrieving revision 1.231.2.11
diff -u -d -r1.231.2.10 -r1.231.2.11
--- rules 14 Oct 2004 23:46:20 -0000 1.231.2.10
+++ rules 15 Oct 2004 12:01:49 -0000 1.231.2.11
@@ -56,7 +56,24 @@
--with-system-sane-headers \
--with-system-x11-extensions-headers \
--with-system-unixodbc-headers \
- --enable-gtk
+ --enable-gtk \
+ --with-system-db --with-db-version=$(D) \
+ --with-system-altlinuxhyph \
+ --with-system-curl \
+ --with-system-neon \
+ --with-system-myspell \
+ --enable-fontconfig \
+ --with-stlport4-home=$(STLPORT_HOME) \
+ --with-python=/usr/bin/python \
+ --enable-kde \
+ --enable-libsn
+
+D=4.2
+USE_SYSTEM_STLPORT=y
+STLPORT_HOME=/usr
+USE_SYSTEM_DB=y
+PATCHSET=Debian
+DEV_STL_DEPENDS=, libstlport4.6-dev
# If DEB_BUILD_OPTIONS contains jdkhome=/absolute/path/to/jdk, build with the
# JDK at /absolute/path/to/jdk.
@@ -114,42 +131,14 @@
# Package install directory
MAINPKGDIR:=$(CURDIR)/debian/openoffice.org$(VER)
-
-# automatic configuration for woody backports
-# check that default compiler is not gcc 2.x (as it is on Woody)
-ifneq (gcc-2.9,$(findstring gcc-2.9,$(shell readlink /usr/bin/gcc)))
- ## Normal unstable/experimental packaging
- ifeq ($(ARCH)-linux,sparc-linux)
- # Use 32 bit compiler
- _CC:=sparc-linux-gcc
- CXX:=sparc-linux-g++
- else
- _CC:=gcc
- CXX:=g++
- endif
- D=4.2
- USE_SYSTEM_STLPORT=y
- STLPORT_HOME=/usr
- USE_SYSTEM_DB=y
- PATCHSET=Debian
- CONFIGURE_FLAGS+= --with-system-db --with-db-version=$(D) \
- --with-system-altlinuxhyph --with-system-curl \
- --with-system-neon --with-system-myspell \
- --enable-fontconfig --with-stlport4-home=$(STLPORT_HOME) \
- --with-python=/usr/bin/python --enable-kde --enable-libsn
- DEV_STL_DEPENDS=, libstlport4.6-dev
+ifeq ($(ARCH)-linux,sparc-linux)
+ # Use 32 bit compiler
+ _CC:=sparc-linux-gcc
+ CXX:=sparc-linux-g++
else
- ## Woody backport
- # use latest gcc-3.x compiler version
- _CC:=$(shell cd /usr/bin; ls gcc-3.* | tail -1)
- CXX:=$(subst gcc,g++,$(_CC))
-
- # Don't use system libstlport
- USE_SYSTEM_STLPORT=n
- PATCHSET=DebianWoody
- D=$(shell ls -1 berkeleydb/download | cut -d"-" -f2 | cut -d"." -f1,2 | grep
-v CVS)
- DEBHELPER_OPTIONS=-Nopenoffice.org-kde
+ _CC:=gcc
+ CXX:=g++
endif
# gcc version can be overriden by setting GCCVER in scripts/vars[.arch]
@@ -185,14 +174,7 @@
CONFIGURE_FLAGS += --with-system-freetype
endif
-# do we have po-debconf available?
-ifeq (,$(wildcard /usr/bin/po2debconf))
- PO2DEBCONF := no
- MINDEBCONFVER := 0.5
-else
- PO2DEBCONF := yes
- MINDEBCONFVER := 1.2.0
-endif
+MINDEBCONFVER := 1.2.0
# Although we build with internal freetype on woody dpkg-shlibdeps
# inserts a libfreetype6 dependency. Work around this with a shlibs.local
@@ -340,18 +322,6 @@
clean: $(STAMP_DIR)/patch.unapply
dh_testdir config_office/configure.in
rm -f debian/MANIFEST.*.new
-ifeq ($(PO2DEBCONF),yes)
- # Hack for woody compatibility. This makes sure that the
- # debian/templates file shipped in the source package doesn't
- # specify encodings, which woody's debconf can't handle. If building
- # on a system with po-debconf installed (conveniently debhelper (>=
- # 4.1.16) depends on it), the binary-arch target will generate a
- # better version for sarge.
- echo 1 > debian/po/output
- po2debconf $(MAINPKGDIR)-bin.templates.master \
- > $(MAINPKGDIR)-bin.templates
- rm -f debian/po/output
-endif
#cd $(SOURCE_TREE)/dmake && \
# [ -f configure.orig ] && \
# mv -f configure.orig configure
@@ -1240,10 +1210,6 @@
&& gzip -f9 \
$(MAINPKGDIR)/usr/share/doc/openoffice.org/changelog.ooo-build; \
fi
-ifeq ($(PO2DEBCONF),yes)
- po2debconf -e utf8 $(MAINPKGDIR)-bin.templates.master \
- > $(MAINPKGDIR)-bin.templates
-endif
dh_installdebconf
dh_installmime
dh_installmenu
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.362.2.18
retrieving revision 1.362.2.19
diff -u -d -r1.362.2.18 -r1.362.2.19
--- changelog 14 Oct 2004 23:46:19 -0000 1.362.2.18
+++ changelog 15 Oct 2004 12:01:49 -0000 1.362.2.19
@@ -17,6 +17,8 @@
when printing per default [PM] (closes: #271883)
- sysui-mimetypes.diff: add MimeType entries to the
.desktop files (closes: #272638) [RE]
+ - l10n-YTL.diff: backport tr_TR localedata patch from cws_srx645_trcurrency
+ to add YTL (.tr currency as of 2005-01-01) support; make it default [RE]
* Removed patches:
- disable-odk-build: We now build the odk but with a patch to skip
the removed non-free documentation... [RE]
@@ -65,6 +67,9 @@
- fix .desktop files to support StartupNotify [RE]
- run dh_desktop, we need it to get update-desktop-database runs in
the maintainerscripts which is needed [RE]
+ - remove po-debconf workaround for woody, use normal po-debconf
+ mechanism (in dh_installdebconf) now [RE]
+ - remove woody backport specifics [RE]
* debian/openoffice-xlate-lang:
- add Basque, Lithuanian, Kannada, Tswana and Galician [RE]
* debian/scripts/vars:
@@ -82,8 +87,9 @@
* debian/java-lib.sh: use ${LIBSUFFIX} instead of hardcoded li to
make it work on !i386 [RE]
* debian/gnomevfs-lib.sh: add [RE]
+ * debian/openoffice.org-bin.templates.master: rename to .templates [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 14 Oct 2004 09:27:47 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 15 Oct 2004 12:08:15 +0200
openoffice.org (1.1.2-5) unstable; urgency=high
