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

[mdds] 56/62: Imported Debian patch 1.0.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 76adef02df513bb184335f53c6a8295ca8f703ff
Merge: c5043c5 e835330
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Nov 20 10:13:15 2015 +0100

    Imported Debian patch 1.0.0-1

 AUTHORS                                            |    6 +-
 NEWS => CHANGELOG                                  |   39 +-
 COPYING => LICENSE                                 |    2 +-
 Makefile.in                                        |   60 +-
 README                                             |  117 -
 README.md                                          |  153 ++
 configure                                          |   75 +-
 configure.ac                                       |   33 +-
 debian/changelog                                   |   12 +
 debian/control                                     |   24 +-
 debian/copyright                                   |    2 +-
 debian/docs                                        |    3 +-
 debian/libmdds-dev.install                         |    2 -
 debian/libmdds-doc.install                         |    1 +
 debian/patches/dont-install-unneeded-docfiles.diff |   20 +-
 debian/rules                                       |    2 +
 debian/watch                                       |    4 +-
 doc/conf.py                                        |  274 +++
 doc/doxygen.conf                                   | 2303 ++++++++++++++++++++
 doc/flat_segment_tree.rst                          |   48 +
 doc/index.rst                                      |   32 +
 doc/multi_type_matrix.rst                          |    7 +
 doc/multi_type_vector.rst                          |    7 +
 doc/point_quad_tree.rst                            |    7 +
 doc/rectangle_set.rst                              |    8 +
 doc/segment_tree.rst                               |    8 +
 doc/sorted_string_map.rst                          |    8 +
 include/mdds/compat/unique_ptr.hpp                 |   46 -
 include/mdds/flat_segment_tree.hpp                 |   59 +-
 include/mdds/flat_segment_tree_def.inl             |   23 +-
 include/mdds/flat_segment_tree_itr.hpp             |    2 +-
 include/mdds/global.hpp                            |   14 +-
 include/mdds/hash_container/map.hpp                |   45 -
 include/mdds/mixed_type_matrix.hpp                 |  240 --
 include/mdds/mixed_type_matrix_def.inl             |  338 ---
 include/mdds/mixed_type_matrix_element.hpp         |  170 --
 include/mdds/mixed_type_matrix_flag_storage.hpp    |  103 -
 include/mdds/mixed_type_matrix_storage.hpp         |  768 -------
 .../mixed_type_matrix_storage_filled_linear.inl    |  704 ------
 include/mdds/mixed_type_matrix_storage_sparse.inl  |  378 ----
 include/mdds/multi_type_matrix.hpp                 |    2 +-
 include/mdds/multi_type_vector.hpp                 |   36 +-
 include/mdds/multi_type_vector_def.inl             |  288 ++-
 include/mdds/multi_type_vector_itr.hpp             |    8 +-
 include/mdds/multi_type_vector_types.hpp           |   23 +-
 include/mdds/node.hpp                              |   26 +-
 include/mdds/point_quad_tree.hpp                   |  235 +-
 include/mdds/quad_node.hpp                         |   28 +-
 include/mdds/rectangle_set.hpp                     |   29 +-
 include/mdds/rectangle_set_def.inl                 |   95 +-
 include/mdds/segment_tree.hpp                      |  165 +-
 include/mdds/segment_tree_def.inl                  |  237 +-
 include/mdds/sorted_string_map_def.inl             |   11 +-
 misc/mdds.pc.in                                    |    4 +-
 src/array_creation_perf_test.cpp                   |    2 +-
 src/flat_segment_tree_test.cpp                     |   19 +-
 src/mixed_type_matrix_test.cpp                     | 1004 ---------
 src/multi_type_vector_test_custom.cpp              |   20 +-
 src/multi_type_vector_test_default.cpp             |   37 +-
 src/multi_type_vector_test_perf.cpp                |    1 -
 src/nodecontainer.cpp                              |   98 -
 src/point_quad_tree_test.cpp                       |    8 +-
 src/rangetree.cpp                                  |  725 ------
 src/rectangle_set_test.cpp                         |  130 +-
 src/segment_tree_test.cpp                          |  263 ++-
 src/sorted_string_map_test.cpp                     |   33 +-
 src/stlperf_test.cpp                               |    2 +-
 src/test_global.hpp                                |    2 +-
 68 files changed, 4031 insertions(+), 5647 deletions(-)

diff --cc debian/changelog
index bc750d1,0000000..ac114b6
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,199 -1,0 +1,211 @@@
++mdds (1.0.0-1) experimental; urgency=medium
++
++  * New upstream release
++
++  * build new doxygen docs and create libmdds-doc
++
++  * update copyright/control to point to github and update watch to
++    dev-www.libreoffice.org/src since http://kohei.us/files/mdds/src is 403.
++  * fix Maintainer to Debian LibreOffice Maintainers
++
++ -- Rene Engelhard <rene@debian.org>  Fri, 20 Nov 2015 10:13:15 +0100
++
 +mdds (0.12.1-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Sat, 20 Jun 2015 10:49:46 +0200
 +
 +mdds (0.12.0-2) unstable; urgency=medium
 +
 +  * upload to unstable
 +
 + -- Rene Engelhard <rene@debian.org>  Sun, 05 Apr 2015 18:58:32 +0200
 +
 +mdds (0.12.0-1) experimental; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 19 Feb 2015 23:22:06 +0100
 +
 +mdds (0.11.2-1) experimental; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 19 Dec 2014 14:08:18 +0100
 +
 +mdds (0.11.1-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 03 Oct 2014 10:03:49 +0000
 +
 +mdds (0.11.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 18 Sep 2014 20:46:50 +0200
 +
 +mdds (0.10.3-2) unstable; urgency=low
 +
 +  * upload to unstable 
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 06 May 2014 21:29:32 +0200
 +
 +mdds (0.10.3-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 25 Apr 2014 19:24:09 +0200
 +
 +mdds (0.10.2-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 12 Feb 2014 15:57:34 +0100
 +
 +mdds (0.10.1-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 16 Jan 2014 01:22:36 +0100
 +
 +mdds (0.9.1-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Mon, 21 Oct 2013 21:49:59 +0200
 +
 +mdds (0.8.1-4) unstable; urgency=low
 +
 +  * upload to unstable
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 28 Aug 2013 10:18:38 +0200
 +
 +mdds (0.8.1-3) experimental; urgency=low
 +
 +  * build with default boost again
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 21 Aug 2013 18:23:35 +0200
 +
 +mdds (0.8.1-2) unstable; urgency=low
 +
 +  * upload to unstable
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 23 Jul 2013 18:18:53 +0200
 +
 +mdds (0.8.1-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 21 May 2013 01:25:55 +0200
 +
 +mdds (0.8.0-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 09 May 2013 22:17:38 +0200
 +
 +mdds (0.7.1-3) unstable; urgency=low
 +
 +  * build using libboost1.53-dev to work around compile error
 +    with sids new gcc-4.7
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 09 May 2013 22:14:31 +0200
 +
 +mdds (0.7.1-2) unstable; urgency=low
 +
 +  * upload to unstable 
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 19 Apr 2013 00:52:59 +0200
 +
 +mdds (0.7.1-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 14 Mar 2013 22:54:54 +0100
 +
 +mdds (0.7.0-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 13 Mar 2013 01:53:55 +0100
 +
 +mdds (0.6.1-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 18 Sep 2012 18:44:10 +0200
 +
 +mdds (0.6.0-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 19 Jul 2012 21:05:12 +0200
 +
 +mdds (0.5.4-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Sun, 30 Oct 2011 21:50:26 +0000
 +
 +mdds (0.5.3-3) unstable; urgency=low
 +
 +  * rm -f VERSION example/Makefile misc/mdds.spec (closes: #643215) 
 +  * don't let Makefile install stuff into /usr/share/doc/mdds 
 +
 + -- Rene Engelhard <rene@debian.org>  Mon, 26 Sep 2011 23:16:31 +0000
 +
 +mdds (0.5.3-2) unstable; urgency=low
 +
 +  * upload to unstable 
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 30 Aug 2011 21:28:09 +0200
 +
 +mdds (0.5.3-1) experimental; urgency=low
 +
 +  * new upstream release 
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 15 Jul 2011 21:08:45 +0200
 +
 +mdds (0.5.2-1) experimental; urgency=low
 +
 +  * new upstream release
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 29 Mar 2011 00:13:11 +0200
 +
 +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/control
index 62ec1f8,0000000..a593d84
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,25 -1,0 +1,45 @@@
 +Source: mdds
 +Section: libdevel
 +Priority: optional
- Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
++Maintainer: Debian LibreOffice Maintaners <debian-openoffice@lists.debian.org>
 +Uploaders: Rene Engelhard <rene@debian.org>
 +Build-Depends: debhelper (>= 7.0.50~), libboost-dev (>= 1.39)
++Build-Depends-Indep: doxygen
 +Standards-Version: 3.8.4
- Homepage: http://code.google.com/p/multidimalgorithm/
++Homepage: https://gitlab.com/mdds/mdds
 +
 +Package: libmdds-dev
 +Architecture: all
 +Depends: ${shlibs:Depends}, ${misc:Depends}, libboost-dev (>= 1.39)
 +Description: Multi Dimension Data structure library -- headers
 + A collection of multi-dimensional data structure and indexing algorithm.
 + .
 + This is a C++ library, and is a collection of various data structures designed
 + to efficiently store and query multi-dimensional data for various
 + filtering criteria. Different structures are optimized for different
 + query needs.
 + .
 + This library is a source-code only library. It’s designed to be
 + header-only meaning that the user program does not need to link to any
 + additional shared library in order to use these data structures. The
 + data structures are all available as C++ templates.
 +
++Package: libmdds-doc
++Architecture: all
++Depends: ${misc:Depends}
++Section: doc
++Description: Multi Dimension Data structure library -- documentation
++ A collection of multi-dimensional data structure and indexing algorithm.
++ .
++ This is a C++ library, and is a collection of various data structures designed
++ to efficiently store and query multi-dimensional data for various
++ filtering criteria. Different structures are optimized for different
++ query needs.
++ .
++ This library is a source-code only library. It’s designed to be
++ header-only meaning that the user program does not need to link to any
++ additional shared library in order to use these data structures. The
++ data structures are all available as C++ templates.
++ .
++ This package contains the API documentation for mdds.
++
diff --cc debian/copyright
index c886c04,0000000..86ed12e
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,46 -1,0 +1,46 @@@
 +This work was packaged for Debian by:
 +
 +    Rene Engelhard <rene@debian.org> on Wed, 12 May 2010 22:21:19 +0200
 +
 +It was downloaded from:
 +
-     http://multidimalgorithm.googlecode.com/files/mdds_0.3.0.tar.bz2
++    https://gitlab.com/mdds/mdds
 +
 +Upstream Author:
 +
 +    Kohei Yoshida  <kohei.yoshida@gmail.com>
 +
 +Copyright:
 +
 +    Copyright (c) 2010 Kohei Yoshida
 +
 +License:
 +
 +MIT/X11:
 +
 + * 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.
 +
 +The Debian packaging is:
 +
 +    Copyright (C) 2010 Rene Engelhard <rene@debian.org>
 +
 +and under the same license as mdds itself.
diff --cc debian/docs
index 50bd824,0000000..b43bf86
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,2 -1,0 +1,1 @@@
- NEWS
- README
++README.md
diff --cc debian/libmdds-doc.install
index 0000000,0000000..f412fb5
new file mode 100644
--- /dev/null
+++ b/debian/libmdds-doc.install
@@@ -1,0 -1,0 +1,1 @@@
++doc/html/* usr/share/doc/libmdds-dev/docs/html
diff --cc debian/patches/dont-install-unneeded-docfiles.diff
index 9b2f2d5,0000000..2c2a135
mode 100644,000000..100644
--- a/debian/patches/dont-install-unneeded-docfiles.diff
+++ b/debian/patches/dont-install-unneeded-docfiles.diff
@@@ -1,10 -1,0 +1,18 @@@
 +--- mdds-0.6.1.orig/Makefile.in
 ++++ mdds-0.6.1/Makefile.in
- @@ -246,7 +246,6 @@
-  	install -m 644 @top_srcdir@/$(INCDIR)/mdds/compat/*.hpp $(DESTDIR)@includedir@/mdds/compat 
-  	install -m 644 @top_srcdir@/$(INCDIR)/mdds/hash_container/*.hpp $(DESTDIR)@includedir@/mdds/hash_container 
-  	install -m 644 $(MISCDIR)/mdds.pc $(DESTDIR)@datarootdir@/pkgconfig 
- -	install -m 644 @top_srcdir@/AUTHORS @top_srcdir@/COPYING @top_srcdir@/NEWS @top_srcdir@/README @top_srcdir@/VERSION $(DESTDIR)@docdir@ 
++@@ -210,8 +210,6 @@
++ 	$(CXX) $(LDFLAGS) $< -o $@
 + 
-  check: $(ALL_TESTS)
++ install: $(HEADERS)
++-	cp -a LICENSE COPYING
++-	cp -a CHANGELOG NEWS
++ 	install -d $(DESTDIR)$(INSTALL_INCDIR)/mdds
++ 	install -d $(DESTDIR)$(INSTALL_DOCDIR)
++ 	install -d $(DESTDIR)@datarootdir@
++@@ -219,7 +219,6 @@
++ 	install -m 644 @top_srcdir@/$(INCDIR)/mdds/*.hpp $(DESTDIR)$(INSTALL_INCDIR)/mdds
++ 	install -m 644 @top_srcdir@/$(INCDIR)/mdds/*.inl $(DESTDIR)$(INSTALL_INCDIR)/mdds
++ 	install -m 644 $(MISCDIR)/mdds.pc $(DESTDIR)@datarootdir@/pkgconfig/mdds-@API_VERSION@.pc
++-	install -m 644 @top_srcdir@/AUTHORS @top_srcdir@/COPYING @top_srcdir@/NEWS @top_srcdir@/README.md @top_srcdir@/VERSION $(DESTDIR)$(INSTALL_DOCDIR)
 + 
++ check: $(ALL_TESTS)
diff --cc debian/rules
index b83a05e,0000000..ccdb553
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,30 -1,0 +1,32 @@@
 +#!/usr/bin/make -f
 +# -*- makefile -*-
 +# Sample debian/rules that uses debhelper.
 +# This file was originally written by Joey Hess and Craig Small.
 +# As a special exception, when this file is copied by dh-make into a
 +# dh-make output file, you may use that output file without restriction.
 +# This special exception was added by Craig Small in version 0.37 of dh-make.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
 +%:
 +	dh  $@
 +
 +override_dh_auto_build:
++	$(MAKE) build-doc-doxygen
 +
 +override_dh_auto_test:
 +ifneq (nocheck,$(DEB_BUILD_OPTIONS))
 +	$(MAKE) check
 +endif
 +
 +override_dh_clean:
 +ifneq (nocheck,$(DEB_BUILD_OPTIONS))
 +	rm -rf obj
 +	rm -f *test
 +endif
 +	rm -f Makefile config.status config.log
 +	rm -f VERSION example/Makefile misc/mdds.spec misc/mdds.pc
++	rm -rf doc/html/* doc/xml/* doc/latex/*
 +
 +	dh_clean
diff --cc debian/watch
index ca11d7a,0000000..21c71af
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,6 -1,0 +1,6 @@@
 +version=3
 +opts=\
- downloadurlmangle=s|.*[?]name=(.*?)&.*|http://multidimalgorithm.googlecode.com/files/$1|,\
++downloadurlmangle=s|.*[?]name=(.*?)&.*|dev-www.libreoffice.org/src/$1|,\
 +filenamemangle=s|[^/]+[?]name=(.*?)&.*|$1| \
- http://code.google.com/p/multidimalgorithm/downloads/detail[?]name=mdds_([0-9.]+).tar.bz2&.*
++http://dev-www.libreoffice.org/src/mdds_([0-9.]+).tar.bz2
 +

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


Reply to: