[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/squeekboard][debian/master] 3 commits: d/patches: add fix_meson_ftbfs (Closes: #998576)

[Henry-Nicolas Tourneur (@hntourne)]

Henry-Nicolas Tourneur pushed to branch debian/master at Debian On Mobile / squeekboard


Commits:
6f7fa64c by Henry-Nicolas Tourneur at 2021-11-16T18:40:38+00:00
d/patches: add fix_meson_ftbfs (Closes: #998576)

- - - - -
6f5c1c0b by Henry-Nicolas Tourneur at 2021-11-16T18:41:43+00:00
d/patches: add fix_cargo_error.patch to fix an FTBFS (rust 1.54+ needs dependency versionning)

- - - - -
32f41c25 by Henry-Nicolas Tourneur at 2021-11-16T18:43:14+00:00
d/changelog: document changes and release

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/fix_cargo_error.patch
- + debian/patches/fix_meson_ftbfs.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+squeekboard (1.14.0-3) unstable; urgency=medium
+
+  * Team upload.
+  * d/patches: add fix_meson_ftbfs to fix an FTBFS
+    with meson 0.60 (Closes: #998576)
+  * d/patches: add fix_cargo_error.patch to fix an FTBFS
+    rust 1.54+ needs dependency versionning
+
+ -- Henry-Nicolas Tourneur <debian at nilux.be>  Tue, 16 Nov 2021 18:41:52 +0000
+
 squeekboard (1.14.0-2) unstable; urgency=medium
 
   * Upload to unstable


=====================================
debian/patches/fix_cargo_error.patch
=====================================
@@ -0,0 +1,25 @@
+Author: Dorota Czaplejewicz
+Origin: https://gitlab.gnome.org/henry-nicolas/squeekboard/-/commit/9cd56185c59ace535a6af26384ef6beca4423816
+Description: Fixes an FTBFS when cargo has dependencies without any version set
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Cargo.toml.in
++++ b/Cargo.toml.in
+@@ -23,14 +23,14 @@ rustc_less_1_36 = []
+ 
+ # Dependencies which don't change based on build flags
+ [dependencies.cairo-sys-rs]
+-version = ""
++version = "*"
+ 
+ [dependencies.glib-sys]
+-version = ""
++version = "*"
+ features = ["v2_44"]
+ 
+ [dependencies.gtk-sys]
+-version = ""
++version = "*"
+ features = ["v3_22"]
+ 
+ [dependencies]


=====================================
debian/patches/fix_meson_ftbfs.patch
=====================================
@@ -0,0 +1,16 @@
+Author: Dorota Czaplejewicz
+Origin: https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/479
+Description: Fixes an FTBFS with a meson 0.60
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -12,7 +12,7 @@ desktopconf.set('bindir', bindir)
+ 
+ desktop_file = 'sm.puri.Squeekboard.desktop'
+ 
+-i18n.merge_file('desktop',
++i18n.merge_file(
+     input: configure_file(
+       input: desktop_file + '.in.in',
+       output: desktop_file + '.in',


=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+fix_cargo_error.patch
+fix_meson_ftbfs.patch



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/squeekboard/-/compare/1e73c046ee77b91875b5744180eea7a1a235d1d3...32f41c25c95c5c5d5c24c50a9fd3b48cc72737fb

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/squeekboard/-/compare/1e73c046ee77b91875b5744180eea7a1a235d1d3...32f41c25c95c5c5d5c24c50a9fd3b48cc72737fb
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20211116/3c40f020/attachment-0001.htm>