[med-svn] [Git][med-team/libmmmulti][master] 8 commits: Mark "M-A:foreign" and fix "Depends"

Nilesh Patra gitlab at salsa.debian.org
Tue Oct 27 12:24:09 GMT 2020



Nilesh Patra pushed to branch master at Debian Med / libmmmulti


Commits:
fc7fead4 by Nilesh Patra at 2020-10-27T17:29:01+05:30
Mark "M-A:foreign" and fix "Depends"

- - - - -
e4ff3f1d by Nilesh Patra at 2020-10-27T17:29:18+05:30
Add upstream/metadata

- - - - -
6e1c584f by Nilesh Patra at 2020-10-27T17:35:36+05:30
Minor Fixes: spaces and Description

- - - - -
5f1628c4 by Nilesh Patra at 2020-10-27T12:08:23+00:00
Add manpages

- - - - -
b8fef9a2 by Nilesh Patra at 2020-10-27T17:42:13+05:30
DEP-3

- - - - -
f2dd3626 by Nilesh Patra at 2020-10-27T17:49:09+05:30
Fix according to libatomic-queue include path

- - - - -
7243c1f3 by Nilesh Patra at 2020-10-27T17:49:52+05:30
Add myself to uploaders

- - - - -
efb8ad62 by Nilesh Patra at 2020-10-27T17:52:10+05:30
Ready to upload

- - - - -


10 changed files:

- debian/changelog
- debian/control
- + debian/createmanpages
- + debian/manpages
- + debian/mmmulti.1
- debian/patches/NoExternalSourceTrees.patch
- + debian/patches/fix-atomic-queue-include-path.patch
- debian/patches/series
- debian/rules
- + debian/upstream/metadata


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,5 @@
-libmmmulti (0.1-1) UNRELEASED; urgency=medium
+libmmmulti (0.1-1) unstable; urgency=medium
 
   * Initial release (Closes: #963718)
-  TODO: https://github.com/max0x7ba/atomic_queue.git
 
  -- Steffen Moeller <moeller at debian.org>  Thu, 25 Jun 2020 18:14:01 +0200


=====================================
debian/control
=====================================
@@ -2,7 +2,8 @@ Source: libmmmulti
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <moeller at debian.org>,
-           Andreas Tille <tille at debian.org>
+           Andreas Tille <tille at debian.org>,
+           Nilesh Patra <npatra974 at gmail.com>
 Build-Depends: debhelper-compat (= 13),
                libargs-dev,
                libatomicbitvector-dev,
@@ -21,8 +22,8 @@ Rules-Requires-Root: no
 Package: libmmmulti-dev
 Section: libdevel
 Architecture: any
-Multi-Arch: same
-Depends: mmmulti0 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: header files for mmmulti library
  Sometimes you have a lot of plain-old data, but you need random access
  to it. These header-only classes combine memory-mapped files with
@@ -48,6 +49,4 @@ Description: header files for mmmulti library
  multimap forms a key data processing kernel in the algorithm, it can
  scale to extremely large problem sizes, limited only by available disk
  space. Although performance is much slower than an in-memory structure,
- we are virtually guaranteed to be able to complete the compute.
- .
- This package contains header files and the static library
+ it is virtually guaranteed to be able to complete the compute.


=====================================
debian/createmanpages
=====================================
@@ -0,0 +1,28 @@
+#!/bin/sh
+MANDIR=debian
+mkdir -p $MANDIR
+
+VERSION=`dpkg-parsechangelog | awk '/^Version:/ {print $2}' | sed -e 's/^[0-9]*://' -e 's/-.*//' -e 's/[+~]dfsg$//'`
+NAME=`grep "^Description:" debian/control | sed 's/^Description: *//' | head -n1`
+PROGNAME=`grep "^Package:" debian/control | sed 's/^Package: *//' | head -n1`
+
+AUTHOR=".SH AUTHOR\n \
+This manpage was written by $DEBFULLNAME for the Debian distribution and\n \
+can be used for any other usage of the program.\
+"
+
+# If program name is different from package name or title should be
+# different from package short description change this here
+progname=mmmulti
+help2man --no-info --no-discard-stderr --help-option=" " \
+         --name="$NAME" \
+            --version-string="$VERSION" ${progname} > $MANDIR/${progname}.1
+echo $AUTHOR >> $MANDIR/${progname}.1
+
+echo "$MANDIR/*.1" > debian/manpages
+
+cat <<EOT
+Please enhance the help2man output.
+The following web page might be helpful in doing so:
+    http://liw.fi/manpages/
+EOT


=====================================
debian/manpages
=====================================
@@ -0,0 +1 @@
+debian/*.1


=====================================
debian/mmmulti.1
=====================================
@@ -0,0 +1,47 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
+.TH MMMULTI "1" "October 2020" "mmmulti 0.1" "User Commands"
+.SH NAME
+mmmulti \- header files for mmmulti library
+.SH DESCRIPTION
+.IP
+mmmulti {OPTIONS}
+.IP
+memmapped multimap interface
+.IP
+OPTIONS:
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help summary
+.TP
+\fB\-T[FILE]\fR, \fB\-\-test\-file\fR=\fI\,[FILE]\/\fR
+test mmmultimap with random data in this
+file
+.TP
+\fB\-s[N]\fR, \fB\-\-test\-size\fR=\fI\,[N]\/\fR
+test this many pairs
+.TP
+\fB\-M[N]\fR, \fB\-\-max\-value\fR=\fI\,[N]\/\fR
+generate test data in the range
+[1,max_value]
+.TP
+\fB\-t[N]\fR, \fB\-\-threads\fR=\fI\,[N]\/\fR
+number of threads to use
+.TP
+\fB\-u[N]\fR, \fB\-\-unique\-vals\fR=\fI\,[N]\/\fR
+number of unique value calls to make
+.TP
+\fB\-m\fR, \fB\-\-test\-multiset\fR
+test the multiset
+.TP
+\fB\-c\fR, \fB\-\-test\-complex\-values\fR
+test the multimap with complex values
+.TP
+\fB\-P\fR, \fB\-\-test\-unpadded\fR
+test the multimap without padding for
+random access
+.TP
+\fB\-I\fR, \fB\-\-test\-iitree\fR
+test the iitree from cranges
+.SH AUTHOR
+ This manpage was written by Nilesh Patra for the Debian distribution and
+ can be used for any other usage of the program.


=====================================
debian/patches/NoExternalSourceTrees.patch
=====================================
@@ -1,3 +1,7 @@
+Description: Do not use external libraries - use system libraries 
+Author: Steffen Moeller <moeller at debian.org>, Andreas Tille <tille at debian.org>, Nilesh Patra <npatra974 at gmail.com>
+Forwarded: not-needed
+Last-Update: 2020-10-27 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -11,8 +11,8 @@


=====================================
debian/patches/fix-atomic-queue-include-path.patch
=====================================
@@ -0,0 +1,37 @@
+Description: Fix according to the heder file path of libatomic-queue
+Author: Nilesh Patra <npatra974 at gmail.com>
+Forwarded: not-needed
+Last-Update: 2020-10-27 
+--- a/src/mmiitree.hpp
++++ b/src/mmiitree.hpp
+@@ -16,7 +16,7 @@
+ #include <functional>
+ #include <thread>
+ #include "ips4o.hpp"
+-#include "atomic_queue.h"
++#include "atomic_queue/atomic_queue.h"
+ 
+ /* Suppose there are N=2^(K+1)-1 sorted numbers in an array a[]. They
+  * implicitly form a complete binary tree of height K+1. We consider leaves to
+--- a/src/mmmultimap.hpp
++++ b/src/mmmultimap.hpp
+@@ -18,7 +18,7 @@
+ 
+ #include "sdsl/bit_vectors.hpp"
+ #include "ips4o.hpp"
+-#include "atomic_queue.h"
++#include "atomic_queue/atomic_queue.h"
+ 
+ namespace mmmulti {
+ 
+--- a/src/mmmultiset.hpp
++++ b/src/mmmultiset.hpp
+@@ -18,7 +18,7 @@
+ 
+ #include "sdsl/bit_vectors.hpp"
+ #include "ips4o.hpp"
+-#include "atomic_queue.h"
++#include "atomic_queue/atomic_queue.h"
+ 
+ namespace mmmulti {
+ 


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 NoExternalSourceTrees.patch
+fix-atomic-queue-include-path.patch


=====================================
debian/rules
=====================================
@@ -13,4 +13,3 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 #override_dh_auto_configure:
 #	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
-


=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,7 @@
+---
+Archive: GitHub
+Bug-Database: https://github.com/ekg/mmmulti/issues
+Bug-Submit: https://github.com/ekg/mmmulti/issues/new
+Changelog: https://github.com/ekg/mmmulti/tags
+Repository: https://github.com/ekg/mmmulti.git
+Repository-Browse: https://github.com/ekg/mmmulti



View it on GitLab: https://salsa.debian.org/med-team/libmmmulti/-/compare/360638594a1921b4dc75fd68a5249d6f774997cf...efb8ad6231dda9cc24e0ec79ff2cc70c1af5e155

-- 
View it on GitLab: https://salsa.debian.org/med-team/libmmmulti/-/compare/360638594a1921b4dc75fd68a5249d6f774997cf...efb8ad6231dda9cc24e0ec79ff2cc70c1af5e155
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201027/32ecbe74/attachment-0001.html>


More information about the debian-med-commit mailing list