[pkg-boinc-commits] r507 - in /trunk/boinc/debian: boinc-client.install boinc-manager.install changelog rules

[fst-guest at users.alioth.debian.org]

Author: fst-guest
Date: Thu Aug 24 20:29:04 2006
New Revision: 507

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=507
Log:
Applied Robert's patch to simplify the platform override.

Modified:
    trunk/boinc/debian/boinc-client.install
    trunk/boinc/debian/boinc-manager.install
    trunk/boinc/debian/changelog
    trunk/boinc/debian/rules

Modified: trunk/boinc/debian/boinc-client.install
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.install?rev=507&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.install (original)
+++ trunk/boinc/debian/boinc-client.install Thu Aug 24 20:29:04 2006
@@ -3,4 +3,4 @@
 debian/extra/log_flags.xml              etc/boinc-client
 debian/extra/remote_hosts.cfg           etc/boinc-client
 debian/extra/update-boinc-applinks      usr/bin
-debian/tmp/usr/bin/boinc_cmd            usr/bin
+lib/boinc_cmd                           usr/bin

Modified: trunk/boinc/debian/boinc-manager.install
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-manager.install?rev=507&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-manager.install (original)
+++ trunk/boinc/debian/boinc-manager.install Thu Aug 24 20:29:04 2006
@@ -1,2 +1,3 @@
+clientgui/boincmgr              usr/bin
 debian/icons/boincmgr-*.xpm     usr/share/pixmaps
 debian/boinc-manager.desktop    usr/share/applications

Modified: trunk/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/changelog?rev=507&op=diff
==============================================================================
--- trunk/boinc/debian/changelog (original)
+++ trunk/boinc/debian/changelog Thu Aug 24 20:29:04 2006
@@ -1,4 +1,4 @@
-boinc (5.4.11-1) UNRELEASED; urgency=low
+boinc (5.4.11-1) unstable; urgency=low
 
   * NOT RELEASED YET
 
@@ -8,8 +8,13 @@
     requested by Folkert van Heusden.
   * debian/control:
     - Removed Greg Norris <adric at debian.org> from the Uploaders field.
-
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Thu, 24 Aug 2006 17:20:12 +0200
+  * debian/rules:
+    - Applied patch from Robert Millan which simplifies the platform override
+      for i386. We are now using --target instead of the --build and --host
+      switches. This also needed some changes in boinc-client.install and
+      boinc-manager.install. Thanks Robert for the patch. (closes: #383871)
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Thu, 24 Aug 2006 22:27:59 +0200
 
 boinc (5.4.10-2) unstable; urgency=medium
 

Modified: trunk/boinc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/rules?rev=507&op=diff
==============================================================================
--- trunk/boinc/debian/rules (original)
+++ trunk/boinc/debian/rules Thu Aug 24 20:29:04 2006
@@ -16,22 +16,16 @@
 
 # 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.
+# download any application or work units, so we use --target i686-linux-gnu
+# to override it 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
+  TYPE_FLAGS += --target 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
+  TYPE_FLAGS += --target i686-linux-gnu
 endif
 
 CFLAGS += -g -Wall
@@ -170,9 +164,6 @@
 	#
 	# boinc-manager
 	#
-	install -D debian/tmp/usr/bin/boinc_gui \
-	  debian/boinc-manager/usr/bin/boincmgr
-	
 	for i in `ls locale/client`; do \
 	  if [ -f "locale/client/$$i/BOINC Manager.mo" ]; then \
 	    install -D -m644 "locale/client/$$i/BOINC Manager.mo" \