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

[mdds] 05/62: Imported Debian patch 0.3.1-1



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

rene pushed a commit to branch master
in repository mdds.

commit ea93b20be8b0b2ec45a9d1a84c81dd8f0e73a974
Merge: f821295 c802da8
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Dec 21 02:02:35 2010 +0100

    Imported Debian patch 0.3.1-1

 Makefile => Makefile.in                            |   76 +-
 NEWS                                               |    5 +
 configure                                          | 2889 ++++++++++++++++++++
 debian/changelog                                   |    6 +
 debian/libmdds-dev.install                         |    2 +-
 debian/patches/DESTDIR.diff                        |   25 +
 debian/patches/fix_doc_and_examples_install.diff   |   17 +
 debian/patches/series                              |    2 +
 debian/rules                                       |   12 +-
 example/Makefile                                   |    2 +-
 example/point_quad_tree.cpp                        |    2 +-
 {inc => include}/mdds/flat_segment_tree.hpp        |    0
 {inc => include}/mdds/global.hpp                   |    0
 .../mdds/hash_container/map.hpp                    |   39 +-
 {inc => include}/mdds/node.hpp                     |    0
 {inc => include}/mdds/point_quad_tree.hpp          |  141 +-
 {inc => include}/mdds/quad_node.hpp                |    4 +-
 include/mdds/quad_type_matrix.hpp                  | 1269 +++++++++
 {inc => include}/mdds/rectangle_set.hpp            |    4 +-
 {inc => include}/mdds/segment_tree.hpp             |   24 +-
 {inc => include}/nodecontainer.hpp                 |    0
 {inc => include}/rangetree.hpp                     |    0
 src/point_quad_tree_test.cpp                       |   75 +-
 src/quad_type_matrix_test.cpp                      |  676 +++++
 24 files changed, 5162 insertions(+), 108 deletions(-)

diff --cc debian/changelog
index d30bd9f,0000000..51c72eb
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,0 +1,23 @@@
++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/libmdds-dev.install
index c04dd75,0000000..555dc00
mode 100644,000000..100644
--- a/debian/libmdds-dev.install
+++ b/debian/libmdds-dev.install
@@@ -1,1 -1,0 +1,1 @@@
- inc/mdds usr/include
++include/mdds usr/include
diff --cc debian/patches/DESTDIR.diff
index 0000000,0000000..fa761c0
new file mode 100644
--- /dev/null
+++ b/debian/patches/DESTDIR.diff
@@@ -1,0 -1,0 +1,25 @@@
++--- mdds-0.3.1.orig/Makefile.in
+++++ mdds-0.3.1/Makefile.in
++@@ -125,14 +125,14 @@ test.stl: stlperf_test
++ 	./stlperf_test
++ 
++ install: $(HEADERS)
++-	install -d @PREFIX@/include/mdds
++-	install -d @PREFIX@/include/mdds/hash_container
++-	install -d @PREFIX@/share/mdds-devel/example
++-	install -d @PREFIX@/share/doc/packages/mdds-devel/
++-	install -m 644 -t @PREFIX@/include/mdds $(INCDIR)/mdds/*.hpp
++-	install -m 644 -t @PREFIX@/include/mdds/hash_container $(INCDIR)/mdds/hash_container/*.hpp
++-	install -m 644 -t @PREFIX@/share/mdds-devel/example/ example/*
++-	install -m 644 -t @PREFIX@/share/doc/packages/mdds-devel/ AUTHORS NEWS README
+++	install -d $(DESTDIR)@PREFIX@/include/mdds
+++	install -d $(DESTDIR)@PREFIX@/include/mdds/hash_container
+++	install -d $(DESTDIR)@PREFIX@/share/mdds-devel/example
+++	install -d $(DESTDIR)@PREFIX@/share/doc/packages/mdds-devel/
+++	install -m 644 -t $(DESTDIR)@PREFIX@/include/mdds $(INCDIR)/mdds/*.hpp
+++	install -m 644 -t $(DESTDIR)@PREFIX@/include/mdds/hash_container $(INCDIR)/mdds/hash_container/*.hpp
+++	install -m 644 -t $(DESTDIR)@PREFIX@/share/mdds-devel/example/ example/*
+++	install -m 644 -t $(DESTDIR)@PREFIX@/share/doc/packages/mdds-devel/ AUTHORS NEWS README
++ 
++ check: $(ALL_TESTS)
++ 
diff --cc debian/patches/fix_doc_and_examples_install.diff
index 0000000,0000000..85d6bac
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix_doc_and_examples_install.diff
@@@ -1,0 -1,0 +1,17 @@@
++--- mdds-0.3.1.orig/Makefile.in
+++++ mdds-0.3.1/Makefile.in
++@@ -127,12 +127,10 @@ test.stl: stlperf_test
++ install: $(HEADERS)
++ 	install -d $(DESTDIR)@PREFIX@/include/mdds
++ 	install -d $(DESTDIR)@PREFIX@/include/mdds/hash_container
++-	install -d $(DESTDIR)@PREFIX@/share/mdds-devel/example
++-	install -d $(DESTDIR)@PREFIX@/share/doc/packages/mdds-devel/
+++	install -d $(DESTDIR)@PREFIX@/share/doc/libmdds-dev/examples
++ 	install -m 644 -t $(DESTDIR)@PREFIX@/include/mdds $(INCDIR)/mdds/*.hpp
++ 	install -m 644 -t $(DESTDIR)@PREFIX@/include/mdds/hash_container $(INCDIR)/mdds/hash_container/*.hpp
++-	install -m 644 -t $(DESTDIR)@PREFIX@/share/mdds-devel/example/ example/*
++-	install -m 644 -t $(DESTDIR)@PREFIX@/share/doc/packages/mdds-devel/ AUTHORS NEWS README
+++	install -m 644 -t $(DESTDIR)@PREFIX@/share/doc/libmdds-dev/examples/ example/*
++ 
++ check: $(ALL_TESTS)
++ 
diff --cc debian/patches/series
index 0000000,0000000..e050567
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++DESTDIR.diff
++fix_doc_and_examples_install.diff
diff --cc debian/rules
index aef6365,0000000..16a1e27
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,21 -1,0 +1,29 @@@
 +#!/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:
 +
 +override_dh_auto_test:
 +ifneq (nocheck,$(DEB_BUILD_OPTIONS))
- 	$(MAKE)
- 	for i in *_test; do ./$$i; done
++	$(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
++	
++	dh_clean

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


Reply to: