CVS:oo-deb/debian .cvsignore,1.12.2.1,1.12.2.2 changelog,1.362.2.8,1.362.2.9 control,1.186.2.6,1.186.2.7 control.in,1.153.2.4,1.153.2.5 rules,1.231.2.5,1.231.2.6 openoffice.org-dev.links,1.1.2.1,NONE

[Rene Engelhard <rene@gluck.debian.org>]

Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv6277

Modified Files:
      Tag: OPENOFFICE_ORG_1_1_3
	.cvsignore changelog control control.in rules 
Removed Files:
      Tag: OPENOFFICE_ORG_1_1_3
	openoffice.org-dev.links 
Log Message:
- remove openoffice.org-dev.links again, generated, add to .cvsignore
- add logic wrt the stl headers in -dev and the depends


Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.153.2.4
retrieving revision 1.153.2.5
diff -u -d -r1.153.2.4 -r1.153.2.5
--- control.in	9 Sep 2004 13:33:38 -0000	1.153.2.4
+++ control.in	13 Sep 2004 10:53:13 -0000	1.153.2.5
@@ -128,7 +128,7 @@
 Package: openoffice.org-dev
 Architecture: i386 powerpc sparc s390 arm
 Section: devel
-Depends: ${shlibs:Depends}, openoffice.org-bin (= ${Source-Version}), libstlport4.6-dev, openoffice.org-debian-files (>> 1.1.2-1.1.3)
+Depends: ${shlibs:Depends}, openoffice.org-bin (= ${Source-Version}), ${dev-stl-depends}, openoffice.org-debian-files (>> 1.1.2-1.1.3)
 Recommends: c++-compiler, dmake
 Suggests: ${perl:Depends}
 Replaces: openoffice.org (<< 1.1.2+1.1.3)

--- openoffice.org-dev.links DELETED ---

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.362.2.8
retrieving revision 1.362.2.9
diff -u -d -r1.362.2.8 -r1.362.2.9
--- changelog	9 Sep 2004 13:33:37 -0000	1.362.2.8
+++ changelog	13 Sep 2004 10:53:12 -0000	1.362.2.9
@@ -6,6 +6,8 @@
   * New major patches:
     - vfs-*: GNOME VFS Support [MM]
     - vclplug/*: VCLPlug Backport from 2.0 tree [MM]
+    - wpd/*: WordPerfect filter support [MM et al.], linking to a
+      libwpd snapshot statically for now...
   * Removed patches:
     - disable-odk-build: We now build the odk but with a patch to skip
       the removed non-free documentation... [RE]
@@ -73,8 +75,9 @@
     debian/openoffice.org-gnomevfs.install: add [RE]
   * debian/openoffice.org-dev*.install: add [RE]
   * debian/openoffice.org-dev.links.in: add [RE]
+  * debian/openoffice.org-bin.shlibs: add [RE]
 
- -- Rene Engelhard <rene@debian.org>  Thu,  9 Sep 2004 15:09:54 +0200
+ -- Rene Engelhard <rene@debian.org>  Sun, 12 Sep 2004 18:02:12 +0200
 
 openoffice.org (1.1.2-3) unstable; urgency=medium
 

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.231.2.5
retrieving revision 1.231.2.6
diff -u -d -r1.231.2.5 -r1.231.2.6
--- rules	9 Sep 2004 13:33:41 -0000	1.231.2.5
+++ rules	13 Sep 2004 10:53:13 -0000	1.231.2.6
@@ -138,6 +138,7 @@
                     --with-system-neon --with-system-myspell \
                     --enable-fontconfig --with-stlport4-home=$(STLPORT_HOME) \
                     --with-python=/usr/bin/python --enable-kde
+  DEV_STL_DEPENDS=, libstlport4.6-dev
 else
   ## Woody backport
   # use latest gcc-3.x compiler version
@@ -926,7 +927,17 @@
 	sed -e s,@OS@,`dpkg-architecture -qDEB_HOST_GNU_SYSTEM`, \
 		< $(MAINPKGDIR)-dev.links.in > $(MAINPKGDIR)-dev.links
 	dh_install $(DEBHELPER_OPTIONS) --sourcedir=debian/tmp -a
-	
+
+# when we use external stlport we can just symlink to the "normal"
+# stlport development headers; otherwise we need to install them...
+ifeq "$(USE_SYSTEM_STLPORT)" "y"
+	cd $(MAINPKGDIR)-dev/usr/include/openoffice && \
+		ln -s /usr/include/stlport stl
+else
+	cp -ra $(CURDIR)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/inc/stl \
+		$(MAINPKGDIR)-dev/usr/include/openoffice
+endif
+
 ifneq "$(MOZILLA)" "n"
 ifeq "$(ARCH)" "i386"
 	for i in libmozab2.so libmozabdrv2.so; do \
@@ -1219,7 +1230,8 @@
 #          -l $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program 
 	dh_gencontrol -- \
 		-V'debconf-depends=debconf (>= $(MINDEBCONFVER)) | debconf-2.0' \
-		-V'java-additional-depends=$(JAVA_ADDITIONAL_DEPENDS)'
+		-V'java-additional-depends=$(JAVA_ADDITIONAL_DEPENDS)' \
+		-V'dev-stl-depends=${DEV_STL_DEPENDS}'
 #		-v1.1.1+1.1.2rc3-`dpkg-parsechangelog  | grep urgency \
 #		| awk '{print $$2}' | sed -e s/"("// -e s/")"// | cut -d"-" -f2`
 	dh_md5sums

Index: .cvsignore
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/.cvsignore,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- .cvsignore	17 Aug 2004 23:26:24 -0000	1.12.2.1
+++ .cvsignore	13 Sep 2004 10:53:12 -0000	1.12.2.2
@@ -24,3 +24,4 @@
 openoffice.org-bin.templates
 openoffice.org-java
 ttf-opensymbol
+openoffice.org-dev.links

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.186.2.6
retrieving revision 1.186.2.7
diff -u -d -r1.186.2.6 -r1.186.2.7
--- control	9 Sep 2004 13:33:37 -0000	1.186.2.6
+++ control	13 Sep 2004 10:53:13 -0000	1.186.2.7
@@ -128,7 +128,7 @@
 Package: openoffice.org-dev
 Architecture: i386 powerpc sparc s390 arm
 Section: devel
-Depends: ${shlibs:Depends}, openoffice.org-bin (= ${Source-Version}), libstlport4.6-dev, openoffice.org-debian-files (>> 1.1.2-1.1.3)
+Depends: ${shlibs:Depends}, openoffice.org-bin (= ${Source-Version}), ${dev-stl-depends}, openoffice.org-debian-files (>> 1.1.2-1.1.3)
 Recommends: c++-compiler, dmake
 Suggests: ${perl:Depends}
 Replaces: openoffice.org (<< 1.1.2+1.1.3)