From ce8618a7255520438bd02dd604743902de0c7804 Mon Sep 17 00:00:00 2001
From: Rohan Budhiraja <budhiraja@laas.fr>
Date: Fri, 1 Jul 2016 19:56:48 +0200
Subject: [PATCH] [debian] remove pedantic errors
* add gpg public key for package releases
* update watch file to look for key signature
* remove typos from library plugins
* change copyright to match dep5 format
* remove call of ldconfig in package maintainence scripts
---
debian/changelog | 6 ++--
debian/compat | 2 +-
debian/control | 8 ++---
debian/copyright | 5 +--
debian/libdynamic-graph3.0.0.install | 3 +-
debian/libdynamic-graph3.0.0.triggers | 1 +
debian/rules | 14 ++++++--
debian/upstream/signing-key.asc | 52 +++++++++++++++++++++++++++
debian/watch | 8 +++--
src/traces/tracer.cpp | 2 +-
10 files changed, 84 insertions(+), 17 deletions(-)
create mode 100644 debian/libdynamic-graph3.0.0.triggers
create mode 100644 debian/upstream/signing-key.asc
diff --git a/debian/changelog b/debian/changelog
index 442a30b..df73393 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-dynamic-graph (3.0.0-0ubuntu1ppa0~precise1) precise; urgency=low
+dynamic-graph (3.0.0-1) unstable; urgency=low
- * Initial release
+ * Initial release (Closes: #822608)
- -- Rohan Budhiraja <budhiraja.rohan@gmail.com> Fri, 22 Apr 2016 12:30:14 +0200
+ -- Rohan Budhiraja <budhiraja.rohan@gmail.com> Fri, 01 Jul 2016 12:30:14 +0200
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index e395e9f..628040c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,8 @@
Source: dynamic-graph
Section: libs
Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Uploaders: Rohan Budhiraja <budhiraja.rohan@gmail.com>
-Build-Depends: debhelper (>= 8.0.0),
+Maintainer: Rohan Budhiraja <budhiraja.rohan@gmail.com>
+Build-Depends: debhelper (>= 9.0.0),
cmake (>= 2.6),
doxygen (>=1.6.3),
pkg-config (>=0.22),
@@ -16,7 +15,7 @@ Build-Depends: debhelper (>= 8.0.0),
libboost-program-options-dev (>=1.46),
libpthread-stubs0-dev (>=0.3),
libeigen3-dev (>=3.0.5)
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Homepage: http://stack-of-tasks.github.io
Vcs-Git: https://github.com/proyan/dynamic-graph.git
@@ -46,7 +45,6 @@ Package: libdynamic-graph-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Suggests: libjrl-mathtools-doc
Description: documentation for the dynamic graph C++ library
The dynamic graph library allows the representation of data-flow in C++.
It provides fast graph evaluation and a simple script language to manipulate
diff --git a/debian/copyright b/debian/copyright
index 3ec1088..795c55c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: dynamic-graph
Upstream-Contact: HPP mailing list <hpp@laas.fr>
Source: https://github.com/proyan/dynamic-graph
@@ -6,9 +6,10 @@ Source: https://github.com/proyan/dynamic-graph
Files: *
Copyright: 2010-2016 JRL, CNRS/AIST.
License: LGPL-3
- See `/usr/share/common-licenses/LGPL-3'.
Files: debian/*
Copyright: 2016 Rohan Budhiraja
+License: LGPL-3
+
License: LGPL-3
See `/usr/share/common-licenses/LGPL-3'.
\ No newline at end of file
diff --git a/debian/libdynamic-graph3.0.0.install b/debian/libdynamic-graph3.0.0.install
index 7cb8691..eddacbf 100644
--- a/debian/libdynamic-graph3.0.0.install
+++ b/debian/libdynamic-graph3.0.0.install
@@ -1,3 +1,4 @@
usr/lib/*.so.*
usr/lib/plugin/*.so
-usr/share/man/*
\ No newline at end of file
+usr/share/man/*
+usr/share/dynamic-graph/*
\ No newline at end of file
diff --git a/debian/libdynamic-graph3.0.0.triggers b/debian/libdynamic-graph3.0.0.triggers
new file mode 100644
index 0000000..72850ac
--- /dev/null
+++ b/debian/libdynamic-graph3.0.0.triggers
@@ -0,0 +1 @@
+activate-noawait ldconfig
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index ecaf145..ab6136c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,16 +7,26 @@
# 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
+export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+CFLAGS+=$(CPPFLAGS)
+CXXFLAGS+=$(CPPFLAGS)
+
override_dh_auto_configure:
dh_auto_configure -- -DGENERATE_DOC=ON
override_dh_makeshlibs:
- dh_makeshlibs --exclude=lib/plugin
+ dh_makeshlibs --exclude=lib/plugin --noscripts
override_dh_shlibdeps:
dh_shlibdeps --exclude=lib/plugin
+override_dh_installchangelogs:
+ dh_installchangelogs changelog
+
%:
dh $@
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..9c97e30
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+ZjNmUHOna0zViA==
+=nPA5
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 2f47179..e33ea08 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,7 @@
version=3
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/dynamic-graph-$1\.tar\.gz/ \
- https://github.com/proyan/dynamic-graph/releases .*/v?(\d\S*)\.tar\.gz
+opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/dynamic-graph-$1\.tar\.gz/,\
+pgpsigurlmangle=s/github.com/raw.githubusercontent.com/;\
+s/archive\/master/signatures/;\
+s/([^\/]+)\.tar\.gz/dynamic-graph-$1\.tar\.gz/;\
+s/$/.asc/ \
+ https://github.com/proyan/dynamic-graph/releases .*/v?(\d\S*)\.tar\.gz
\ No newline at end of file
diff --git a/src/traces/tracer.cpp b/src/traces/tracer.cpp
index 36e0e52..3cc3b66 100644
--- a/src/traces/tracer.cpp
+++ b/src/traces/tracer.cpp
@@ -256,7 +256,7 @@ recordSignal( std::ostream& os,
}
}
catch( ExceptionAbstract& exc ) { os << exc << std::endl; }
- catch( ... ) { os << "Unknown error occured while reading signal." << std::endl; }
+ catch( ... ) { os << "Unknown error occurred while reading signal." << std::endl; }
dgDEBUGOUT(15);
--
GitLab