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

CVS:oo-deb/debian changelog,1.338.2.25.2.8,1.338.2.25.2.9 control,1.175.2.8.2.5,1.175.2.8.2.6 control.in,1.142.2.6.2.5,1.142.2.6.2.6 rules,1.214.2.14.2.10,1.214.2.14.2.11



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

Modified Files:
      Tag: OPENOFFICE_ORG680
	changelog control control.in rules 
Log Message:
Add per-distro mechanism for control.in


Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.10
retrieving revision 1.214.2.14.2.11
diff -u -d -r1.214.2.14.2.10 -r1.214.2.14.2.11
--- rules	19 Jan 2005 23:09:54 -0000	1.214.2.14.2.10
+++ rules	20 Jan 2005 22:03:37 -0000	1.214.2.14.2.11
@@ -33,6 +33,9 @@
 UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d- -f1)
 # Determine our architecture.
 ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+# Dist we are building for
+DIST := $(shell lsb_release -is)
+
 STAMP_DIR=debian/stampdir
 DEBHELPER_OPTIONS = -Nopenoffice.org$(VER)-java
 
@@ -157,7 +160,9 @@
 # Based on script by Martin Quinson <Martin.Quinson@tuxfamily.org>
 control: debian/control
 debian/control: debian/control.in debian/control.lang.in ooo-build/bin/openoffice-xlate-lang
-	sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
+	sed -e "s#openoffice.orgVER#openoffice.org$(VER)#g" \
+	    -e "s#%$(DIST)=\([^%]*\)%#, \1#g#" \
+	    -e "s#%[A-Za-z]*=[^%]*%##g#" \
 	    < debian/control.in > debian/control
 
 #	for LNUM in `ooo-build/bin/openoffice-xlate-lang -p all ` ; do \

Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.142.2.6.2.5
retrieving revision 1.142.2.6.2.6
diff -u -d -r1.142.2.6.2.5 -r1.142.2.6.2.6
--- control.in	20 Jan 2005 01:11:29 -0000	1.142.2.6.2.5
+++ control.in	20 Jan 2005 22:03:37 -0000	1.142.2.6.2.6
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev, libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev, libpng12-dev, dmake (>= 4.3-1), bzip2, libjpeg62-dev, libxml2-dev
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev, libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev, libpng12-dev, dmake (>= 4.3-1), bzip2, libjpeg62-dev, libxml2-dev, lsb-release %Ubuntu=libxinerama-dev, libarts1-dev, libqt3-mt-dev, xlibs-dev% 
 Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3), libart-2.0-dev (= 2.3.16-4), libidn11 (<< 0.5.2-1)
 Standards-Version: 3.6.1
 

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.25.2.8
retrieving revision 1.338.2.25.2.9
diff -u -d -r1.338.2.25.2.8 -r1.338.2.25.2.9
--- changelog	20 Jan 2005 01:11:28 -0000	1.338.2.25.2.8
+++ changelog	20 Jan 2005 22:03:37 -0000	1.338.2.25.2.9
@@ -26,11 +26,15 @@
     - remove get-ooo-icons target
     - add download target that runs script in ooo-build
   * debian/control.in:
+    - New syntax for distro-specific build dependencies: 
+      %Distroname=foo, bar% is added to control file if
+      Distroname matches output of lsb_release -si
     - add new build dependencies: libnss-dev, evolution-data-server-dev,
       kdelibs4-dev, libarchive-zip-perl, mozilla-dev, libnss-dev,
       libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev,
       libxml2-dev
     - update build dependencies: dmake -> dmake (>= 4.3-1)
+    - add dependencies for Ubuntu
   * debian/README: remove some obsolete documentation
 
  -- Rene Engelhard <rene@debian.org>  Thu, 20 Jan 2005 00:44:12 +0100

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.175.2.8.2.5
retrieving revision 1.175.2.8.2.6
diff -u -d -r1.175.2.8.2.5 -r1.175.2.8.2.6
--- control	20 Jan 2005 01:11:29 -0000	1.175.2.8.2.5
+++ control	20 Jan 2005 22:03:37 -0000	1.175.2.8.2.6
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev, libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev, libpng12-dev, dmake (>= 4.3-1), bzip2, libjpeg62-dev, libxml2-dev
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev, libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev, libpng12-dev, dmake (>= 4.3-1), bzip2, libjpeg62-dev, libxml2-dev, lsb-release  
 Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3), libart-2.0-dev (= 2.3.16-4), libidn11 (<< 0.5.2-1)
 Standards-Version: 3.6.1
 



Reply to: