[med-svn] [Git][med-team/libdisorder][master] 12 commits: Create watch file using mode=git

Andreas Tille gitlab at salsa.debian.org
Sun Apr 15 11:05:39 BST 2018 

Andreas Tille pushed to branch master at Debian Med / libdisorder


Commits:
bbccdcd3 by Andreas Tille at 2018-04-15T10:48:23+02:00
Create watch file using mode=git

- - - - -
a910d0fd by Andreas Tille at 2018-04-15T10:48:38+02:00
New upstream version 0.0.2+git20130809.8062ee1
- - - - -
006437b4 by Andreas Tille at 2018-04-15T10:48:38+02:00
Update upstream source from tag 'upstream/0.0.2+git20130809.8062ee1'

Update to upstream version '0.0.2+git20130809.8062ee1'
with Debian dir ed45ebcd37e8091d2da84b1f1a682286d770bccd
- - - - -
d18c0726 by Andreas Tille at 2018-04-15T10:51:19+02:00
In upstream Git the code is found in subdir code/

- - - - -
80f0e4f8 by Andreas Tille at 2018-04-15T10:52:41+02:00
Do not parse d/changelog

- - - - -
50ddb898 by Andreas Tille at 2018-04-15T10:53:31+02:00
Remove unneeded get-orig-source target

- - - - -
f7291706 by Andreas Tille at 2018-04-15T10:54:54+02:00
Standards-Version: 4.1.4

- - - - -
2f5abb9d by Andreas Tille at 2018-04-15T10:55:05+02:00
Point Vcs fields to salsa.debian.org

- - - - -
fd86e09a by Andreas Tille at 2018-04-15T10:55:44+02:00
debhelper 11

- - - - -
43df4862 by Andreas Tille at 2018-04-15T11:10:19+02:00
Fix dir name with code

- - - - -
60dfcfd8 by Andreas Tille at 2018-04-15T11:20:20+02:00
Add override for d-shlibs to build on kfreebsd as well

- - - - -
b808663d by Andreas Tille at 2018-04-15T12:04:56+02:00
Upload to unstable

- - - - -


24 changed files:

- README
- CONTRIBUTORS → code/CONTRIBUTORS
- COPYING → code/COPYING
- LICENSE → code/LICENSE
- + code/README
- TODO → code/TODO
- VERSION → code/VERSION
- include/disorder.h → code/include/disorder.h
- man/shannon_H.3 → code/man/shannon_H.3
- src/Makefile → code/src/Makefile
- src/disorder.c → code/src/disorder.c
- test/entropy.png → code/test/entropy.png
- test/test.c → code/test/test.c
- tool/ropy.c → code/tool/ropy.c
- debian/changelog
- debian/compat
- debian/control
- − debian/get-orig-source
- debian/patches/autoconf.patch
- debian/patches/cpp.patch
- debian/patches/handle-large-inputs-correctly.patch
- debian/patches/thread-safety.patch
- debian/rules
- debian/watch


Changes:

=====================================
README
=====================================
--- a/README
+++ b/README
@@ -1,23 +1,17 @@
-libdisorder: entropy measurement
-$Id$
-----------------------------------------------------------------------------
+The libdisorder project is a simple C library for entropy measurement of
+byte streams and other data.
 
-This is a readme file. See 
+The homepage is:
 
-     http://libdisorder.freshdefense.net/
+     http://libdisorder.freshdefense.net
 
-for more information.
+You can also retrieve the code from:
 
-libdisorder is a small, simple C library for use by programmers in
-other programs. There is a small test program included that opens
-/dev/urandom and calls libdisorder in the `test/' directory. There is
-also a command-line tool, `ropy' in the `tool/' directory for reporting
-on the entropy of normal files.
+     http://code.dyne.org/?r=libdisorder
 
-You will probably want to pipe the output of libdisorder to some other
-math analysis or graphing environment (e.g., gnuplot).
-
-The library's primary function reports entropy in bits: essentially,
-this is the number of bits necessary to encode the actual level of
-information contained in the data passed to the library: it is the
-theoretical maximum amount of compression possible.
\ No newline at end of file
+Plans include adding new entropy measurement functions as well as a module
+for supporting the parsing or chunking of data format tokens (for example,
+this mechanism would support measuring the entropy of an HTML document in
+terms of the tags it uses, where each tag is considered a "token"). This
+mechanism can be extended to any structured data format: files, network
+protocols, etc.
\ No newline at end of file


=====================================
CONTRIBUTORS → code/CONTRIBUTORS
=====================================


=====================================
COPYING → code/COPYING
=====================================


=====================================
LICENSE → code/LICENSE
=====================================


=====================================
code/README
=====================================
--- /dev/null
+++ b/code/README
@@ -0,0 +1,23 @@
+libdisorder: entropy measurement
+$Id$
+----------------------------------------------------------------------------
+
+This is a readme file. See 
+
+     http://libdisorder.freshdefense.net/
+
+for more information.
+
+libdisorder is a small, simple C library for use by programmers in
+other programs. There is a small test program included that opens
+/dev/urandom and calls libdisorder in the `test/' directory. There is
+also a command-line tool, `ropy' in the `tool/' directory for reporting
+on the entropy of normal files.
+
+You will probably want to pipe the output of libdisorder to some other
+math analysis or graphing environment (e.g., gnuplot).
+
+The library's primary function reports entropy in bits: essentially,
+this is the number of bits necessary to encode the actual level of
+information contained in the data passed to the library: it is the
+theoretical maximum amount of compression possible.
\ No newline at end of file


=====================================
TODO → code/TODO
=====================================


=====================================
VERSION → code/VERSION
=====================================


=====================================
include/disorder.h → code/include/disorder.h
=====================================


=====================================
man/shannon_H.3 → code/man/shannon_H.3
=====================================


=====================================
src/Makefile → code/src/Makefile
=====================================


=====================================
src/disorder.c → code/src/disorder.c
=====================================


=====================================
test/entropy.png → code/test/entropy.png
=====================================
Binary files a/test/entropy.png and b/code/test/entropy.png differ


=====================================
test/test.c → code/test/test.c
=====================================


=====================================
tool/ropy.c → code/tool/ropy.c
=====================================


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libdisorder (0.0.2+git20130809.8062ee1-1) unstable; urgency=medium
+
+  * Create watch file using mode=git
+  * Do not parse d/changelog
+  * Remove unneeded get-orig-source target
+  * Standards-Version: 4.1.4
+  * Point Vcs fields to salsa.debian.org
+  * debhelper 11
+  * Add override for d-shlibs to build on kfreebsd as well
+
+ -- Andreas Tille <tille at debian.org>  Sun, 15 Apr 2018 11:20:27 +0200
+
 libdisorder (0.0.2-1) unstable; urgency=medium
 
   * Initial release (Closes: #828787)


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,11 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9),
-               dh-autoreconf,
+Build-Depends: debhelper (>= 11~),
                d-shlibs
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libdisorder.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/libdisorder.git
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/med-team/libdisorder
+Vcs-Git: https://salsa.debian.org/med-team/libdisorder.git
 Homepage: https://github.com/locasto/libdisorder
 
 Package: libdisorder0


=====================================
debian/get-orig-source deleted
=====================================
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-
-COMPRESS=xz
-
-NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-MVERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/^\([0-9\.]\+\)[+~][-0-9]\+$/\1/'`
-
-mkdir -p ../tarballs
-cd ../tarballs
-# need to clean up the tarballs dir first because upstream tarball might
-# contain a directory with unpredictable name
-rm -rf *
-git clone --quiet https://github.com/locasto/libdisorder
-cd $NAME
-#VERSION=${MVERSION}+`date -d @$(git show --format="%at" | head -n1) +%Y%m%d`
-VERSION=$(cat code/VERSION | head -n1)
-# for esthetical reasons set file timestamps (if git-restore-mtime is installed)
-git restore-mtime || true
-rm -f README
-mv code/* .
-rmdir code
-cd ..
-TARDIR=${NAME}-${VERSION}
-mv ${NAME} ${TARDIR}
-rm -rf ${TARDIR}/.git
-
-GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$VERSION".orig.tar.${COMPRESS} "${TARDIR}"
-rm -rf ${TARDIR}


=====================================
debian/patches/autoconf.patch
=====================================
--- a/debian/patches/autoconf.patch
+++ b/debian/patches/autoconf.patch
@@ -3,7 +3,7 @@ Last-Update: Mon, 27 Jun 2016 23:57:12 +0200
 Description: Add autoconf stuff to enable simple library creation
 
 --- /dev/null
-+++ b/Makefile.am
++++ b/code/Makefile.am
 @@ -0,0 +1,16 @@
 +lib_LTLIBRARIES  = libdisorder.la
 +libdisorder_la_SOURCES = src/disorder.c
@@ -22,7 +22,7 @@ Description: Add autoconf stuff to enable simple library creation
 +TEST_EXTENSIONS = .sh
 +SH_LOG_COMPILER = /bin/sh
 --- /dev/null
-+++ b/configure.ac
++++ b/code/configure.ac
 @@ -0,0 +1,47 @@
 +#                                               -*- Autoconf -*-
 +# Process this file with autoconf to produce a configure script.
@@ -72,7 +72,7 @@ Description: Add autoconf stuff to enable simple library creation
 +AC_OUTPUT
 +
 --- /dev/null
-+++ b/test/gpl.sh
++++ b/code/test/gpl.sh
 @@ -0,0 +1,18 @@
 +#!/bin/sh
 +


=====================================
debian/patches/cpp.patch
=====================================
--- a/debian/patches/cpp.patch
+++ b/debian/patches/cpp.patch
@@ -2,8 +2,8 @@ Author: Andreas Tille <tille at debian.org>
 Last-Update: Wed, 22 Jun 2016 16:27:46 +0200
 Description: Allow C++ name space
 
---- a/include/disorder.h
-+++ b/include/disorder.h
+--- a/code/include/disorder.h
++++ b/code/include/disorder.h
 @@ -24,6 +24,10 @@
  #ifndef __DISORDER_H_
  #define __DISORDER_H_


=====================================
debian/patches/handle-large-inputs-correctly.patch
=====================================
--- a/debian/patches/handle-large-inputs-correctly.patch
+++ b/debian/patches/handle-large-inputs-correctly.patch
@@ -2,8 +2,8 @@ Author: Guus Sliepen <guus at debian.org>
 Last-Update: 2016-06-28 00:05:18 +0200
 Description: Handle inputs up to 2^63 in length
 
---- a/src/disorder.c
-+++ b/src/disorder.c
+--- a/code/src/disorder.c
++++ b/code/src/disorder.c
 @@ -30,7 +30,7 @@
  #endif
  
@@ -13,7 +13,7 @@ Description: Handle inputs up to 2^63 in length
  static __thread float m_token_probs[LIBDO_MAX_BYTES]; //P(each token appearing)
  static __thread int m_num_tokens = 0; //actual number of `seen' tokens, max 256
  static __thread float m_maxent = 0.0;
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,7 @@ static void
  get_token_frequencies(char* buf, 
  		      long long length)
  {
@@ -22,7 +22,7 @@ Description: Handle inputs up to 2^63 in length
    char* itr=NULL;
    unsigned char c=0;
  
-@@ -129,7 +129,7 @@
+@@ -129,7 +129,7 @@ shannon_H(char* buf,
    float bits = 0.0;
    char* itr=NULL; //values of itr should be zero to 255
    unsigned char token;


=====================================
debian/patches/thread-safety.patch
=====================================
--- a/debian/patches/thread-safety.patch
+++ b/debian/patches/thread-safety.patch
@@ -2,8 +2,8 @@ Author: Guus Sliepen <guus at debian.org>
 Last-Update: 2016-06-28 00:05:18 +0200
 Description: Make library thread-safe
 
---- a/src/disorder.c
-+++ b/src/disorder.c
+--- a/code/src/disorder.c
++++ b/code/src/disorder.c
 @@ -30,12 +30,12 @@
  #endif
  


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -2,12 +2,10 @@
 
 # DH_VERBOSE := 1
 
-DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with autoreconf
+	dh $@  --sourcedirectory=code
 
 override_dh_install:
 	dh_install
@@ -15,8 +13,6 @@ override_dh_install:
 		    --multiarch \
 		    --devunversioned \
 		    --exclude-la \
+		    --override s/ld-kfreebsd-x86-64-1-dev// \
 		    --movedev debian/tmp/usr/include/* usr/include \
-		    debian/tmp/usr/lib/*/$(DEBPKGNAME).so
-
-get-orig-source:
-	. debian/get-orig-source
+		    debian/tmp/usr/lib/*/lib*.so


=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,7 @@
-# version=3
-# Upstream does not tag releases
+version=4
+
+opts="mode=git,pretty=0.0.2+git%cd.%h" \
+    https://github.com/locasto/libdisorder.git HEAD
+
+# Issue asking for release tags:
+# https://github.com/locasto/libdisorder/issues/4



View it on GitLab: https://salsa.debian.org/med-team/libdisorder/compare/d92b2bc0521d4112d58032a5656d3598263a66a0...b808663dcde646455a8ce55e772748d527d93858

---
View it on GitLab: https://salsa.debian.org/med-team/libdisorder/compare/d92b2bc0521d4112d58032a5656d3598263a66a0...b808663dcde646455a8ce55e772748d527d93858
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/20180415/e5f67e33/attachment-0001.html>

More information about the debian-med-commit mailing list