[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[mdds] 09/62: Imported Debian patch 0.5.0-1



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository mdds.

commit 561877d64343d9b8a5d0cfb3fa3917afe9cad6c0
Merge: af03848 5c9607f
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Jan 7 23:29:53 2011 +0100

    Imported Debian patch 0.5.0-1

 Makefile.in                                        |  32 +-
 NEWS                                               |  30 +-
 VERSION.in                                         |   1 +
 bin/pack-release.sh.in                             |  12 -
 configure                                          |  50 +-
 debian/changelog                                   |   6 +
 debian/patches/DESTDIR.diff                        |  27 -
 ...bian-changes-0.4.0-1 => debian-changes-0.5.0-1} |  35 +-
 .../patches/dont_install_AUTHORS_NEWS_README.diff  |  10 +
 debian/patches/fix_doc_and_examples_install.diff   |  18 -
 debian/patches/series                              |   5 +-
 include/mdds/flat_segment_tree.hpp                 | 939 ++++-----------------
 include/mdds/flat_segment_tree_def.inl             | 686 +++++++++++++++
 include/mdds/flat_segment_tree_itr.hpp             | 189 +++++
 include/mdds/mixed_type_matrix_element.hpp         |   2 +-
 include/mdds/node.hpp                              | 133 ++-
 include/mdds/segment_tree.hpp                      | 131 +--
 include/{ => obsolete}/nodecontainer.hpp           |   0
 include/{ => obsolete}/rangetree.hpp               |   0
 misc/mdds.spec.in                                  |   4 +-
 src/flat_segment_tree_test.cpp                     | 685 +++++++++------
 src/mixed_type_matrix_test.cpp                     |  97 +--
 src/rectangle_set_test.cpp                         |  70 +-
 src/segment_tree_test.cpp                          |  71 +-
 src/test_global.hpp                                | 107 +++
 25 files changed, 1912 insertions(+), 1428 deletions(-)

diff --cc debian/changelog
index 54ec15c,0000000..a53d06c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,0 +1,35 @@@
++mdds (0.5.0-1) experimental; urgency=low
++
++  * New upstream release
++
++ -- Rene Engelhard <rene@debian.org>  Fri, 07 Jan 2011 23:29:53 +0100
++
 +mdds (0.4.0-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 21 Dec 2010 03:00:49 +0100
 +
 +mdds (0.3.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 21 Dec 2010 02:02:35 +0100
 +
 +mdds (0.3.0-3) unstable; urgency=high
 +
 +  * remove bogus temporary files from debian... 
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 24 Jun 2010 00:10:29 +0200
 +
 +mdds (0.3.0-2) unstable; urgency=low
 +
 +  * add debian/watch
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 14 May 2010 14:00:22 +0200
 +
 +mdds (0.3.0-1) unstable; urgency=low
 +
 +  * Initial release
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 13 May 2010 00:43:04 +0200
diff --cc debian/patches/debian-changes-0.5.0-1
index fb7c1e9,0000000..83c2eb3
mode 100644,000000..100644
--- a/debian/patches/debian-changes-0.5.0-1
+++ b/debian/patches/debian-changes-0.5.0-1
@@@ -1,158 -1,0 +1,145 @@@
- Description: Upstream changes introduced in version 0.4.0-1
++Description: Upstream changes introduced in version 0.5.0-1
 + This patch has been created by dpkg-source during the package build.
 + Here's the last changelog entry, hopefully it gives details on why
 + those changes were made:
 + .
-  mdds (0.4.0-1) experimental; urgency=low
++ mdds (0.5.0-1) experimental; urgency=low
 + .
 +   * New upstream release
 + .
 + The person named in the Author field signed this changelog entry.
 +Author: Rene Engelhard <rene@debian.org>
 +
 +---
 +The information above should follow the Patch Tagging Guidelines, please
 +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
 +are templates for supplementary fields that you might want to add:
 +
 +Origin: <vendor|upstream|other>, <url of original patch>
 +Bug: <url in upstream bugtracker>
 +Bug-Debian: http://bugs.debian.org/<bugnumber>
 +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
 +Forwarded: <no|not-needed|url proving that it has been forwarded>
 +Reviewed-By: <name and email of someone who approved the patch>
 +Last-Update: <YYYY-MM-DD>
 +
 +--- /dev/null
- +++ mdds-0.4.0/example/Makefile
+++++ mdds-0.5.0/VERSION
++@@ -0,0 +1 @@
+++0.5.0
++--- /dev/null
+++++ mdds-0.5.0/example/Makefile
 +@@ -0,0 +1,50 @@
 ++#************************************************************************
 ++#
 ++# Copyright (c) 2010 Kohei Yoshida
 ++# 
 ++# Permission is hereby granted, free of charge, to any person
 ++# obtaining a copy of this software and associated documentation
 ++# files (the "Software"), to deal in the Software without
 ++# restriction, including without limitation the rights to use,
 ++# copy, modify, merge, publish, distribute, sublicense, and/or sell
 ++# copies of the Software, and to permit persons to whom the
 ++# Software is furnished to do so, subject to the following
 ++# conditions:
 ++# 
 ++# The above copyright notice and this permission notice shall be
 ++# included in all copies or substantial portions of the Software.
 ++# 
 ++# 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 AND
 ++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
 ++# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 ++# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 ++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 ++# OTHER DEALINGS IN THE SOFTWARE.
 ++#
 ++#***********************************************************************
 ++
 ++CPPFLAGS=-DDEBUG_NODE_BASE -DUNIT_TEST -Wall -Os -g -pedantic-errors -std=c++0x -I../include
 ++
 ++EXEC= \
 ++	segment_tree \
 ++	flat_segment_tree \
 ++	rectangle_set \
 ++	point_quad_tree \
 ++	mixed_type_matrix
 ++
 ++all: $(EXEC)
 ++
 ++segment_tree: segment_tree.cpp
 ++
 ++flat_segment_tree: flat_segment_tree.cpp
 ++
 ++rectangle_set: rectangle_set.cpp
 ++
 ++point_quad_tree: point_quad_tree.cpp
 ++
 ++mixed_type_matrix: mixed_type_matrix.cpp
 ++
 ++clean:
 ++	rm -f $(EXEC)
 +--- /dev/null
- +++ mdds-0.4.0/misc/mdds.spec
- @@ -0,0 +1,62 @@
+++++ mdds-0.5.0/misc/mdds.spec
++@@ -0,0 +1,60 @@
 ++Name:           mdds
- +Version:        0.4.0
+++Version:        0.5.0
 ++Release:        1
 ++Url:            http://code.google.com/p/multidimalgorithm/
 ++License:        MIT/X11
 ++Source:         mdds_%{version}.tar.bz2
 ++Group:          Development/Libraries/C and C++
 ++Summary:        A collection of multi-dimensional data structure and indexing algorithm
 ++BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ++BuildRequires:  gcc-c++, libstdc++-devel, boost-devel 
 ++Requires:       boost-devel >= 1.39
 ++
 ++%description
 ++This library provides a collection of multi-dimensional data structure and indexing
 ++algorithm.  All data structures are available as C++ templates, hence this is a 
 ++header-only library, with no shared library to link against.
 ++
 ++Authors:
 ++--------
 ++    Kohei Yoshida <kyoshida@novell.com>
 ++
 ++%package        devel
 ++Url:            http://code.google.com/p/multidimalgorithm/
 ++License:        MIT/X11
 ++Group:          Development/Libraries/C and C++
 ++Summary:        A collection of multi-dimensional data structure and indexing algorithm
 ++
 ++%description    devel
 ++This library provides a collection of multi-dimensional data structure and indexing
 ++algorithms.  All data structures are available as C++ templates, hence this is a 
 ++header-only library, with no shared library to link against.
 ++
 ++Authors:
 ++--------
 ++    Kohei Yoshida <kyoshida@novell.com>
 ++
 ++%define _docdir %{_defaultdocdir}/mdds-devel
 ++
 ++%prep
 ++%setup -q -n %{name}_%{version}
 ++
 ++%build
- +./configure --prefix=%buildroot/usr
+++./configure --prefix=%buildroot/usr --docdir=%buildroot%{_docdir}
 ++
 ++%check
 ++#make check
 ++
 ++%install
 ++make install
 ++
 ++%clean
 ++rm -rf %buildroot
 ++
 ++%files devel
 ++%defattr(-,root,root)
 ++%dir %{_docdir}
- +%dir %{_datadir}/mdds-devel
 ++%{_includedir}/mdds  
- +%{_datadir}/mdds-devel/example  
 ++%doc %{_docdir}/*  
 ++
 ++%changelog
- --- /dev/null
- +++ mdds-0.4.0/bin/pack-release.sh
- @@ -0,0 +1,12 @@
- +#!/bin/bash
- +
- +VERSION=0.4.0
- +DIR=mdds_$VERSION
- +hg clone https://multidimalgorithm.googlecode.com/hg/ $DIR
- +pushd .
- +cd $DIR
- +autoconf
- +rm -rf autom4te.cache .hg .hgtags bin autogen.sh configure.ac
- +popd
- +find $DIR -name '*.vp?' -type f | xargs rm -f
- +tar jcvf $DIR.tar.bz2 $DIR
diff --cc debian/patches/dont_install_AUTHORS_NEWS_README.diff
index 0000000,0000000..606b96b
new file mode 100644
--- /dev/null
+++ b/debian/patches/dont_install_AUTHORS_NEWS_README.diff
@@@ -1,0 -1,0 +1,10 @@@
++--- mdds-0.5.0/Makefile.in-old	2011-01-07 23:27:10.000000000 +0100
+++++ mdds-0.5.0/Makefile.in	2011-01-07 23:29:07.000000000 +0100
++@@ -146,7 +146,6 @@
++ 	install -m 644 -t $(DESTDIR)@includedir@/mdds $(INCDIR)/mdds/*.hpp
++ 	install -m 644 -t $(DESTDIR)@includedir@/mdds $(INCDIR)/mdds/*.inl
++ 	install -m 644 -t $(DESTDIR)@includedir@/mdds/hash_container $(INCDIR)/mdds/hash_container/*.hpp
++-	install -m 644 -t $(DESTDIR)@docdir@ AUTHORS NEWS README
++ 
++ check: $(ALL_TESTS)
++ 
diff --cc debian/patches/series
index 5681058,0000000..175bdc5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
- DESTDIR.diff
- fix_doc_and_examples_install.diff
- debian-changes-0.4.0-1
++dont_install_AUTHORS_NEWS_README.diff
++debian-changes-0.5.0-1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/mdds.git


Reply to: