From 8fd6bbff78c34f7a3aaf6b07a61e92443b50d243 Mon Sep 17 00:00:00 2001 From: zhouganqing Date: Mon, 7 Nov 2022 15:38:35 +0800 Subject: [PATCH] Import Debian changes 2.0.3-ok1 mdds (2.0.3-ok1) yangtze; urgency=medium * Build for openKylin. --- debian/changelog | 5 ++ debian/compat | 1 + debian/control | 46 +++++++++++++++++++ debian/copyright | 46 +++++++++++++++++++ debian/docs | 1 + debian/libmdds-dev.examples | 1 + debian/libmdds-dev.install | 2 + debian/libmdds-doc.install | 1 + .../dont-install-unneeded-docfiles.diff | 18 ++++++++ debian/patches/reproducible-build.diff | 15 ++++++ debian/patches/series | 2 + debian/rules | 34 ++++++++++++++ debian/source/format | 1 + debian/tests/control | 3 ++ debian/tests/make-check | 19 ++++++++ debian/tests/patches/system-includes.diff | 35 ++++++++++++++ debian/watch | 4 ++ 17 files changed, 234 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100644 debian/libmdds-dev.examples create mode 100644 debian/libmdds-dev.install create mode 100644 debian/libmdds-doc.install create mode 100644 debian/patches/dont-install-unneeded-docfiles.diff create mode 100644 debian/patches/reproducible-build.diff create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/tests/control create mode 100755 debian/tests/make-check create mode 100644 debian/tests/patches/system-includes.diff create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..d5cd337 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +mdds (2.0.3-ok1) yangtze; urgency=medium + + * Build for openKylin. + + -- zhouganqing Mon, 07 Nov 2022 15:38:35 +0800 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..3ce9298 --- /dev/null +++ b/debian/control @@ -0,0 +1,46 @@ +Source: mdds +Section: libdevel +Priority: optional +Maintainer: Debian LibreOffice Maintaners +Uploaders: Rene Engelhard +Build-Depends: debhelper (>= 7.0.50~), libboost-dev (>= 1.39) +Build-Depends-Indep: doxygen +Build-Conflicts: expect, dejagnu +Standards-Version: 3.8.4 +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 --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..86ed12e --- /dev/null +++ b/debian/copyright @@ -0,0 +1,46 @@ +This work was packaged for Debian by: + + Rene Engelhard on Wed, 12 May 2010 22:21:19 +0200 + +It was downloaded from: + + https://gitlab.com/mdds/mdds + +Upstream Author: + + Kohei Yoshida + +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 + +and under the same license as mdds itself. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/debian/libmdds-dev.examples b/debian/libmdds-dev.examples new file mode 100644 index 0000000..0bf4be9 --- /dev/null +++ b/debian/libmdds-dev.examples @@ -0,0 +1 @@ +example/*.cpp diff --git a/debian/libmdds-dev.install b/debian/libmdds-dev.install new file mode 100644 index 0000000..331c2ba --- /dev/null +++ b/debian/libmdds-dev.install @@ -0,0 +1,2 @@ +usr/include/* +usr/share/pkgconfig/* diff --git a/debian/libmdds-doc.install b/debian/libmdds-doc.install new file mode 100644 index 0000000..534591b --- /dev/null +++ b/debian/libmdds-doc.install @@ -0,0 +1 @@ +doc/_doxygen/html/* usr/share/doc/libmdds-dev/docs/html diff --git a/debian/patches/dont-install-unneeded-docfiles.diff b/debian/patches/dont-install-unneeded-docfiles.diff new file mode 100644 index 0000000..2c2a135 --- /dev/null +++ b/debian/patches/dont-install-unneeded-docfiles.diff @@ -0,0 +1,18 @@ +--- mdds-0.6.1.orig/Makefile.in ++++ mdds-0.6.1/Makefile.in +@@ -210,8 +210,6 @@ + $(CXX) $(LDFLAGS) $< -o $@ + + 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 --git a/debian/patches/reproducible-build.diff b/debian/patches/reproducible-build.diff new file mode 100644 index 0000000..ac4260c --- /dev/null +++ b/debian/patches/reproducible-build.diff @@ -0,0 +1,15 @@ +Description: Make the build reproducible +Author: Chris Lamb +Last-Update: 2018-01-23 + +--- mdds-1.3.1.orig/doc/doxygen.conf ++++ mdds-1.3.1/doc/doxygen.conf +@@ -132,7 +132,7 @@ INLINE_INHERITED_MEMB = NO + # shortest path that makes the file name unique will be used + # The default value is: YES. + +-FULL_PATH_NAMES = YES ++FULL_PATH_NAMES = NO + + # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. + # Stripping is only done if one of the specified strings matches the left-hand diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a05935a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +#dont-install-unneeded-docfiles.diff +reproducible-build.diff diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..0a59888 --- /dev/null +++ b/debian/rules @@ -0,0 +1,34 @@ +#!/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_configure: + dh_auto_configure --buildsystem=autoconf + +override_dh_auto_build: + cd doc && doxygen doxygen.conf + +override_dh_auto_test: +ifneq (nocheck,$(DEB_BUILD_OPTIONS)) + $(MAKE) check +endif + +override_dh_clean: +ifneq (nocheck,$(DEB_BUILD_OPTIONS)) + rm -rf obj +endif + rm -f Makefile config.status config.log + rm -f VERSION example/Makefile misc/mdds.spec misc/mdds.pc + rm -rf doc/_doxygen + + dh_clean diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..7ace532 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,3 @@ +Tests: make-check +Depends: @builddeps@, libmdds-dev, dh-autoreconf, pkg-config +Restrictions: allow-stderr diff --git a/debian/tests/make-check b/debian/tests/make-check new file mode 100755 index 0000000..2c6de92 --- /dev/null +++ b/debian/tests/make-check @@ -0,0 +1,19 @@ +#!/bin/bash + +set -e +set -E + +function cleanup() { + dh_autoreconf_clean + patch -p1 -R < debian/tests/patches/system-includes.diff +} + +trap cleanup ERR + +patch -p1 < debian/tests/patches/system-includes.diff +dh_autoreconf +aclocal && automake +dh_auto_configure +make -C example check + +cleanup diff --git a/debian/tests/patches/system-includes.diff b/debian/tests/patches/system-includes.diff new file mode 100644 index 0000000..85367de --- /dev/null +++ b/debian/tests/patches/system-includes.diff @@ -0,0 +1,35 @@ +diff --git a/example/Makefile.am b/example/Makefile.am +index 877a5e2..3930e10 100644 +--- a/example/Makefile.am ++++ b/example/Makefile.am +@@ -1,5 +1,5 @@ + +-AM_CPPFLAGS = -I$(top_srcdir)/include -DNDEBUG ++AM_CPPFLAGS = $(shell pkg-config --cflags mdds-2.0) -DNDEBUG + + EXTRA_PROGRAMS = \ + flat-segment-tree \ +diff --git a/configure.ac b/configure.ac +index f2ad3e8..588db4e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,7 +13,6 @@ PACKAGE_TARNAME=AC_PACKAGE_TARNAME + AC_SUBST(PACKAGE_TARNAME) + + OBJDIR=obj +-INCDIR=include + MISCDIR=misc + QUICKCHECKDIR=quickcheck + AC_SUBST(OBJDIR) +@@ -134,11 +133,6 @@ AC_SUBST(CXXFLAGS_UNITTESTS) + + AC_CONFIG_FILES([ + Makefile +-include/Makefile +-include/mdds/Makefile +-include/mdds/multi_type_vector/Makefile +-include/mdds/multi_type_vector/aos/Makefile +-include/mdds/multi_type_vector/soa/Makefile + example/Makefile + test/Makefile + test/gdb/Makefile diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..4cb8cde --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=4 +opts=downloadurlmangle=s|gitlab.com/mdds/mdds/repository/(@ANY_VERSION@)/archive.tar.gz|kohei.us/files/mdds/src/@PACKAGE@-$1.tar.bz2|,repack,compression=bz2 \ +http://gitlab.com/mdds/mdds/tags .*/@ANY_VERSION@/archive\.tar\.gz +