tags 652786 + patch tags 652786 + pending thanks Dear maintainer,
I've prepared an NMU for pinot (versioned as 0.96-1.2) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru pinot-0.96/debian/changelog pinot-0.96/debian/changelog --- pinot-0.96/debian/changelog 2011-10-17 19:41:18.000000000 -0500 +++ pinot-0.96/debian/changelog 2012-01-30 01:11:28.000000000 -0600 @@ -1,3 +1,11 @@ +pinot (0.96-1.2) unstable; urgency=low + + * Non-Maintainer Upload. + * patches/boost1.48.patch: New. Include code from Boost singleton.hpp + header, obsoleted in Boost 1.48. Closes: #652786. + + -- Steve M. Robbins <[email protected]> Mon, 30 Jan 2012 01:11:28 -0600 + pinot (0.96-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru pinot-0.96/debian/copyright pinot-0.96/debian/copyright --- pinot-0.96/debian/copyright 2011-10-17 19:39:45.000000000 -0500 +++ pinot-0.96/debian/copyright 2012-01-30 01:06:13.000000000 -0600 @@ -121,6 +121,34 @@ David Paleino included as copyright holder only for the record, as his contributions was differently licensed (GPL-3+) and all since replaced. +Files: ./Utils/boost_singleton.hpp +Copyright: 2000, Stephen Cleary ([email protected]) +License: BSL-1.0 + Boost Software License - Version 1.0 - August 17th, 2003 + . + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + . + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + . + works are solely in the form of machine-executable object code generated by + a source language processor. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + License: GPL-2+ This file is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -179,3 +207,4 @@ License-Comment: Some files differ from above by replacing "this file" with more specific term. + diff -Nru pinot-0.96/debian/patches/boost1.48.patch pinot-0.96/debian/patches/boost1.48.patch --- pinot-0.96/debian/patches/boost1.48.patch 1969-12-31 18:00:00.000000000 -0600 +++ pinot-0.96/debian/patches/boost1.48.patch 2012-01-30 01:09:58.000000000 -0600 @@ -0,0 +1,130 @@ +Description: Include old boost header singleton.hpp + The software used a detail header that was obsoleted + and removed in Boost 1.48. This patch incorporates + the header singleton.hpp from Boost 1.47. +Bug-Debian: #652786 +Author: Tobias Frost <[email protected]> +Reviewed-By: Steve Robbins <[email protected]> + + +--- a/Utils/Memory.h ++++ b/Utils/Memory.h +@@ -15,6 +15,7 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ ++#include "boost_singleton.hpp" + + #ifndef _MEMORY_H + #define _MEMORY_H +--- /dev/null ++++ b/Utils/boost_singleton.hpp +@@ -0,0 +1,108 @@ ++// Copyright (C) 2000 Stephen Cleary ++// ++// Distributed under the Boost Software License, Version 1.0. (See ++// accompanying file LICENSE_1_0.txt or copy at ++// http://www.boost.org/LICENSE_1_0.txt) ++// ++// See http://www.boost.org for updates, documentation, and revision history. ++ ++#ifndef BOOST_POOL_SINGLETON_HPP ++#define BOOST_POOL_SINGLETON_HPP ++ ++// The following code might be put into some Boost.Config header in a later revision ++#ifdef __BORLANDC__ ++# pragma option push -w-inl ++#endif ++ ++// ++// The following helper classes are placeholders for a generic "singleton" ++// class. The classes below support usage of singletons, including use in ++// program startup/shutdown code, AS LONG AS there is only one thread ++// running before main() begins, and only one thread running after main() ++// exits. ++// ++// This class is also limited in that it can only provide singleton usage for ++// classes with default constructors. ++// ++ ++// The design of this class is somewhat twisted, but can be followed by the ++// calling inheritance. Let us assume that there is some user code that ++// calls "singleton_default<T>::instance()". The following (convoluted) ++// sequence ensures that the same function will be called before main(): ++// instance() contains a call to create_object.do_nothing() ++// Thus, object_creator is implicitly instantiated, and create_object ++// must exist. ++// Since create_object is a static member, its constructor must be ++// called before main(). ++// The constructor contains a call to instance(), thus ensuring that ++// instance() will be called before main(). ++// The first time instance() is called (i.e., before main()) is the ++// latest point in program execution where the object of type T ++// can be created. ++// Thus, any call to instance() will auto-magically result in a call to ++// instance() before main(), unless already present. ++// Furthermore, since the instance() function contains the object, instead ++// of the singleton_default class containing a static instance of the ++// object, that object is guaranteed to be constructed (at the latest) in ++// the first call to instance(). This permits calls to instance() from ++// static code, even if that code is called before the file-scope objects ++// in this file have been initialized. ++ ++namespace boost { ++ ++namespace details { ++namespace pool { ++ ++// T must be: no-throw default constructible and no-throw destructible ++template <typename T> ++struct singleton_default ++{ ++ private: ++ struct object_creator ++ { ++ // This constructor does nothing more than ensure that instance() ++ // is called before main() begins, thus creating the static ++ // T object before multithreading race issues can come up. ++ object_creator() { singleton_default<T>::instance(); } ++ inline void do_nothing() const { } ++ }; ++ static object_creator create_object; ++ ++ singleton_default(); ++ ++ public: ++ typedef T object_type; ++ ++ // If, at any point (in user code), singleton_default<T>::instance() ++ // is called, then the following function is instantiated. ++ static object_type & instance() ++ { ++ // This is the object that we return a reference to. ++ // It is guaranteed to be created before main() begins because of ++ // the next line. ++ static object_type obj; ++ ++ // The following line does nothing else than force the instantiation ++ // of singleton_default<T>::create_object, whose constructor is ++ // called before main() begins. ++ create_object.do_nothing(); ++ ++ return obj; ++ } ++}; ++template <typename T> ++typename singleton_default<T>::object_creator ++singleton_default<T>::create_object; ++ ++} // namespace pool ++} // namespace details ++ ++} // namespace boost ++ ++// The following code might be put into some Boost.Config header in a later revision ++#ifdef __BORLANDC__ ++# pragma option pop ++#endif ++ ++#endif ++ diff -Nru pinot-0.96/debian/patches/series pinot-0.96/debian/patches/series --- pinot-0.96/debian/patches/series 1969-12-31 18:00:00.000000000 -0600 +++ pinot-0.96/debian/patches/series 2012-01-30 01:06:33.000000000 -0600 @@ -0,0 +1 @@ +boost1.48.patch
signature.asc
Description: Digital signature
