[SCM] BOINC packaging branch, master, updated. debian/6.4.5+dfsg-3-11-gf87328e

Fri Nov 6 07:51:07 UTC 2009

The following commit has been merged in the master branch:
commit dc65850619a7ef72074f81c4723aa5b5f3359112
Author: rmayorga <rmayorga at debian.org>
Date:   Thu Nov 5 21:48:06 2009 -0600

    remove more debian specific patches, update copyright info

diff --git a/debian/changelog b/debian/changelog
index 939f0ca..ea21872 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,16 @@ boinc (6.10.17+dfsg-1) unstable; urgency=low
   * New upstream release
   * debian/patches
     + 003_use_sensible-browser.patch updated
+    + 006_correct_catalog_path.patch - refreshed
     + 005_using_hyphen_as_minus.patch removed - Applied upstream
     + 101_check_RSA_returned_values.patch  - Removed - Applied upstream
     + 102_gcc4.4_safe.patch Removed - Applied upstram
     + 006_correct_catalog_path.patch - updated
-  * debian/copyright updated
+    + 002_remove_hardcoded_optimization.patch  Removed, not needed anymore
+    + 004_exclude_sea.patch - Removed - not needed anymore
+    + 001_dont_install_ca-bundle.crt.patch Removed not needed anymore
+  * debian/copyright 
+    + zip/zip and zip/unzip references removed
   * debian/rules
     + Adjust fix-perm for catalog files
 
diff --git a/debian/copyright b/debian/copyright
index 143bfef..21cce69 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -679,55 +679,6 @@ License: MPL-1.0
 
       Contributor(s): ______________________________________.''
 
-Files: zip/zip/*, zip/unzip/*
-Copyright: © 1990-2002 Info-ZIP
-License: other
- For the purposes of this copyright and license, "Info-ZIP" is defined as
- the following set of individuals:
-
-    Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
-    Jean-loup Gailly, Hunter Goatley, Ian Gorman, Chris Herborth, Dirk Haase,
-    Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz, David Kirschbaum,
-    Johnny Lee, Onno van der Linden, Igor Mandrichenko, Steve P. Miller,
-    Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs, Kai Uwe Rommel,
-    Steve Salisbury, Dave Smith, Christian Spieler, Antoine Verheijen,
-    Paul von Behren, Rich Wales, Mike White
-
- This software is provided "as is," without warranty of any kind, express
- or implied.  In no event shall Info-ZIP or its contributors be held liable
- for any direct, indirect, incidental, special or consequential damages
- arising out of the use of or inability to use this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
-     1. Redistributions of source code must retain the above copyright notice,
-        definition, disclaimer, and this list of conditions.
-
-     2. Redistributions in binary form (compiled executables) must reproduce
-        the above copyright notice, definition, disclaimer, and this list of
-        conditions in documentation and/or other materials provided with the
-        distribution.  The sole exception to this condition is redistribution
-        of a standard UnZipSFX binary as part of a self-extracting archive;
-        that is permitted without inclusion of this license, as long as the
-        normal UnZipSFX banner has not been removed from the binary or disabled.
-
-     3. Altered versions--including, but not limited to, ports to new operating
-        systems, existing ports with new graphical interfaces, and dynamic,
-        shared, or static library versions--must be plainly marked as such
-        and must not be misrepresented as being the original source.  Such
-        altered versions also must not be misrepresented as being Info-ZIP
-        releases--including, but not limited to, labeling of the altered
-        versions with the names "Info-ZIP" (or any variation thereof, including,
-        but not limited to, different capitalizations), "Pocket UnZip," "WiZ"
-        or "MacZip" without the explicit permission of Info-ZIP.  Such altered
-        versions are further prohibited from misrepresentative use of the
-        Zip-Bugs or Info-ZIP e-mail addresses or of the Info-ZIP URL(s).
-
-     4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
-        "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
-        own source and binary releases.
 
 Files: debian/*
 Copyright:
diff --git a/debian/patches/002_remove_hardcoded_optimization.patch b/debian/patches/002_remove_hardcoded_optimization.patch
deleted file mode 100644
index 4acb046..0000000
--- a/debian/patches/002_remove_hardcoded_optimization.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Frank S. Thomas <frank at thomas-alfeld.de>
-Description: remove hardcoded compiler flags from client/Makefile.am
-Bug: #427661
---- boinc.orig/client/Makefile.am
-+++ boinc/client/Makefile.am
-@@ -62,7 +62,7 @@
-     work_fetch.cpp
- 
- boinc_client_DEPENDENCIES =
--boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)
-+boinc_client_CPPFLAGS = $(AM_CPPFLAGS)
- boinc_client_LDFLAGS = -static-libgcc
- boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)
- 
diff --git a/debian/patches/004_exclude_sea.patch b/debian/patches/004_exclude_sea.patch
deleted file mode 100644
index 3e0e65d..0000000
--- a/debian/patches/004_exclude_sea.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Frank S. Thomas <frank at thomas-alfeld.de>
-Description: prevent building the self-extracting archive, since we
-don't need it in any case and this fixes a FTBFS on non-Linux hosts.
-Index: boinc-5.10.8/Makefile.am
-===================================================================
---- boinc-5.10.8.orig/Makefile.am	2006-08-31 23:16:36.000000000 +0200
-+++ boinc-5.10.8/Makefile.am	2007-06-26 08:57:42.000000000 +0200
-@@ -17,7 +17,7 @@
- endif
- 
- if BUILD_CLIENTGUI
--   CLIENTGUI_SUBDIRS = clientgui sea
-+   CLIENTGUI_SUBDIRS = clientgui
- endif
- 
- # ORDER MATTERS below.  One must build dependencies FIRST, then things
diff --git a/debian/patches/103_fix_ftbfs_on_kfreebsd.patch b/debian/patches/103_fix_ftbfs_on_kfreebsd.patch
deleted file mode 100644
index 7430f86..0000000
--- a/debian/patches/103_fix_ftbfs_on_kfreebsd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Author: Petr Salinger
-# Debian Bug: #544070
-# Description: fix FTBFS on kfreebsd
---- boinc.orig/zip/unzip/unzpriv.h
-+++ boinc/zip/unzip/unzpriv.h
-@@ -22,6 +22,7 @@
- #ifndef __unzpriv_h   /* prevent multiple inclusions */
- #define __unzpriv_h
- 
-+#include <unistd.h>
- /* First thing: Signal all following code that we compile UnZip utilities! */
- #ifndef UNZIP
- #  define UNZIP
diff --git a/debian/patches/series b/debian/patches/series
index 9e6633a..8e82cf3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-#103_fix_ftbfs_on_kfreebsd.patch  --   Needs to be removed maybe
-#001_dont_install_ca-bundle.crt.patch -- needs to be investigate
-#002_remove_hardcoded_optimization.patch -- needs to be investigate
 003_use_sensible-browser.patch 
 006_correct_catalog_path.patch

-- 
BOINC packaging

