From 7254545b2926f7f496aa911db1627ece9021404c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Moreno?= Date: Mon, 14 Sep 2020 12:30:04 +0200 Subject: [PATCH 1/2] Bump soname to 1.0.0 This patch updates the version number and api version for the project and all debian packages. The commits added in this PR https://github.com/endlessm/libanimation/pull/11 break the ABI so we need to bump the soname. https://phabricator.endlessm.com/T30737 --- animation-glib/meson.build | 2 +- animation/meson.build | 2 +- debian/changelog | 7 +++++++ debian/control | 20 ++++++++++---------- debian/gir1.2-animation-glib-0.install | 1 - debian/libanimation-dev.install | 2 +- debian/libanimation-glib-dev.install | 4 ++-- debian/libanimation-glib0.install | 1 - debian/libanimation0.dirs | 1 - debian/libanimation0.install | 1 - meson.build | 2 +- 11 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 debian/gir1.2-animation-glib-0.install delete mode 100644 debian/libanimation-glib0.install delete mode 100644 debian/libanimation0.dirs delete mode 100644 debian/libanimation0.install diff --git a/animation-glib/meson.build b/animation-glib/meson.build index fb997bb..b8d31c8 100644 --- a/animation-glib/meson.build +++ b/animation-glib/meson.build @@ -18,7 +18,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -api_version = '0' +api_version = '1' animation_glib_toplevel_headers = ['vector.h'] animation_glib_toplevel_introspectable_sources = ['vector.cpp'] diff --git a/animation/meson.build b/animation/meson.build index 706d5c1..4036e77 100644 --- a/animation/meson.build +++ b/animation/meson.build @@ -18,7 +18,7 @@ # # Build the libanimation library. -api_version = '0' +api_version = '1' animation_sources = [] animation_headers = [] diff --git a/debian/changelog b/debian/changelog index 70d18bd..fe2d316 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libanimation (1.0.0) eos; urgency=medium + + * Introduce pointers in order to allow gjs object mapping + * Break the ABI so bump the soname + + -- Sam Spilsbury Thu, 09 Aug 2018 02:26:53 +0800 + libanimation (0.0.0) eos; urgency=medium * debian/control diff --git a/debian/control b/debian/control index cd1086b..1dda9bb 100644 --- a/debian/control +++ b/debian/control @@ -18,45 +18,45 @@ Vcs-Git: git://github.com/endless/libanimation.git Package: libanimation-dev Section: libdevel Architecture: any -Depends: libanimation0 (= ${binary:Version}), +Depends: libanimation1 (= ${binary:Version}), Description: 2D Surfaces Animations (C++ API) headers 2D Surfaces Animations (C++ API) headers Replaces: libwobbly-dev (<= 0.3.2) -Package: libanimation0 +Package: libanimation1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: 2D Surfaces Animations library (C++ API) 2D Surfaces Animations library -Replaces: libwobbly0 (<= 0.3.2) +Replaces: libwobbly1 (<= 0.3.2) -Package: libanimation-glib0 +Package: libanimation-glib1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libanimation0 (= ${binary:Version}) + libanimation1 (= ${binary:Version}) Description: 2D Surfaces Animations library (GLib API) 2D Surfaces Animations library -Replaces: libwobbly-glib0 (<= 0.3.2) +Replaces: libwobbly-glib1 (<= 0.3.2) Package: libanimation-glib-dev Section: libs Architecture: any -Depends: libanimation-glib0 (= ${binary:Version}), +Depends: libanimation-glib1 (= ${binary:Version}), Description: 2D Surfaces Animations (GLib API) headers 2D Surfaces Animations (GLib API) headers Replaces: libwobbly-glib-dev (<= 0.3.2) -Package: gir1.2-animation-glib-0 +Package: gir1.2-animation-glib-1 Section: non-free/libs Architecture: any Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}, - libanimation-glib0 (= ${binary:Version}) + libanimation-glib1 (= ${binary:Version}) Description: 2D Surfaces Animations library (GObject Introspection) files 2D Surfaces Animations library (GObject Introspection) files -Replaces: gir1.2-libwobbly-glib0 (<= 0.3.2) +Replaces: gir1.2-libwobbly-glib1 (<= 0.3.2) diff --git a/debian/gir1.2-animation-glib-0.install b/debian/gir1.2-animation-glib-0.install deleted file mode 100644 index 5826909..0000000 --- a/debian/gir1.2-animation-glib-0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/girepository-1.0/Animation-0.typelib diff --git a/debian/libanimation-dev.install b/debian/libanimation-dev.install index 9c6de95..454fb75 100644 --- a/debian/libanimation-dev.install +++ b/debian/libanimation-dev.install @@ -1,3 +1,3 @@ usr/include/animation/* usr/lib/*/libanimation.so -usr/lib/*/pkgconfig/libanimation-0.pc +usr/lib/*/pkgconfig/libanimation-1.pc diff --git a/debian/libanimation-glib-dev.install b/debian/libanimation-glib-dev.install index 2899266..4da11ea 100644 --- a/debian/libanimation-glib-dev.install +++ b/debian/libanimation-glib-dev.install @@ -1,4 +1,4 @@ usr/include/animation-glib/* usr/lib/*/libanimation-glib.so -usr/lib/*/pkgconfig/libanimation-glib-0.pc -usr/share/gir-1.0/Animation-0.gir +usr/lib/*/pkgconfig/libanimation-glib-1.pc +usr/share/gir-1.0/Animation-1.gir diff --git a/debian/libanimation-glib0.install b/debian/libanimation-glib0.install deleted file mode 100644 index e28ba26..0000000 --- a/debian/libanimation-glib0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libanimation-glib.so.* diff --git a/debian/libanimation0.dirs b/debian/libanimation0.dirs deleted file mode 100644 index 6845771..0000000 --- a/debian/libanimation0.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/libanimation0.install b/debian/libanimation0.install deleted file mode 100644 index 4c1d9f0..0000000 --- a/debian/libanimation0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libanimation.so.* diff --git a/meson.build b/meson.build index aeb4227..dd956f1 100644 --- a/meson.build +++ b/meson.build @@ -19,7 +19,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. project('libanimation', 'cpp', - version: '0.0.0', + version: '1.0.0', default_options : ['cpp_std=c++17'], license: 'LGPL2+', meson_version: '>= 0.40.0') From 2c63158ba40f96ff370efc6d80c1756f324e3ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Moreno?= Date: Thu, 17 Sep 2020 17:05:03 +0200 Subject: [PATCH 2/2] debian: Remove libwobbly replacement This is a new version so it should not replace the libwobbly anymore. --- debian/control | 5 ----- 1 file changed, 5 deletions(-) diff --git a/debian/control b/debian/control index 1dda9bb..23188d8 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,6 @@ Architecture: any Depends: libanimation1 (= ${binary:Version}), Description: 2D Surfaces Animations (C++ API) headers 2D Surfaces Animations (C++ API) headers -Replaces: libwobbly-dev (<= 0.3.2) Package: libanimation1 Section: libs @@ -30,7 +29,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Description: 2D Surfaces Animations library (C++ API) 2D Surfaces Animations library -Replaces: libwobbly1 (<= 0.3.2) Package: libanimation-glib1 Section: libs @@ -40,7 +38,6 @@ Depends: ${shlibs:Depends}, libanimation1 (= ${binary:Version}) Description: 2D Surfaces Animations library (GLib API) 2D Surfaces Animations library -Replaces: libwobbly-glib1 (<= 0.3.2) Package: libanimation-glib-dev Section: libs @@ -48,7 +45,6 @@ Architecture: any Depends: libanimation-glib1 (= ${binary:Version}), Description: 2D Surfaces Animations (GLib API) headers 2D Surfaces Animations (GLib API) headers -Replaces: libwobbly-glib-dev (<= 0.3.2) Package: gir1.2-animation-glib-1 Section: non-free/libs @@ -59,4 +55,3 @@ Depends: ${gir:Depends}, libanimation-glib1 (= ${binary:Version}) Description: 2D Surfaces Animations library (GObject Introspection) files 2D Surfaces Animations library (GObject Introspection) files -Replaces: gir1.2-libwobbly-glib1 (<= 0.3.2)