[pkg-boinc-commits] r452 - trunk/boinc/debian

[Frank S. Thomas]

Author: fst-guest
Date: 2006-06-13 08:48:33 +0000 (Tue, 13 Jun 2006)
New Revision: 452

Modified:
   trunk/boinc/debian/changelog
   trunk/boinc/debian/control
   trunk/boinc/debian/rules
Log:
Added Robert Millan's patch to aid backporting for sarge.


Modified: trunk/boinc/debian/changelog
===================================================================
--- trunk/boinc/debian/changelog	2006-06-13 06:26:05 UTC (rev 451)
+++ trunk/boinc/debian/changelog	2006-06-13 08:48:33 UTC (rev 452)
@@ -15,9 +15,13 @@
     README.Debian. See Ubuntu bug #48766 for more details.
   * Use /usr/bin/python as interpreter for update-boinc-applinks instead of
     /usr/bin/python2.4 and make boinc-client depend on "python (>= 2.3)" to
-    remove the unnecessary strict dependency on python2.4.
+    avoid the unnecessary strict dependency on Python 2.4.
+  * Made debian/rules compatible with sarge's version of dpkg-architecture and
+    added libcurl-ssl-dev as alternative for the libcurl3-openssl-dev build
+    dependency. These changes aid in backporting BOINC to sarge. Thanks to
+    Robert Millan for the patch. (closes: #373089)
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Tue, 13 Jun 2006 08:21:04 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Tue, 13 Jun 2006 10:47:30 +0200
 
 boinc (5.4.9-1) unstable; urgency=low
 

Modified: trunk/boinc/debian/control
===================================================================
--- trunk/boinc/debian/control	2006-06-13 06:26:05 UTC (rev 451)
+++ trunk/boinc/debian/control	2006-06-13 08:48:33 UTC (rev 452)
@@ -4,7 +4,7 @@
 Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Frank S. Thomas <frank at thomas-alfeld.de>, Christoph Martin <christoph.martin at uni-mainz.de>, Greg Norris <adric at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), dpatch, zlib1g-dev, libssl-dev, libcurl3-openssl-dev (>= 7.13.2), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), autotools-dev, docbook2x, docbook-xml, dh-buildinfo
+Build-Depends: debhelper (>= 5), dpatch, zlib1g-dev, libssl-dev, libcurl3-openssl-dev (>= 7.13.2) | libcurl-ssl-dev, freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), autotools-dev, docbook2x, docbook-xml, dh-buildinfo
 
 Package: boinc-client
 Section: net

Modified: trunk/boinc/debian/rules
===================================================================
--- trunk/boinc/debian/rules	2006-06-13 06:26:05 UTC (rev 451)
+++ trunk/boinc/debian/rules	2006-06-13 08:48:33 UTC (rev 452)
@@ -25,6 +25,15 @@
   DEB_BUILD_GNU_TYPE = i686-linux-gnu
 endif
 
+# This is the same as above, but only for compatibility with sarge's version
+# of dpkg-architecture.
+ifeq ($(DEB_HOST_GNU_TYPE), i386-linux)
+  DEB_HOST_GNU_TYPE = i686-linux-gnu
+endif
+ifeq ($(DEB_BUILD_GNU_TYPE), i386-linux)
+  DEB_BUILD_GNU_TYPE = i686-linux-gnu
+endif
+
 CFLAGS += -g -Wall
 CXXFLAGS += -g -Wall