summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-09 12:24:59 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-09 12:25:42 +0000
commit3cf40f4ac70861cd735571863fb6e3fc1ff78238 (patch)
treedf0b40be3088d6281b935ebb1355ce4beba4159f
parentMerging upstream version 1.1.2. (diff)
downloadcmocka-3cf40f4ac70861cd735571863fb6e3fc1ff78238.zip
cmocka-3cf40f4ac70861cd735571863fb6e3fc1ff78238.tar.xz
Merging debian version 1.1.2-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog20
-rw-r--r--debian/control10
-rw-r--r--debian/copyright30
-rw-r--r--debian/libcmocka0.symbols1
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/watch4
6 files changed, 55 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog
index 9b28a1c..4be13de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+cmocka (1.1.2-1) unstable; urgency=medium
+
+ [ Andreas Schneider ]
+ * Bump version to 1.1.2
+
+ [ Sandro Knauß ]
+ * Cleanup changelog
+
+ [ David Prévot ]
+ * Update d/watch to currently signed file
+ * Use priority optional
+ * Move project repository to salsa.d.o
+ * Update Standards-Version to 4.2.1
+ * Use HTTPS URLs
+ * Update copyright
+ * Update documentation building rule
+ * Update symbols file
+
+ -- David Prévot <taffit@debian.org> Thu, 30 Aug 2018 15:13:09 -1000
+
cmocka (1.1.1-1~dschinn1) dschinn-backports; urgency=medium
* Initial upload to dschinn-backports.
diff --git a/debian/control b/debian/control
index 709c6f5..9fe4007 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
Source: cmocka
Section: devel
-Priority: extra
+Priority: optional
Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
XSBC-Original-Maintainer: David Prévot <taffit@debian.org>
@@ -8,12 +8,12 @@ XSBC-Original-Uploaders: Sandro Knauß <hefee@debian.org>
Bugs: mailto:maintainers@lists.progress-linux.org
Build-Depends: cmake, debhelper (>= 10)
Build-Depends-indep: doxygen
-Standards-Version: 4.0.0
-Homepage: http://cmocka.org/
+Standards-Version: 4.2.1
+Homepage: https://cmocka.org/
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/cmocka
Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/cmocka
-XSBC-Original-Vcs-Git: https://anonscm.debian.org/git/collab-maint/cmocka.git
-XSBC-Original-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/cmocka.git
+XSBC-Original-Vcs-Browser: https://salsa.debian.org/debian/cmocka
+XSBC-Original-Vcs-Git: https://salsa.debian.org/debian/cmocka.git
Package: cmocka-doc
Section: doc
diff --git a/debian/copyright b/debian/copyright
index f2118e1..563da10 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,25 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: CMocka
-Source: http://git.cryptomilk.org/projects/cmocka.git/
+Source: https://git.cryptomilk.org/projects/cmocka.git/
Upstream-Contact: Andreas Schneider <asn@cryptomilk.org>
Files: *
-Copyright: 2003-2015, Andreas Schneider <asn@cryptomilk.org>
+Copyright: 2003-2018, Andreas Schneider <asn@cryptomilk.org>
2008, Google Inc. <opensource@google.com>
2013, 2015, Jakub Hrozek <jakub.hrozek@gmail.com>
2014, Luis Pabón, Jr. <lpabon@redhat.com>
License: Apache-2.0
Files: cmake/*
-Copyright: 2007-2013, Andreas Schneider <asn@cryptomilk.org>
- 2009-2011, Tobias Rautenkranz <tobias@rautenkranz.ch>
+Copyright: 2007-2013, 2018, Andreas Schneider <asn@cryptomilk.org>
2006, Alexander Neundorf <neundorf@kde.org>
2007, Daniel Gollub <dgollub@suse.de>
License: BSD-3-clause
+Files: doc/that_style/*
+Copyright: 2017, Jan-Lukas Wynen
+License: Expat
+
License: Apache-2.0
On Debian systems, the full text of the Apache license version 2 can be found
in the file `/usr/share/common-licenses/Apache-2.0'.
@@ -44,3 +47,22 @@ License: BSD-3-clause
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/debian/libcmocka0.symbols b/debian/libcmocka0.symbols
index 462bd63..37b154c 100644
--- a/debian/libcmocka0.symbols
+++ b/debian/libcmocka0.symbols
@@ -40,6 +40,7 @@ libcmocka.so.0 libcmocka0 #MINVER#
_will_return@Base 0.3.2
cm_print_error@Base 1.0.0
cmocka_set_message_output@Base 1.0.0
+ cmocka_set_test_filter@Base 1.1.2
global_expect_assert_env@Base 0.3.2
global_expecting_assert@Base 0.3.2
global_last_failed_assert@Base 0.3.2
diff --git a/debian/rules b/debian/rules
index 24d47eb..7a3dd2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ override_dh_auto_configure:
-DUNIT_TESTING=ON
override_dh_auto_build-indep:
- $(MAKE) -C obj-* doc
+ $(MAKE) -C obj-* docs
override_dh_auto_test-indep:
diff --git a/debian/watch b/debian/watch
index 3b80417..042f712 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
-options=decompress,pgpsigurlmangle=s/xz$/asc/ \
+version=4
+opts="pgpsigurlmangle=s%$%.asc%" \
https://cmocka.org/files/([\d.]+)/cmocka-(.*).tar.xz