summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-30 17:11:55 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-30 17:12:19 +0000
commitc4ef13528a51d924ef7ab01e339499a73c71a9ea (patch)
treecb7b80e8400059db25fc2cb098bd88a244b704b3
parentMerging upstream version 1.1.3. (diff)
downloadcmocka-c4ef13528a51d924ef7ab01e339499a73c71a9ea.zip
cmocka-c4ef13528a51d924ef7ab01e339499a73c71a9ea.tar.xz
Merging debian version 1.1.3-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog14
-rw-r--r--debian/compat1
-rw-r--r--debian/control2
-rw-r--r--debian/copyright3
-rw-r--r--debian/libcmocka-dev.install1
-rwxr-xr-xdebian/rules3
6 files changed, 17 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 5e9a5e2..e925f3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+cmocka (1.1.3-1) unstable; urgency=medium
+
+ [ Andreas Schneider ]
+ * Bump version to 1.1.3
+
+ [ David Prévot ]
+ * Use debhelper-compat 11
+ * Drop get-orig-source target
+ * Declare minimum required cmake version (Closes: #908385)
+ * Update copyright
+ * Drop static libraries not built anymore
+
+ -- David Prévot <taffit@debian.org> Fri, 28 Sep 2018 17:43:00 -1000
+
cmocka (1.1.2-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 6c92700..3983c33 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
XSBC-Original-Maintainer: David Prévot <taffit@debian.org>
XSBC-Original-Uploaders: Sandro Knauß <hefee@debian.org>
Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: cmake (>= 3.8), debhelper (>= 10)
+Build-Depends: cmake (>= 3.10), debhelper-compat (= 11)
Build-Depends-indep: doxygen
Standards-Version: 4.2.1
Homepage: https://cmocka.org/
diff --git a/debian/copyright b/debian/copyright
index 563da10..6fb541c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,8 @@ Copyright: 2003-2018, Andreas Schneider <asn@cryptomilk.org>
License: Apache-2.0
Files: cmake/*
-Copyright: 2007-2013, 2018, Andreas Schneider <asn@cryptomilk.org>
+Copyright: 2007-2018, Andreas Schneider <asn@cryptomilk.org>
+ 2018, Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
2006, Alexander Neundorf <neundorf@kde.org>
2007, Daniel Gollub <dgollub@suse.de>
License: BSD-3-clause
diff --git a/debian/libcmocka-dev.install b/debian/libcmocka-dev.install
index 69fbe1a..c31d113 100644
--- a/debian/libcmocka-dev.install
+++ b/debian/libcmocka-dev.install
@@ -1,5 +1,4 @@
usr/include
-usr/lib/*/*.a
usr/lib/*/*.so
usr/lib/*/cmake/cmocka
usr/lib/*/pkgconfig
diff --git a/debian/rules b/debian/rules
index 7a3dd2d..5bc0a89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,3 @@ override_dh_link-arch:
override_dh_auto_install-indep:
dh_install obj-*/doc/html usr/share/doc/cmocka-doc
dh_doxygen
-
-get-orig-source:
- uscan --verbose --force --rename