Bug#1060658: closing 1060658
close 1060658 thanks
Bug#1060658: [Debian-on-mobile-maintainers] Bug#1060658: megapixels don't start could not find any config file
Hi, Le 12/01/2024 à 10:37, Pirate Praveen a écrit : Package: megapixels Version: 1.7.0-1 Severity: grave Running megapixels from commandline on mobian trixie fails with this error /usr/share/megapixels/config/purism,librem5r4.ini not found. This is expected, megapixels doesn't support the L5 (yet?). Regards, Arnaud OpenPGP_0xD3EBB5966BB99196.asc Description: OpenPGP public key OpenPGP_signature.asc Description: OpenPGP digital signature
Bug#1056548: closing 1056548
close 1056548 thanks
Bug#1056548: closing 1056548
fixed 1056548 1.0.3.1-2 thanks
Bug#1053536: marked as pending in squeekboard
Control: tag -1 pending Hello, Bug #1053536 in squeekboard reported by you has been fixed in the Git repository and is awaiting an upload. You can see the commit message below and you can check the diff of the fix at: https://salsa.debian.org/DebianOnMobile-team/squeekboard/-/commit/0a7301b2d28d8bb023d29fd5d9f1660375a7b85c update patches for gtk-rs 0.18 Closes: #1053536 (this message was generated automatically) -- Greetings https://bugs.debian.org/1053536
Bug#1050769: greetd FTBFS with DEB_BUILD_OPTIONS=nocheck: does not perform the build
Hi, On Sun, 27 Aug 2023 19:56:50 +0200 Helmut Grohne wrote: Justification: nocheck FTBFS is serious since trixie greetd fails to build from source, when DEB_BUILD_OPTIONS contains nocheck. A build ends as follows: [...] Note that nothing is ever built. debian/rules suggests that it attempts to build using dh_auto_test, but given a high enough compatibility level dh_auto_test honours DEB_BUILD_OPTIONS=nocheck. You probably need to run dh_auto_build at some point. This packages uses dh-cargo, which doesn't implement a build() method, making dh_auto_build a noop for us. IMHO it is a dh-cargo bug (see #1053556[1]) which must be fixed before greetd's debian/rules can be updated to use dh_auto_build. Regards, Arnaud [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1053556 Helmut OpenPGP_0xD3EBB5966BB99196.asc Description: OpenPGP public key OpenPGP_signature.asc Description: OpenPGP digital signature
Bug#1042983: marked as pending in squeekboard
Control: tag -1 pending Hello, Bug #1042983 in squeekboard reported by you has been fixed in the Git repository and is awaiting an upload. You can see the commit message below and you can check the diff of the fix at: https://salsa.debian.org/DebianOnMobile-team/squeekboard/-/commit/7eb4bdfef2e26e3668061848eb83708a14bce6b1 d/patches: update for gtk-rs 0.17 Closes: #1042983 (this message was generated automatically) -- Greetings https://bugs.debian.org/1042983
Bug#1042983: squeekboard - rust gtk stack update.
Hi Peter, Le 03/08/2023 à 19:27, Peter Green a écrit : Package: squeekboard Version: 1.22.0-3 Severity: serious The rust gtk stack is currently being updated in Debian, squeekboard needs a small patch Please test that squeekboard works with this patch and if-so apply it. Thanks for the patch, it works as expected but tests seem to fail on i386. I'll check what is going wrong there and upload as soon as this issue is fixed. Cheers, Arnaud ___ Debian-on-mobile-maintainers mailing list debian-on-mobile-maintain...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-on-mobile-maintainers
Bug#1042075: squeekboard FTBFS on mipsel: LLVM ERROR: out of memory could not compile `gtk`
Hi, Le 26/07/2023 à 11:27, Adrian Bunk a écrit : Source: squeekboard Version: 1.22.0-3 Severity: serious Tags: ftbfs https://buildd.debian.org/status/fetch.php?pkg=squeekboard=mipsel=1.22.0-3=1689482231=0 ... Compiling gtk v0.16.2 ... LLVM ERROR: out of memory Allocation failed error: could not compile `gtk` ... This is a vendored copy of the same version of src:rust-gtk, where this was solved with * Disable build-time testing on mipsel, they run out of address space. I'm not sure what you mean here, there's no vendored crate in squeekboard. Anyway, I don't think this should be acted upon as it is my understanding that mipsel will be dropped from the release architectures in the near future [1], partly because of its limited address space having a negative impact on packages which would otherwise migrate without any issue. Feel free to correct me if I'm wrong. Cheers, Arnaud [1] https://lists.debian.org/debian-devel/2023/07/msg00217.html ___ Debian-on-mobile-maintainers mailing list debian-on-mobile-maintain...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-on-mobile-maintainers
Bug#1039534: [Debian-on-mobile-maintainers] Bug#1039534: squeekboard: Fails to build on Debian Unstable
Hi, Le mer. 28 juin 2023 à 20:38:24 +01:00:00, Peter Michael Green a écrit : tags 1039534 +patch thanks squeekboard build-depends on missing: - librust-gtk+v3-22-dev:amd64 (>= 0.14) The current version of rust-gtk provides librust-gtk+v3-24-dev After updating the dependencies (both Debian and cargo) to allow a build to be attempted I discovered there were also a couple of real code issues. The first is that gtk::rectangle is now an opaque type, so you have to call "new" instead of assembling it field by field. The second is that "property" appears to have been renamed first to "property_value", then to "try_property_value". Then the non-panicing version was removed completely. I modified the code to add an explicit check if the property exists before calling the panicing version of the function (now called "property_value") but I have no idea if this is overkill or not. I'm not really in a position to test this patch as I don't use Debian on an appropriate device. Anyway, a debdiff is attached, if there is no maintainer response, *and* I get feedback from a user that the patched squeekboard is usable then I may NMU it. Thanks for looking into this. I'm currently testing a very similar patch (see https://salsa.debian.org/DebianOnMobile-team/squeekboard/-/tree/wip/a-wai/update-build-deps) and will likely upload a new version including it over the week-end. Cheers, Arnaud
Bug#1034996: marked as pending in libomemo
Control: tag -1 pending Hello, Bug #1034996 in libomemo reported by you has been fixed in the Git repository and is awaiting an upload. You can see the commit message below and you can check the diff of the fix at: https://salsa.debian.org/DebianOnMobile-team/libomemo/-/commit/82dc99d37cc04784223c8c6d4f40b09dd3204a8a libomemo0: move libomemo.so back to -dev package Closes: #1034996 (this message was generated automatically) -- Greetings https://bugs.debian.org/1034996
Bug#1034996: [Debian-on-mobile-maintainers] Bug#1034996: libomemo0: missing Breaks+Replaces for libomemo-dev when upgrading from bullseye
Hi, Le 04/05/2023 à 17:40, Pirate Praveen via Debian-on-mobile-maintainers a écrit : I could add the Breaks and Replaces, but looks like moving .so link out of -dev package is wrong as per lintian warning. W: libomemo0: lacks-unversioned-link-to-shared-library example: usr/lib/x86_64-linux-gnu/libomemo.so [usr/lib/x86_64-linux-gnu/libomemo.so.0.8.1] W: libomemo0: link-to-shared-library-in-wrong-package usr/lib/x86_64-linux-gnu/libomemo.so.0.8.1 [usr/lib/x86_64-linux-gnu/libomemo.so] This was moved to libomemo-dev in commit 6ebca2f07eed072226503432b6149e671341f2c4 Should we move back libomemo.so to libomemo-dev ? Indeed, my opinion is that we should partly revert those changes so libomemo.so is still part of the -dev package. I'll get to it and upload a new version during the weekend (unless Evangelos beats me to it). Cheers, Arnaud
Bug#1032914: phog: ships /etc/pam.d/greetd
Hi, Le 22/03/2023 à 17:58, Marc Dequènes (duck) a écrit : Quack, Honestly when I read the title I really wondered how phog could have ended-up shipping this file. I forgot it initially, was asked about it and added it quickly, so it's not like I would have rejected the idea. Well yes, it was only supposed to be transitional waiting for https://lists.sr.ht/~kennylevinsen/greetd/patches/36264 to land upstream, but I went a bit too optimistic on that one, my bad... Anyway, back to the patch itself. First I wonder if it's useful to ship the second PAM config since in the code (greetd/src/server.rs#211) it simply use the base greetd PAM configuration as a fallback; this is not a blocker though. The greeter PAM config drops the gnome-keyring/kwallet bits in order to be a bit lighter at runtime (those lines cause at least "gnome-keyring-daemon" to be started for user "_greetd", which is basically useless as it's a system user with no actual use of a keyring). Therefore I feel it's best to keep both config separate, but I'd be fine with a single config if you prefer it that way. Then I would prefer if the changelog entries were shipped with the corresponding changes and not in a lump afterwards. Also the "debian:" and "d/*:" prefixes are not the style I use. Maybe I'm missing why some people still use it but with the VCS taking care of remembering which files have been changed I don't feel the need to add this anymore and it's not very non-DD friendly. I like your comments to clearly explain the rationale. Thanks for the comments, I'm attaching the updated patches. Cheers, Arnaud Regards. \_o< From 3494b22e9819cf6e1fd8c20623060272c1ea2c51 Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Wed, 15 Mar 2023 13:51:11 +0100 Subject: [PATCH 1/2] Update PAM configuration(s) Except for the gnome-keyring bits, all items currently set in the `greetd` PAM config are already part of the `login` config. Including the latter makes the `greetd` config simpler. This commit also calls the PAM modules needed for unlocking the KDE wallet as well, and adds the `greetd-greeter` config (simply including `login` as the greeter itself doesn't need to deal with keyrings). Finally, switch to using debhelper for installing the configs instead of handling those manually. --- debian/changelog | 14 ++ debian/greetd.greetd-greeter.pam | 2 ++ debian/greetd.greetd.pam | 8 debian/greetd.install| 1 - debian/pam.d/greetd | 22 -- debian/rules | 5 - 6 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 debian/greetd.greetd-greeter.pam create mode 100644 debian/greetd.greetd.pam delete mode 100644 debian/pam.d/greetd diff --git a/debian/changelog b/debian/changelog index 707afdf..ae9095e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +greetd (0.9.0-3) UNRELEASED; urgency=medium + + * Update PAM configuration(s) +Except for the gnome-keyring bits, all items currently set in the +`greetd` PAM config are already part of the `login` config. Including +the latter makes the `greetd` config simpler. +This commit also calls the PAM modules needed for unlocking the KDE +wallet as well, and adds the `greetd-greeter` config (simply including +`login` as the greeter itself doesn't need to deal with keyrings). +Finally, switch to using debhelper for installing the configs instead of +handling those manually. + + -- Arnaud Ferraris Fri, 24 Mar 2023 10:20:21 +0100 + greetd (0.9.0-2) unstable; urgency=medium * Provide PAM configuration (Closes: #1032786). diff --git a/debian/greetd.greetd-greeter.pam b/debian/greetd.greetd-greeter.pam new file mode 100644 index 000..1ed7162 --- /dev/null +++ b/debian/greetd.greetd-greeter.pam @@ -0,0 +1,2 @@ +#%PAM-1.0 +@include login diff --git a/debian/greetd.greetd.pam b/debian/greetd.greetd.pam new file mode 100644 index 000..7f2a906 --- /dev/null +++ b/debian/greetd.greetd.pam @@ -0,0 +1,8 @@ +#%PAM-1.0 +@include login + +-authoptionalpam_gnome_keyring.so +-authoptionalpam_kwallet5.so + +-session optionalpam_gnome_keyring.so auto_start +-session optionalpam_kwallet5.so auto_start diff --git a/debian/greetd.install b/debian/greetd.install index 0a3fbfb..83f2dad 100644 --- a/debian/greetd.install +++ b/debian/greetd.install @@ -1,4 +1,3 @@ greetd.service /lib/systemd/system/ config.toml /etc/greetd/ debian/needrestart/50_greetd.conf /etc/needrestart/conf.d/ -debian/pam.d/greetd /etc/pam.d/ diff --git a/debian/pam.d/greetd b/debian/pam.d/greetd deleted file mode 100644 index 062217b..000 --- a/debian/pam.d/greetd +++ /dev/null @@ -1,22 +0,0 @@ -#%PAM-1.0 - -# Block login if they are globally disabled -auth requisite pam_nologin.so - -# Load environment from /etc/
Bug#1032914: phog: ships /etc/pam.d/greetd
Control: tags -1 + patch Hi, On Tue, 14 Mar 2023 00:20:10 +0100 Andreas Beckmann wrote: > > Hi, > > during a test with piuparts I noticed your package failed to install > because it tries to overwrite other packages files. > > From the attached log (scroll to the bottom...): > > https://ci.debian.net/data/autopkgtest/testing/amd64/p/phog/32130044/log.gz > > Preparing to unpack .../phog_0.1.3-1_amd64.deb ... > Unpacking phog (0.1.3-1) ... > dpkg: error processing archive /var/cache/apt/archives/phog_0.1.3-1_amd64.deb (--unpack): > trying to overwrite '/etc/pam.d/greetd', which is also in package greetd 0.9.0-2 > Errors were encountered while processing: > /var/cache/apt/archives/phog_0.1.3-1_amd64.deb > E: Sub-process /usr/bin/dpkg returned an error code (1) > > > greetd recently started to ship /etc/pam.d/greetd (with different > content) itself. Thanks for the heads-up! I have a pending MR for fixing this bug on phog's side (see https://salsa.debian.org/DebianOnMobile-team/phog/-/merge_requests/5), however this would require small changes to greetd as well (+cc duck for that matter) to ensure users don't end up in a messed up situation. I opened a MR on salsa's greetd (https://salsa.debian.org/debian/greetd/-/merge_requests/1), attaching the corresponding patches here as well for completeness. @duck, any comment on the above? Cheers, Arnaud > > > cheers, > > Andreas > > From eca07bda4c0b272ded196008c3d4528c756f5bb6 Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Wed, 15 Mar 2023 13:51:11 +0100 Subject: [PATCH 1/3] debian: update PAM config(s) Except for the gnome-keyring bits, all items currently set in the `greetd` PAM config are already part of the `login` config. Including the latter makes the `greetd` config simpler. This commit also calls the PAM modules needed for unlocking the KDE wallet as well, and adds the `greetd-greeter` config (simply including `login` as the greeter itself doesn't need to deal with keyrings). Finally, switch to using debhelper for installing the configs instead of handling those manually. --- debian/greetd.greetd-greeter.pam | 2 ++ debian/greetd.greetd.pam | 8 debian/greetd.install| 1 - debian/pam.d/greetd | 22 -- debian/rules | 5 - 5 files changed, 14 insertions(+), 24 deletions(-) create mode 100644 debian/greetd.greetd-greeter.pam create mode 100644 debian/greetd.greetd.pam delete mode 100644 debian/pam.d/greetd diff --git a/debian/greetd.greetd-greeter.pam b/debian/greetd.greetd-greeter.pam new file mode 100644 index 000..1ed7162 --- /dev/null +++ b/debian/greetd.greetd-greeter.pam @@ -0,0 +1,2 @@ +#%PAM-1.0 +@include login diff --git a/debian/greetd.greetd.pam b/debian/greetd.greetd.pam new file mode 100644 index 000..7f2a906 --- /dev/null +++ b/debian/greetd.greetd.pam @@ -0,0 +1,8 @@ +#%PAM-1.0 +@include login + +-authoptionalpam_gnome_keyring.so +-authoptionalpam_kwallet5.so + +-session optionalpam_gnome_keyring.so auto_start +-session optionalpam_kwallet5.so auto_start diff --git a/debian/greetd.install b/debian/greetd.install index 0a3fbfb..83f2dad 100644 --- a/debian/greetd.install +++ b/debian/greetd.install @@ -1,4 +1,3 @@ greetd.service /lib/systemd/system/ config.toml /etc/greetd/ debian/needrestart/50_greetd.conf /etc/needrestart/conf.d/ -debian/pam.d/greetd /etc/pam.d/ diff --git a/debian/pam.d/greetd b/debian/pam.d/greetd deleted file mode 100644 index 062217b..000 --- a/debian/pam.d/greetd +++ /dev/null @@ -1,22 +0,0 @@ -#%PAM-1.0 - -# Block login if they are globally disabled -auth requisite pam_nologin.so - -# Load environment from /etc/environment and ~/.pam_environment -session required pam_env.so readenv=1 -session required pam_env.so readenv=1 envfile=/etc/default/locale - -@include common-auth - --auth optional pam_gnome_keyring.so - -@include common-account - -session requiredpam_limits.so -session requiredpam_loginuid.so -@include common-session - --session optionalpam_gnome_keyring.so auto_start - -@include common-password diff --git a/debian/rules b/debian/rules index 523b72b..1c1d9c5 100755 --- a/debian/rules +++ b/debian/rules @@ -30,10 +30,13 @@ execute_after_dh_install: # bad perms chmod a-x debian/greetd/lib/systemd/system/greetd.service +override_dh_installpam: + dh_installpam --name=greetd + dh_installpam --name=greetd-greeter + override_dh_installsystemd: dh_installsystemd --no-stop-on-upgrade --no-start execute_after_dh_auto_clean: make -C man clean rm -f debian/cargo-checksum.json - -- 2.39.1 From be90d0cb662cf94de32bbb95f9070a6127b25bef Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Wed, 15 Mar 2023 13:52:39 +0100 Subject: [PATCH 2/3] d/control: break/replace older `phog` `ph
Bug#1017015: [Debian-on-mobile-maintainers] Bug#1017015: gnome-console: bugs after switch to GTK4
Hi Jeremy, Le 20/09/2022 à 00:45, Jeremy Bicha a écrit : Control: retitle -1 gnome-console: copying won't work if end of line is selected I intend to lower the severity of this bug to Important once gtk4 migrates to Testing The Ctrl+Shift bug is fixed in gtk4; the open link bug was fixed in vte2.91. That only leaves one significant known issue which can be worked around. That sounds good, thanks for tracking those issues! IIUC the workaround for the remaining issue is using middle-click-paste, is that right? Cheers, Arnaud Thank you, Jeremy Bicha ___ Debian-on-mobile-maintainers mailing list debian-on-mobile-maintain...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-on-mobile-maintainers
Bug#1016396: marked as pending in squeekboard
Control: tag -1 pending Hello, Bug #1016396 in squeekboard reported by you has been fixed in the Git repository and is awaiting an upload. You can see the commit message below and you can check the diff of the fix at: https://salsa.debian.org/DebianOnMobile-team/squeekboard/-/commit/ca29db99cb679d0a823057598cf06073d4641aea d/rules: fix build on ppc64el Due to a rust bug on ppc64el, `squeekboard-test-layout` fails to build properly, causing the whole build to fail on this architecture. This prevents newer versions of the package to migrate to testing. This bug is due to the linker trying to resolve unused symbols when building a rust binary and is only seen when using version 1.59.0 of rustc. This commit works around this problem by adding the needed linker flags to ensure all symbols are properly resolved, even those not actually used by the binaries. Those changes can be reverted once a newer version of rustc is packaged for Debian. Note: this commit also drops the `xgot` feature for mips64el as it is now automatically enabled for this architecture in Debian's rustc. Closes: #1016396 (this message was generated automatically) -- Greetings https://bugs.debian.org/1016396
Bug#1011823: marked as pending in purple-xmpp-http-upload
Control: tag -1 pending Hello, Bug #1011823 in purple-xmpp-http-upload reported by you has been fixed in the Git repository and is awaiting an upload. You can see the commit message below and you can check the diff of the fix at: https://salsa.debian.org/DebianOnMobile-team/purple-xmpp-http-upload/-/commit/f480bf62f1640548d02f5af4a0a0659344a53b05 Adjust shlibdeps override Closes: #1011823, thanks to Lucas Nussbaum (this message was generated automatically) -- Greetings https://bugs.debian.org/1011823
Bug#965878: Bug #965878: xbitmaps: Removal of obsolete debhelper compat 5 and 6 in bookworm
Dear maintainer(s), As a follow-up to my previous message above, I've also worked towards fixing a few other problems and updating the package so it follows the current best practices. I'm sending those patches as a separate email as those aren't directly related to this bug, but are still relevant for "modernizing" this package. Best regards, ArnaudFrom c8c3457d402be90152b69f8c45044947a8727975 Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Thu, 26 May 2022 14:19:11 +0200 Subject: [PATCH 2/6] Import changelog entry from last NMU (1.1.1-2.1) --- debian/changelog | 7 +++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index d1ad693..ddd7802 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,13 @@ xbitmaps (1.1.1-3) UNRELEASED; urgency=low -- Julien Cristau Thu, 30 Aug 2012 20:55:41 +0200 +xbitmaps (1.1.1-2.1) unstable; urgency=medium + + * Non maintainer upload by the Reproducible Builds team. + * No source change upload to rebuild on buildd with .buildinfo files. + + -- Holger Levsen Fri, 18 Dec 2020 21:00:22 +0100 + xbitmaps (1.1.1-2) unstable; urgency=low * Remove David from Uploaders. -- 2.35.1 From 8314b42e1904c7490bbe92801b45ee834e70d3df Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Thu, 26 May 2022 14:04:03 +0200 Subject: [PATCH 3/6] Update Vcs-* control fields to point to current repo locations --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 6bb68e8..b74abeb 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Build-Depends: pkg-config, xutils-dev (>= 1:7.5~), Standards-Version: 3.8.3 -Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/data/xbitmaps.git -Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/data/xbitmaps.git +Vcs-Git: https://salsa.debian.org/xorg-team/data/xbitmaps.git +Vcs-Browser: https://salsa.debian.org/xorg-team/data/xbitmaps Package: xbitmaps Architecture: all -- 2.35.1 From fa01a69a9aa83209f1a6671d0b37e5a28bb90e77 Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Thu, 26 May 2022 14:18:35 +0200 Subject: [PATCH 4/6] Update watch file to version 4 and fix typo --- debian/watch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/watch b/debian/watch index f0586a0..0d68a0f 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,2 @@ -#git=git://anongit.freedesktop.org/xorg/data/bitmaps -version=3 -https://xorg.freedesktop.orgreleases/individual/data/ xbitmaps-(.*)\.tar\.gz +version=4 +https://xorg.freedesktop.org/releases/individual/data/ xbitmaps-(.*)\.tar\.gz -- 2.35.1 From e5499ceb1bacae9d03f1802c04eb9cb18fe1a2de Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Thu, 26 May 2022 14:04:34 +0200 Subject: [PATCH 5/6] Convert to format 3.0 (quilt) and current best practices The files added to the original source tree (autogen.sh and .gitignore) are converted to quilt patches. Missing fields (Homepage, Rules-Requires-Root) are added to d/control and d/copyright is converted to DEP-5 format. Finally, Standards-Version is updated to the current version. --- .gitignore| 78 autogen.sh| 13 -- debian/control| 4 +- debian/copyright | 51 ...utogen.sh-script-and-.gitignore-file.patch | 117 ++ debian/patches/series | 1 + debian/source/format | 1 + 7 files changed, 151 insertions(+), 114 deletions(-) delete mode 100644 .gitignore delete mode 100755 autogen.sh create mode 100644 debian/patches/Add-autogen.sh-script-and-.gitignore-file.patch create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e99968f..000 --- a/.gitignore +++ /dev/null @@ -1,78 +0,0 @@ -# -# X.Org module default exclusion patterns -# The next section if for module specific patterns -# -# Do not edit the following section -# GNU Build System (Autotools) -aclocal.m4 -autom4te.cache/ -autoscan.log -ChangeLog -compile -config.guess -config.h -config.h.in -config.log -config-ml.in -config.py -config.status -config.status.lineno -config.sub -configure -configure.scan -depcomp -.deps/ -INSTALL -install-sh -.libs/ -libtool -libtool.m4 -ltmain.sh -lt~obsolete.m4 -ltoptions.m4 -ltsugar.m4 -ltversion.m4 -Makefile -Makefile.in -mdate-sh -missing -mkinstalldirs -*.pc -py-compile -stamp-h? -symlink-tree -texinfo.tex -ylwrap - -# Do not edit the following section -# Edit Compile Debug Document Distribute -*~ -*.[0-9] -*.[0-9]x -*.bak -*.bin -core -*.dll -*.exe -*-ISO*.bdf -*-JIS*.bdf -*-KOI8*.bdf -*.kld -*.ko -*.ko.cmd -*.lai -*.l[oa] -*.[oa] -*.obj -*.patch -*.so -*.pcf.gz -*.pdb -*.tar.bz2 -*.tar.gz -# -# Add & Override patterns for bit
Bug#965878: Bug #965878: xbitmaps: Removal of obsolete debhelper compat 5 and 6 in bookworm
Dear maintainer(s), I worked on upgrading this package to the current debhelper compat level (13). Attached is the corresponding patch. I have verified the generated package is bit-for-bit identical to the version currently in the archive. Best regards, ArnaudFrom e15fcd1bb95cfc0eb069264d4ce4713ba5fde765 Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Thu, 26 May 2022 01:33:28 +0200 Subject: [PATCH 1/6] Update to debhelper compat level 13 This requires updating the build depends (as automake is already pulled in by debhelper, but pkg-config is not and needed by the configure script). Take this opportunity to switch to using `dh` and rewrite the rules file accordingly. The README.source file is also modified to reflect dropping the now-unused XSFBS scripts. Closes: #965878 --- debian/README.source | 30 +- debian/compat | 1 - debian/control | 4 +- debian/rules | 85 +- debian/xsfbs/repack.sh | 32 --- debian/xsfbs/xsfbs.mk | 276 -- debian/xsfbs/xsfbs.sh | 622 - 7 files changed, 11 insertions(+), 1039 deletions(-) delete mode 100644 debian/compat delete mode 100755 debian/xsfbs/repack.sh delete mode 100755 debian/xsfbs/xsfbs.mk delete mode 100644 debian/xsfbs/xsfbs.sh diff --git a/debian/README.source b/debian/README.source index 34ab4bf..5716df4 100644 --- a/debian/README.source +++ b/debian/README.source @@ -6,12 +6,12 @@ Quick Guide To Patching This Package For The Impatient 2. Unpack the package as usual with "dpkg-source -x" 3. Run the "patch" target in debian/rules 4. Create a new patch with "quilt new" (see quilt(1)) -5. Edit all the files you want to include in the patch with "quilt edit" +5. Edit all the files you want to include in the patch with "quilt edit" (see quilt(1)). 6. Write the patch with "quilt refresh" (see quilt(1)) 7. Run the "clean" target in debian/rules -Alternatively, instead of using quilt directly, you can drop the patch in to +Alternatively, instead of using quilt directly, you can drop the patch in to debian/patches and add the name of the patch to debian/patches/series. @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. @@ -47,27 +47,3 @@ are involved: case, it appears directly in the .diff.gz. * Otherwise, the patch is added to debian/patches/ which is managed with quilt as documented in /usr/share/doc/quilt/README.source. - -quilt is actually invoked by the Debian X packaging through a larger -set of scripts called XSFBS. XSFBS brings some other X specific -features such as managing dependencies and conflicts due to the video -and input driver ABIs. -XSFBS itself is maintained in a separate repository at - git://git.debian.org/pkg-xorg/xsfbs.git -and it is pulled inside the other Debian X repositories when needed. - -The XSFBS patching system requires a build dependency on quilt. Also -a dependency on $(STAMP_DIR)/patch has to be added to debian/rules -so that the XSFBS patching occurs before the actual build. So the -very first target of the build (likely the one running autoreconf) -should depend on $(STAMP_DIR)/patch. It should also not depend on -anything so that parallel builds are correctly supported (nothing -should probably run while patching is being done). And finally, the -clean target should depend on the xsfclean target so that patches -are unapplied on clean. - -When the upstream sources contain some DFSG-nonfree files, they are -listed in text files in debian/prune/ in the "debian-*" branch of -the Debian repository. XSFBS' scripts then take care of removing -these listed files during the build so as to generate a modified -DFSG-free .orig.tar.gz tarball. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control index fda5b3f..6bb68e8 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force Build-Depends: - debhelper (>= 5), + debhelper-compat (= 13), + pkg-config, xutils-dev (>= 1:7.5~), - automake, Standards-Version: 3.8.3 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/data/xbitmaps.git Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/data/xbitmaps.git diff --git a/debian/rules b/debian/rules index b4288e4..f1b0bf1 100755 --- a/debian/rules +++ b/debian/rules @@ -7,84 +7,11 @@ # Uncomment
Bug#1007115: marked as pending in squeekboard
Control: tag -1 pending Hello, Bug #1007115 in squeekboard reported by you has been fixed in the Git repository and is awaiting an upload. You can see the commit message below and you can check the diff of the fix at: https://salsa.debian.org/DebianOnMobile-team/squeekboard/-/commit/2be3a02a598aeb9a28a45283111c7c651190932e d/patches: backport upstream patches fixing sizing Closes: #1007115 (this message was generated automatically) -- Greetings https://bugs.debian.org/1007115
Bug#1008919: marked as pending in phoc
Control: tag -1 pending Hello, Bug #1008919 in phoc reported by you has been fixed in the Git repository and is awaiting an upload. You can see the commit message below and you can check the diff of the fix at: https://salsa.debian.org/DebianOnMobile-team/phoc/-/commit/90e042544dc003f2dd1224ae296a1dc3450fa905 d/patches: handle touch frame events Not doing so disabled touch input for Qt-based applications, let's fix that. Closes: #1008919 (this message was generated automatically) -- Greetings https://bugs.debian.org/1008919
Bug#1008357: marked as pending in squeekboard
Control: tag -1 pending Hello, Bug #1008357 in squeekboard reported by you has been fixed in the Git repository and is awaiting an upload. You can see the commit message below and you can check the diff of the fix at: https://salsa.debian.org/DebianOnMobile-team/squeekboard/-/commit/d9e01226476122b043ac1c6e193cf1ae324775fa d/patches: fix build failure due to newer crate version Crate `clap` has been upgraded to 2.34 in Debian, so make sure this package still builds fine. Closes: #1008357 (this message was generated automatically) -- Greetings https://bugs.debian.org/1008357
Bug#1003756: marked as pending in squeekboard
Control: tag -1 pending Hello, Bug #1003756 in squeekboard reported by you has been fixed in the Git repository and is awaiting an upload. You can see the commit message below and you can check the diff of the fix at: https://salsa.debian.org/DebianOnMobile-team/squeekboard/-/commit/fcebac90353302cb06faf8e1b4c82dcff4a030da debian: build with newer crates versions Upstream relies on outdated glib/gio Rust crates: those currently in Debian don't provide the `v2_44` feature anymore, the minimum is`v2_50`. Updating the crates alone isn't enough as they introduce breaking API changes, so we must do the following: - bump the crates feature to the more recent common version which is `v2_58`. - backport an upstream patch to allow building with recent crates versions - change the build configuration so the corresponding conditional code paths and dependencies are used Closes: #1003756 (this message was generated automatically) -- Greetings https://bugs.debian.org/1003756
Bug#973350: marked as pending in phosh
Control: tag -1 pending Hello, Bug #973350 in phosh reported by you has been fixed in the Git repository and is awaiting an upload. You can see the commit message below and you can check the diff of the fix at: https://salsa.debian.org/DebianOnMobile-team/phosh/-/commit/7fa828963604e2ca05a3b6a4367c9bdffc75a06b debian: Depend on gnome-shell-common We use that schema for the keybindings. Closes: #973350 (this message was generated automatically) -- Greetings https://bugs.debian.org/973350
