Skip to content

Commit 695f765

Browse files
committed
minor changes that came up when preparing debian branch
1 parent a19a522 commit 695f765

File tree

7 files changed

+28
-25
lines changed

7 files changed

+28
-25
lines changed

debian/changelog

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
1-
libsml (1.0.1) UNRELEASED; urgency=medium
1+
libsml (1.0.2) UNRELEASED; urgency=medium
22

3-
* Added github release action to build debian packages
4-
* Use version from debian changelog
3+
* Actually releases the fix that (Closes: #946525), see below.
4+
* Maintainer changed (Closes: #1034250)
55

6-
-- Joachim Zobel <jz-autosign@heute-morgen.de> Sat, 28 Jan 2023 16:33:37 +0100
6+
-- Joachim Zobel <jz-autosign@heute-morgen.de> Fri, 21 Apr 2023 06:29:38 +0200
77

8-
libsml (0.1.1+git20220208) unstable; urgency=medium
8+
libsml (1.0.1) unstable; urgency=medium
99

10+
* Added github release action to build debian packages
11+
* Use version from debian changelog
1012
* Moved to the volkszaehler repo
1113

12-
-- Joachim Zobel <jz-2017@heute-morgen.de> Thu, 05 Jan 2023 20:58:31 +0100
14+
-- Joachim Zobel <jz-autosign@heute-morgen.de> Thu, 05 Jan 2023 20:58:31 +0100
1315

14-
libsml (0.1.1+git20200409-1) unstable; urgency=medium
16+
libsml (0.1.1+git20200409-1) UNRELEASED; urgency=medium
1517

1618
* New upstream snapshot
1719

1820
-- Andreas Moog <andreas.moog@warperbbs.de> Sat, 30 May 2020 15:27:24 +0200
1921

20-
libsml (0.1.1+git20180125-1.1) unstable; urgency=medium
21-
22-
* Non-maintainer upload.
23-
* Add patch from Logan Rosen for FTBFS with gcc 10.
24-
(Closes: #957478)
25-
26-
-- Adrian Bunk <bunk@debian.org> Sun, 07 Feb 2021 00:09:04 +0200
27-
28-
libsml (0.1.1+git20191213-1) unstable; urgency=medium
22+
libsml (0.1.1+git20191213-1) UNRELEASED; urgency=medium
2923

3024
* New upstream snapshot
3125
* Update symbols file, some (erroneously exported) symbols are gone
@@ -38,6 +32,14 @@ libsml (0.1.1+git20191213-1) unstable; urgency=medium
3832

3933
-- Andreas Moog <andreas.moog@warperbbs.de> Sun, 17 Feb 2019 13:00:21 +0100
4034

35+
libsml (0.1.1+git20180125-1.1) unstable; urgency=medium
36+
37+
* Non-maintainer upload.
38+
* Add patch from Logan Rosen for FTBFS with gcc 10.
39+
(Closes: #957478)
40+
41+
-- Adrian Bunk <bunk@debian.org> Sun, 07 Feb 2021 00:09:04 +0200
42+
4143
libsml (0.1.1+git20180125-1) unstable; urgency=medium
4244

4345
* New upstream release

debian/compat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
11
1+
13

debian/control

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Source: libsml
22
Priority: optional
33
Maintainer: Joachim Zobel <jz-autosign@heute-morgen.de>
4-
Build-Depends: debhelper (>= 11~), uuid-dev (>= 2.16), dh-exec
5-
Standards-Version: 4.3.0
4+
Build-Depends: debhelper (>= 13~), uuid-dev (>= 2.16), dh-exec
5+
Standards-Version: 4.6.2
66
Section: libs
77
Homepage: https://github.com/volkszaehler/libsml
8-
Vcs-Git: https://salsa.debian.org/amoog-guest/libsml.git
9-
Vcs-Browser: https://salsa.debian.org/amoog-guest/libsml
8+
Vcs-Git: https://github.com/volkszaehler/libsml.git
9+
Vcs-Browser: https://github.com/volkszaehler/libsml
1010

1111
Package: libsml-dev
1212
Section: libdevel

debian/copyright

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ Copyright: 2011-2019 Juri Glass
1111
License: GPL-3+
1212

1313
Files: debian/*
14-
Copyright: 2017-2019 Andreas Moog <andreas.moog@warperbbs.de>
14+
Copyright: 2023 Joachim Zobel <jz-2017@heute-morgen.de>
15+
2017-2019 Andreas Moog <andreas.moog@warperbbs.de>
1516
2011 Steffen Vogel <info@steffenvogel.de>
1617
License: GPL-3+
1718

debian/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Build with all available hardening options
44
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
55

6-
VERSION=$(shell dpkg-parsechangelog --show-field Version 2>/dev/null)
6+
VERSION=$(shell dpkg-parsechangelog --show-field Version 2>/dev/null | cut -f1 -d-)
77

88
execute_before_dh_auto_build:
99
sed -i 's#"version":.*#"version": "${VERSION}",#' library.json

library.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"srcDir": "sml/src",
1313
"flags": "-DSML_NO_UUID_LIB"
1414
},
15-
"version": "1.0.1",
15+
"version": "1.0.2",
1616
"frameworks": "arduino",
1717
"platforms": "*"
1818
}

sml.pc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ includedir=${prefix}/include
55

66
Name: libSML
77
Description: Library for the Smart Messaging Language (SML)
8-
Version: 1.0.1
8+
Version: 1.0.2
99
URL: http://github.com/volkszaehler/libsml
1010
Requires: uuid >= 2.16
1111
Libs: -L${libdir} -lsml

0 commit comments

Comments
 (0)