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

CVS:oo-deb/debian MANIFEST.i386,1.29,1.30 MANIFEST.powerpc,1.33,1.34 MANIFEST.s390,1.21,1.22 MANIFEST.sparc,1.10,1.11 changelog,1.291,1.292 control,1.156,1.157 control.in,1.123,1.124 rules,1.194,1.195

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

Modified Files:
	MANIFEST.i386 MANIFEST.powerpc MANIFEST.s390 MANIFEST.sparc 
	changelog control control.in rules 
Log Message:
- build with system python
  - add PYTHON / PYMINOR / PYMAJOR variables in rules, we can't use the ones
    from $(ENVFILE) unfortunately since sourcing $(ENVFILE) in the binary-*
    targets makes the build fail since that doesn't work with fakeroot :/
  - MANIFEST.* updates
  - --with-python=$(PYTHON)
  - add mechanism to set a python-depends substvar to the right values
  - add python-dev to Build-Depends:
- mention new/changed ooo-build patches
- fix "version stripping" in rules to catch more cases
- remove rm -f's of {build,d}.lst files
- ifeq ($(ARCH),sparc) -> ifeq ($(ARCH)-linux,sparc-linux) for the check
  whether we should use sparc-linux-* as compiler


Index: MANIFEST.s390
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/MANIFEST.s390,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- MANIFEST.s390	22 Mar 2004 15:20:14 -0000	1.21
+++ MANIFEST.s390	12 Apr 2004 15:18:08 -0000	1.22
@@ -231,9 +231,6 @@
 usr/lib/openoffice/program/libpreload645l3.so
 usr/lib/openoffice/program/libproxyset.so
 usr/lib/openoffice/program/libpsp645l3.so
-usr/lib/openoffice/program/libpython.so
-usr/lib/openoffice/program/libpython.so.2
-usr/lib/openoffice/program/libpython.so.2.2.2
 usr/lib/openoffice/program/libpyuno.so
 usr/lib/openoffice/program/libreg.so
 usr/lib/openoffice/program/libreg.so.3

Index: MANIFEST.i386
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/MANIFEST.i386,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- MANIFEST.i386	22 Mar 2004 15:20:14 -0000	1.29
+++ MANIFEST.i386	12 Apr 2004 15:18:08 -0000	1.30
@@ -282,9 +282,6 @@
 usr/lib/openoffice/program/libprldap50.so
 usr/lib/openoffice/program/libproxyset.so
 usr/lib/openoffice/program/libpsp645li.so
-usr/lib/openoffice/program/libpython.so
-usr/lib/openoffice/program/libpython.so.2
-usr/lib/openoffice/program/libpython.so.2.2.2
 usr/lib/openoffice/program/libpyuno.so
 usr/lib/openoffice/program/libreg.so
 usr/lib/openoffice/program/libreg.so.3

Index: MANIFEST.sparc
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/MANIFEST.sparc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- MANIFEST.sparc	22 Mar 2004 15:20:14 -0000	1.10
+++ MANIFEST.sparc	12 Apr 2004 15:18:08 -0000	1.11
@@ -231,9 +231,6 @@
 usr/lib/openoffice/program/libpreload645ls.so
 usr/lib/openoffice/program/libproxyset.so
 usr/lib/openoffice/program/libpsp645ls.so
-usr/lib/openoffice/program/libpython.so
-usr/lib/openoffice/program/libpython.so.2
-usr/lib/openoffice/program/libpython.so.2.2.2
 usr/lib/openoffice/program/libpyuno.so
 usr/lib/openoffice/program/libreg.so
 usr/lib/openoffice/program/libreg.so.3

Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- control.in	6 Apr 2004 12:08:47 -0000	1.123
+++ control.in	12 Apr 2004 15:18:09 -0000	1.124
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0 [!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltl
 inuxhyph-dev | g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0 [!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltl
 inuxhyph-dev | g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev
 Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3)
 Standards-Version: 3.6.1
 

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- rules	6 Apr 2004 20:06:51 -0000	1.194
+++ rules	12 Apr 2004 15:18:09 -0000	1.195
@@ -44,6 +44,15 @@
 # Read in architecture-specific variables of importance.
 include debian/scripts/vars.$(ARCH)
 
+# python path and version
+PYTHON=/usr/bin/python
+PYMAJOR=$(shell $(PYTHON) -c "import sys; print sys.version_info[0]")
+PYMINOR=$(shell $(PYTHON) -c "import sys; print sys.version_info[1]")
+# this is for only supporting the default version
+# a.k.a a python-pyuno pkg
+PYTHON_DEPENDS=$(shell echo "python (>= $(PYMAJOR).$(PYMINOR)), \
+		python (<< $(PYMAJOR).$$(($(PYMINOR) +1)))")
+
 # Default flags to pass to configure
 CONFIGURE_FLAGS= --enable-libart \
 	         --disable-rpath \
@@ -53,7 +62,8 @@
 		 --with-system-nas \
 		 --with-system-sane-headers \
 		 --with-system-x11-extensions-headers \
-		 --with-system-unixodbc-headers
+		 --with-system-unixodbc-headers \
+		 --with-python=$(PYTHON)
 
 # If DEB_BUILD_OPTIONS contains jdkhome=/absolute/path/to/jdk, build with the
 # JDK at /absolute/path/to/jdk.
@@ -106,7 +116,7 @@
 # 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),sparc)
+  ifeq ($(ARCH)-linux,sparc-linux)
     # Use 32 bit compiler
     _CC:=sparc-linux-gcc
     CXX:=sparc-linux-g++
@@ -404,10 +414,6 @@
 	rm -f makefile.mk $(ENVFILE) $(ENVFILE).langpacks $(subst Env.Set.sh,Env.Set,$(ENVFILE)) \
 	      bootstrap
 
-	rm -f berkeleydb/prj/d.lst
-	rm -f extensions/prj/build.lst
-	rm -f vcl/prj/build.lst
-	rm -f connectivity/prj/build.lst
 	for i in xmlhelp/source/com/sun/star/help/*.java.in; do \
 		rm -f `basename $$i .in`; \
 	done
@@ -946,7 +952,8 @@
 	for i in $(MAINPKGDIR)/usr/share/applnk/*/*.desktop \
 		 $(MAINPKGDIR)/usr/share/applications/*.desktop \
 		 $(MAINPKGDIR)-mimelnk/usr/share/mimelnk/*/*.desktop; do \
-	    sed -e s/"$(OOVERSIONNO) "// < $$i > $$i.new; \
+	    sed -e s/"$(OOVERSIONNO) "// -e s/" $(OOVERSIONNO)"// \
+		-e s/"$(OOVERSIONNO)-"/"-"/ < $$i > $$i.new; \
 	    mv $$i.new $$i; \
 	done && \
 	for i in $(MAINPKGDIR)/usr/share/applnk/*/.directory; do \
@@ -1097,6 +1104,7 @@
 # causes ldd crashes sometimes when used with fakeroot:
 #          -l $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program 
 	dh_gencontrol  -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER))' \
+		-V'python-depends=$(PYTHON_DEPENDS)' \
 		-V'java-additional-depends=$(JAVA_ADDITIONAL_DEPENDS)'
 #		-v1.1.0+1.1.1rc3-`dpkg-parsechangelog  | grep urgency \
 #		| awk '{print $$2}' | sed -e s/"("// -e s/")"// | cut -d"-" -f2`

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- changelog	6 Apr 2004 13:39:42 -0000	1.291
+++ changelog	12 Apr 2004 15:18:08 -0000	1.292
@@ -5,9 +5,14 @@
       Martin-Éric Racine (closes: #236796)
     - build-use-old-libart.diff: Adapt from Red Hat patch to use older version
       of libart for Woody backport [DW, CH]
+    - build-pl-conditionals.diff: introduce conditionals into build.pl [DW]
   * Modified patches:
     - system-freetype.diff: Fix for Woody backport - use -lfreetype to link
       internal freetype [CH]
+    - system-python.diff: nearly complete, just some rc files missing [MK]
+    - config-switches.diff et al.: new system python stuff; make disabing
+      x11_extensions, sane and unixodbc projects build cleaner using
+      the new conditionals (see above) [RE]
   * debian/control.in:
     - modify libdb, libmyspell, libaltlinuxhyph, libcurl and newer
       libart build dependencies to not require them in Woody backport;
@@ -15,6 +20,7 @@
       lower the libart-2.0-dev one to >= 2.3.8 [RE, CH]
     - Standards-Version: 3.6.1 (no changes needed)
     - build-depend on gimp instead of gimp-perl, we now use script-fu [RE]
+    - add python-dev to Build-Depends: [RE]
   * debian/rules:
     - disable use of external libdb and libmyspell for woody builds,
       it won't work because we have to use g++-3.0 on woody and libdb3_cxx is
@@ -22,6 +28,7 @@
     - disable use of external libcurl for woody builds, too old... [CH]
     - disable use of extrnal libaltlinuxhyhph headers on woody builds... [CH]
     - fix debian/rules makebinariestar target for !i386 [RE]
+    - --with-python=/usr/bin/python [RE]
   * debian/scripts/xcftobmp:
     - use script-fu since gimp-perl is removed from sid [MK, RE]
   * Remove extra logic to generate Depends on debianutils (>2.0) for
@@ -29,7 +36,7 @@
     sensible-browser is not available, and this would have forced us to
     ship another package for the backport [CH]
 
- -- Rene Engelhard <rene@debian.org>  Tue,  6 Apr 2004 14:12:24 +0200
+ -- Rene Engelhard <rene@debian.org>  Sun, 11 Apr 2004 18:21:06 +0200
 
 openoffice.org (1.1.1-1) unstable; urgency=low
 

Index: MANIFEST.powerpc
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/MANIFEST.powerpc,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- MANIFEST.powerpc	22 Mar 2004 15:20:14 -0000	1.33
+++ MANIFEST.powerpc	12 Apr 2004 15:18:08 -0000	1.34
@@ -231,9 +231,6 @@
 usr/lib/openoffice/program/libpreload645lp.so
 usr/lib/openoffice/program/libproxyset.so
 usr/lib/openoffice/program/libpsp645lp.so
-usr/lib/openoffice/program/libpython.so
-usr/lib/openoffice/program/libpython.so.2
-usr/lib/openoffice/program/libpython.so.2.2.2
 usr/lib/openoffice/program/libpyuno.so
 usr/lib/openoffice/program/libreg.so
 usr/lib/openoffice/program/libreg.so.3

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- control	6 Apr 2004 12:09:16 -0000	1.156
+++ control	12 Apr 2004 15:18:09 -0000	1.157
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0 [!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltl
 inuxhyph-dev | g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0 [!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc], libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltl
 inuxhyph-dev | g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev
 Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3)
 Standards-Version: 3.6.1
Reply to: