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

[Frank S. Thomas]

Author: fst-guest
Date: 2006-02-05 20:21:13 +0000 (Sun, 05 Feb 2006)
New Revision: 358

Modified:
   trunk/boinc/debian/changelog
   trunk/boinc/debian/control
   trunk/boinc/debian/rules
Log:
* Call configure properly with the --build and --host switches as described in
  autotools-dev's README.Debian.
* Use "real package | virtual package" for boinc-dev's dependency on libc-dev
  and libstdc++-dev to make lintian happy.
* Fixed closes statement in last changelog entry to match the regex that is
  used by the DAK to identify bug closing changes.


Modified: trunk/boinc/debian/changelog
===================================================================
--- trunk/boinc/debian/changelog	2006-02-05 19:45:26 UTC (rev 357)
+++ trunk/boinc/debian/changelog	2006-02-05 20:21:13 UTC (rev 358)
@@ -1,6 +1,14 @@
+boinc (5.2.15-3) unstable; urgency=low
+
+  [ Frank S. Thomas ]
+  * Call configure properly with the --build and --host switches as described
+    in autotools-dev's README.Debian.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Sun,  5 Feb 2006 20:35:05 +0100
+
 boinc (5.2.15-2) unstable; urgency=low
 
-  * Uploaded to Debian (closes #281890).
+  * Uploaded to Debian (closes: #281890).
   
   [ Frank S. Thomas ]
   * Added boinc-manager.README.Debian to explain how to set the web browser

Modified: trunk/boinc/debian/control
===================================================================
--- trunk/boinc/debian/control	2006-02-05 19:45:26 UTC (rev 357)
+++ trunk/boinc/debian/control	2006-02-05 20:21:13 UTC (rev 358)
@@ -42,7 +42,7 @@
 Package: boinc-dev
 Section: devel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libc-dev, libstdc++-dev, libssl-dev, libmysqlclient15-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-dev | libc-dev, libstdc++6-4.0-dev | libstdc++-dev, libssl-dev, libmysqlclient15-dev
 Description: BOINC platform for distributed computing (development files)
  The Berkeley Open Infrastructure for Network Computing (BOINC) is a
  software platform for distributed computing using volunteered computer

Modified: trunk/boinc/debian/rules
===================================================================
--- trunk/boinc/debian/rules	2006-02-05 19:45:26 UTC (rev 357)
+++ trunk/boinc/debian/rules	2006-02-05 20:21:13 UTC (rev 358)
@@ -3,12 +3,24 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Include dpatch makefile.
 include /usr/share/dpatch/dpatch.make
 
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# Most BOINC projects only provide applications for i686.
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  TYPE_FLAGS = --build $(DEB_HOST_GNU_TYPE)
+else
+  TYPE_FLAGS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+# Most BOINC projects only provide their applications for i686-pc-linux-gnu.
+# If the core client reports that it was built for i486-pc-linux-gnu it won't
+# download any application or work units, so we use i686-linux-gnu as argument
+# for configure's --build and --host switches on i386 hosts.
+ifeq ($(DEB_HOST_GNU_TYPE), i486-linux-gnu)
+  DEB_HOST_GNU_TYPE = i686-linux-gnu
+endif
 ifeq ($(DEB_BUILD_GNU_TYPE), i486-linux-gnu)
   DEB_BUILD_GNU_TYPE = i686-linux-gnu
 endif
@@ -20,21 +32,21 @@
 CXXFLAGS_boinc-client := $(CXXFLAGS)
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  DEB_OPT_FLAG = -O0
-  DEB_OPT_FLAG_boinc-client = -O0
+  DEB_OPT_FLAGS = -O0
+  DEB_OPT_FLAGS_boinc-client = -O0
 else
-  DEB_OPT_FLAG = -O2
-  DEB_OPT_FLAG_boinc-client = -O3 -ffast-math
+  DEB_OPT_FLAGS = -O2
+  DEB_OPT_FLAGS_boinc-client = -O3 -ffast-math
 endif
 
-CFLAGS += $(DEB_OPT_FLAG)
-CXXFLAGS += $(DEB_OPT_FLAG)
+CFLAGS += $(DEB_OPT_FLAGS)
+CXXFLAGS += $(DEB_OPT_FLAGS)
 
-CFLAGS_boinc-client += $(DEB_OPT_FLAG_boinc-client)
-CXXFLAGS_boinc-client += $(DEB_OPT_FLAG_boinc-client)
+CFLAGS_boinc-client += $(DEB_OPT_FLAGS_boinc-client)
+CXXFLAGS_boinc-client += $(DEB_OPT_FLAGS_boinc-client)
 
 CFGFLAGS = \
-  --build=$(DEB_BUILD_GNU_TYPE) \
+  $(TYPE_FLAGS) \
   --prefix=/usr \
   --enable-client \
   --disable-server \
@@ -43,7 +55,7 @@
   CXXFLAGS="$(CXXFLAGS)"
 
 CFGFLAGS_boinc-client = \
-  --build=$(DEB_BUILD_GNU_TYPE) \
+  $(TYPE_FLAGS) \
   --enable-client \
   --disable-server \
   --with-ssl \