[med-svn] [Git][med-team/hinge][master] 6 commits: Remove trailing whitespace in debian/copyright

Michael R. Crusoe gitlab at salsa.debian.org
Fri Jan 18 19:04:06 GMT 2019


Michael R. Crusoe pushed to branch master at Debian Med / hinge


Commits:
cf39f7a4 by Michael R. Crusoe at 2019-01-18T17:44:17Z
Remove trailing whitespace in debian/copyright

- - - - -
5eb4a18e by Michael R. Crusoe at 2019-01-18T18:23:43Z
Added libspdlog-dev 1:1.3.0 compatibility

- - - - -
63dcacee by Michael R. Crusoe at 2019-01-18T18:24:03Z
debhelper 12

- - - - -
d2c38f41 by Michael R. Crusoe at 2019-01-18T18:30:26Z
enable hardening

- - - - -
9d0348a3 by Michael R. Crusoe at 2019-01-18T18:31:56Z
update new paths in the copyright

- - - - -
c9ae9477 by Michael R. Crusoe at 2019-01-18T19:03:20Z
upload to unstable

- - - - -


7 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- + debian/patches/libspdlog-1:1.3.0
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,19 @@
-hinge (0.5.0-4) UNRELEASED; urgency=medium
+hinge (0.5.0-4) unstable; urgency=medium
 
   * Team upload.
+
+  [ Andreas Tille ]
   * debhelper 11
   * Point Vcs fields to salsa.debian.org
   * Standards-Version: 4.2.1
 
- -- Andreas Tille <tille at debian.org>  Fri, 28 Sep 2018 09:18:45 +0200
+  [ Michael R. Crusoe ]
+  * Remove trailing whitespace in debian/copyright
+  * Added libspdlog-dev 1:1.3.0 compatibility, Closes: #909763
+  * Standards-Version: 4.3.0, no changes needed
+  * debhelper 12
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Fri, 18 Jan 2019 11:03:09 -0800
 
 hinge (0.5.0-3) unstable; urgency=low
 


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-11
+12


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Afif Elghraoui <afif at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper (>= 12~),
                cmake,
                libspdlog-dev,
                libboost-dev,
@@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 11~),
                python-pbcore,
                python-networkx,
                python-matplotlib
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/hinge
 Vcs-Git: https://salsa.debian.org/med-team/hinge.git
 Homepage: https://github.com/HingeAssembler/HINGE


=====================================
debian/copyright
=====================================
@@ -14,14 +14,14 @@ License: BSD-3-Clause/HINGE
 
 Files:
 	src/include/paf.h
-	src/include/paf.c
+	src/lib/paf.c
 	src/include/kseq.h
 Copyright: 2008-2009, 2011 Attractive Chaos <attractor at live.co.uk>
 License: MIT
 
 Files:
 	src/include/align.h
-	src/include/align.c
+	src/lib/align.c
 	src/include/QV.h
 	src/include/DB.h
 Copyright: 2014 Eugene W Myers Jr <gene.myers at gmail.com>
@@ -92,7 +92,7 @@ License: BSD-3-Clause/HINGE
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  · Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.  
+   list of conditions and the following disclaimer.
  · Redistributions in binary form must reproduce the above copyright notice,
    this list of conditions and the following disclaimer in the documentation
    and/or other materials provided with the distribution.


=====================================
debian/patches/libspdlog-1:1.3.0
=====================================
@@ -0,0 +1,46 @@
+From: Michael R. Crusoe <michael.crusoe at gmail.com>
+Subject: spdlog 1.3.0 compat
+--- hinge.orig/src/filter/filter.cpp
++++ hinge/src/filter/filter.cpp
+@@ -20,6 +20,8 @@
+ 
+ #include "INIReader.h"
+ #include "spdlog/spdlog.h"
++#include "spdlog/sinks/daily_file_sink.h"
++#include "spdlog/sinks/stdout_sinks.h"
+ #include "DB.h"
+ #include "align.h"
+ #include "LAInterface.h"
+--- hinge.orig/src/maximal/maximal.cpp
++++ hinge/src/maximal/maximal.cpp
+@@ -20,6 +20,8 @@
+ 
+ #include "INIReader.h"
+ #include "spdlog/spdlog.h"
++#include "spdlog/sinks/daily_file_sink.h"
++#include "spdlog/sinks/stdout_sinks.h"
+ #include "DB.h"
+ #include "align.h"
+ #include "LAInterface.h"
+--- hinge.orig/src/consensus/draft.cpp
++++ hinge/src/consensus/draft.cpp
+@@ -12,6 +12,8 @@
+ #include <glob.h>
+ 
+ #include "spdlog/spdlog.h"
++#include "spdlog/sinks/daily_file_sink.h"
++#include "spdlog/sinks/stdout_sinks.h"
+ #include "cmdline.h"
+ #include "INIReader.h"
+ #include "DB.h"
+--- hinge.orig/src/layout/hinging.cpp
++++ hinge/src/layout/hinging.cpp
+@@ -13,6 +13,8 @@
+ 
+ 
+ #include "spdlog/spdlog.h"
++#include "spdlog/sinks/daily_file_sink.h"
++#include "spdlog/sinks/stdout_sinks.h"
+ #include "cmdline.h"
+ #include "INIReader.h"
+ #include "DB.h"


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 external-spdlog.patch
 libspdlog-14.0.patch
+libspdlog-1:1.3.0


=====================================
debian/rules
=====================================
@@ -1,8 +1,11 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE = 1
 
+include /usr/share/dpkg/default.mk
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 %:
-	dh $@ --buildsystem=cmake
+	dh $@
 
 override_dh_installexamples:
 	dh_installexamples



View it on GitLab: https://salsa.debian.org/med-team/hinge/compare/9cb651472d9190d714a51f90a9df19f80ef9be81...c9ae94775c13ba63bb27c19680af73baf908368f

-- 
View it on GitLab: https://salsa.debian.org/med-team/hinge/compare/9cb651472d9190d714a51f90a9df19f80ef9be81...c9ae94775c13ba63bb27c19680af73baf908368f
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/20190118/7702d8fd/attachment-0001.html>


More information about the debian-med-commit mailing list