Package: gpaste
Version: 3.28.2-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Hi there,

Soon gjs is probably going to be removed on s390x (see #909536 and
#906016). This will be a problem for gpaste's build dependency on
libgjs-dev.

However, this is only used to build a gnome shell extension for an
Arch: all package. I think it would be okay to move the BD to BDI and
fiddle with the configure flags to only build the extension when
building its package. See the attached patch.

Cheers,
-- 
Iain Lane                                  [ i...@orangesquash.org.uk ]
Debian Developer                                   [ la...@debian.org ]
Ubuntu Developer                                   [ la...@ubuntu.com ]
diff -Nru gpaste-3.28.2/debian/control gpaste-3.28.2/debian/control
--- gpaste-3.28.2/debian/control        2018-09-06 14:29:43.000000000 +0100
+++ gpaste-3.28.2/debian/control        2018-10-03 12:17:31.000000000 +0100
@@ -21,9 +21,9 @@
  libdbus-1-dev,
  libxtst-dev,
  libclutter-1.0-dev,
- libgjs-dev (>= 1.48.0),
  libmutter-3-dev,
  valac (>= 0.32)
+Build-Depends-Indep: libgjs-dev (>= 1.50.0)
 Standards-Version: 4.2.1
 Homepage: https://github.com/Keruspe/GPaste
 Vcs-Git: https://salsa.debian.org/debian/gpaste/gpaste.git
diff -Nru gpaste-3.28.2/debian/rules gpaste-3.28.2/debian/rules
--- gpaste-3.28.2/debian/rules  2018-03-31 10:57:09.000000000 +0100
+++ gpaste-3.28.2/debian/rules  2018-10-03 12:52:42.000000000 +0100
@@ -3,6 +3,12 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+CONFFLAGS :=   --with-systemduserunitdir=/usr/lib/systemd/user \
+               --enable-introspection \
+               --enable-appstream-util \
+               --enable-applet \
+               --enable-vala=no
+
 %:
        dh $@ --with gir
 
@@ -10,12 +16,13 @@
        dh_autoreconf -- ./autogen.sh
 
 override_dh_auto_configure:
-       dh_auto_configure -- \
-               --with-systemduserunitdir=/usr/lib/systemd/user
-               --enable-introspection \
-               --enable-appstream-util \
-               --enable-applet \
-               --enable-vala=no
+ifeq (gnome-shell-extensions-gpaste,$(filter 
gnome-shell-extensions-gpaste,$(shell dh_listpackages)))
+       dh_auto_configure -- $(CONFFLAGS) \
+                            --enable-gnome-shell-extension
+else
+       dh_auto_configure -- $(CONFFLAGS) \
+                            --disable-gnome-shell-extension
+endif
 
 override_dh_clean:
        dh_clean

Reply via email to