[SCM] BOINC packaging branch, debian-folder-release, updated. c251009caf95a5bcff9b4c83636cf19fc21f5e68

[Steffen Moeller]

The following commit has been merged in the debian-folder-release branch:
commit c251009caf95a5bcff9b4c83636cf19fc21f5e68
Merge: 877652ec9a2ea18ce03f5a0ca834488322b56e2e 9a9498dba72f6f007629f8d8d04791df255f6a21
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Mon Mar 4 13:56:04 2013 +0100

    Merge branch 'debian-folder-release' of git+ssh://git.debian.org/git/pkg-boinc/boinc into debian-folder-release
    
    Conflicts:
    	debian/changelog
    	debian/patches/MainDocumentWarnings.patch
    	debian/patches/nvidia_mem_display_simplification.patch
    	debian/patches/series
    	debian/rules

diff --combined debian/changelog
index 62f03e1,96f21e7..8660f5f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,65 -1,13 +1,69 @@@
 +boinc (7.0.53+dfsg-1) UNRELEASED; urgency=low
 +
 +  [ Gianfranco Costamagna ]
 +  * New upstream release.
 +  * Added boincmgr_fix_long_pointers.patch to fix boincmgr crash
 +    Thanks Alyssa Milburn (Closes: #679207)
 +  * Added sleep to boinc-client init script to workaround GPU
 +    detection issues (lp: #933354).
 +
 +  [ Guo Yixuan ]
 +  * Reverted the workaround for #679207.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sun, 24 Feb 2013 23:05:30 +0100
 +
 +boinc (7.0.52+dfsg-2) experimental; urgency=low
 +
 +  * Try to fix ftbfs on hurd-i386.
 +  * Rebuild against libc6 2.13 (in sid).
 +
 + -- Guo Yixuan <culu.gyx at gmail.com>  Wed, 20 Feb 2013 16:16:45 +0800
 +
 +boinc (7.0.52+dfsg-1) experimental; urgency=low
 +
 +  * New upstream release, all platforms.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Thu, 14 Feb 2013 16:54:55 +0100
 +
 +boinc (7.0.51+dfsg-1) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 13 Feb 2013 22:15:44 +0100
 +
 +boinc (7.0.50+dfsg-1) experimental; urgency=low
 +
 +  * New upstream release.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sat, 09 Feb 2013 13:38:34 +0100
 +
 +boinc (7.0.48+dfsg-1) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 08 Feb 2013 15:42:50 +0100
 +
 +boinc (7.0.47+dfsg-1) UNRELEASED; urgency=low
 +
 +  * New upstream release, l10n updated.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Thu, 31 Jan 2013 22:09:35 +0100
 +
  boinc (7.0.46+dfsg-1) UNRELEASED; urgency=low
  
    * New upstream release
 +  * Fixed a FTBFS when building without zip library. (Closes: #699789)
  
   -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 29 Jan 2013 23:46:33 +0100
  
  boinc (7.0.45+dfsg-1) experimental; urgency=low
  
    * New upstream release
++<<<<<<< HEAD
 +  * Removed boinc zip library from client builds.
++=======
+   * Removed boinc zip library from client builds
++>>>>>>> 9a9498dba72f6f007629f8d8d04791df255f6a21
  
   -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 25 Jan 2013 00:01:24 +0100
  
@@@ -81,26 -29,24 +85,26 @@@ boinc (7.0.44+dfsg-1) UNRELEASED; urgen
  boinc (7.0.42+dfsg-1) UNRELEASED; urgency=low
  
    * New upstream release
 -  * Revised some patches
 +  * Revised some patches.
  
   -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 12 Dec 2012 01:53:09 +0100
  
  boinc (7.0.40+dfsg-1) UNRELEASED; urgency=low
  
    * New upstream release
 -  * Dropped mac_addresses_cores_in_kfreebsd.patch (file to patch deleted upstream) and ensure_there_is_no_newline_in_passwd.patch (applied upstream)
 +  * Dropped mac_addresses_cores_in_kfreebsd.patch (file to patch deleted upstream)
 +    and ensure_there_is_no_newline_in_passwd.patch (applied upstream)
    * Revised slot_dir_source_trace.patch
 -  * Removed some old patches
 +  * Removed some old patches.
  
   -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sat, 08 Dec 2012 01:26:23 +0100
  
  boinc (7.0.39+dfsg-1) UNRELEASED; urgency=low
  
    * New upstram release
 -  * Dropped add-missing-test-files.patch and add-missing-stripchart-samples.patch patch already applied upstream
 -  * Added link time optimisation
 +  * Dropped add-missing-test-files.patch and add-missing-stripchart-samples.patch patch
 +    already applied upstream
 +  * Added link time optimisation.
  
   -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 26 Nov 2012 00:11:23 +0100
  
@@@ -109,7 -55,7 +113,7 @@@ boinc (7.0.38+dfsg-1) UNRELEASED; urgen
    * New upstream release
    * Revised some patches (some of them should will be removed in a future commit)
    * Added add-missing-test-files.patch to fix a FTBFS 
 -  * Added add-missing-stripchart-samples.patch to fix another FTBFS
 +  * Added add-missing-stripchart-samples.patch to fix another FTBFS.
  
   -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 05 Nov 2012 13:16:32 +0100
  
diff --combined debian/patches/series
index 00b608a,c732fbb..5a8c7dc
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -60,6 -60,3 +60,5 @@@ dynamic_libboinc.patc
  Missing_libSched.patch
  fix-add-exclusive-app.patch
  zip_only_built_with_server.patch
- #fix-for-debian-bug-646583.patch
 +hurd-ftbfs.patch
 +boincmgr_fix_long_pointers.patch
diff --combined debian/rules
index a5d9c96,619577d..8f67206
--- a/debian/rules
+++ b/debian/rules
@@@ -105,11 -105,16 +105,11 @@@ ifeq ($(DEB_HOST_GNU_TYPE), i486-gnu
    #TYPE_FLAGS += --with-boinc-platform=i686-pc-hurd-gnu
  endif
  
--GCCVERSION=$(shell gcc --version | tr " " "\n" | egrep '^[0-9]+\.[0-9]+\.[0-9]+$$' | cut -f1,2 -d.)
 -# gcc 4.6 on precise has issues while gcc 4.7 on sid is just fine
 -ifneq (4.6,$(GCCVERSION))
 -ifneq (4.5,$(GCCVERSION))
 -ifneq (4.4,$(GCCVERSION))
 -  CFLAGS += -flto
 -  LDFLAGS += -flto
 -endif
 -endif
 -endif
 +
 +# Link-Time-Optimization
 +#CFLAGS += -flto
 +#LDFLAGS += -flto
++#GCCVERSION=$(shell gcc --version | tr " " "\n" | egrep '^[0-9]+\.[0-9]+\.[0-9]+$$' | cut -f1,2 -d.)
  
  CFLAGS += -Wall
  CXXFLAGS += -Wall

-- 
BOINC packaging