diff -pruN 0.7.9-1/debian/changelog 0.7.9-1ubuntu2/debian/changelog --- 0.7.9-1/debian/changelog 2020-02-28 15:56:21.000000000 +0000 +++ 0.7.9-1ubuntu2/debian/changelog 2020-03-20 15:56:09.000000000 +0000 @@ -1,3 +1,22 @@ +libnotify (0.7.9-1ubuntu2) focal; urgency=medium + + * debian/test/control: + - don't Depends on notification-daemon:native, the current tests don't + require a server, also fixes i386 where n-d doesn't exists + + -- Sebastien Bacher Fri, 20 Mar 2020 16:56:09 +0100 + +libnotify (0.7.9-1ubuntu1) focal; urgency=medium + + * Merge with Debian, remaining changes + * debian/control.in, + debian/rules: + - generate the notification-daemon recommends with some hacks, + this allows notification-daemon to be demoted to universe + * Also make autopkgtest dependencies cross-test-friendly. + + -- Sebastien Bacher Fri, 13 Mar 2020 09:12:50 +0100 + libnotify (0.7.9-1) unstable; urgency=medium * New upstream release diff -pruN 0.7.9-1/debian/control 0.7.9-1ubuntu2/debian/control --- 0.7.9-1/debian/control 2020-02-28 15:56:21.000000000 +0000 +++ 0.7.9-1ubuntu2/debian/control 2020-03-13 08:12:50.000000000 +0000 @@ -5,7 +5,8 @@ Source: libnotify Priority: optional Section: libs -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Emilio Pozuelo Monfort , Jeremy Bicha , Laurent Bigonville , Martin Pitt , Michael Biebl Build-Depends: debhelper-compat (= 12), docbook-xsl-ns, @@ -45,7 +46,7 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: notification-daemon +Recommends: ${notification-daemon:Recommends} Description: sends desktop notifications to a notification daemon A library that sends desktop notifications to a notification daemon, as defined in the Desktop Notifications spec. These notifications can be diff -pruN 0.7.9-1/debian/control.in 0.7.9-1ubuntu2/debian/control.in --- 0.7.9-1/debian/control.in 2020-02-28 15:56:21.000000000 +0000 +++ 0.7.9-1ubuntu2/debian/control.in 2020-03-13 08:12:50.000000000 +0000 @@ -1,7 +1,8 @@ Source: libnotify Priority: optional Section: libs -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: debhelper-compat (= 12), docbook-xsl-ns, @@ -41,7 +42,7 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: notification-daemon +Recommends: ${notification-daemon:Recommends} Description: sends desktop notifications to a notification daemon A library that sends desktop notifications to a notification daemon, as defined in the Desktop Notifications spec. These notifications can be diff -pruN 0.7.9-1/debian/rules 0.7.9-1ubuntu2/debian/rules --- 0.7.9-1/debian/rules 2020-02-28 15:56:21.000000000 +0000 +++ 0.7.9-1ubuntu2/debian/rules 2020-03-13 08:12:50.000000000 +0000 @@ -11,3 +11,19 @@ override_dh_makeshlibs: override_dh_missing: dh_missing --fail-missing + +# This is needed to keep notification-daemon out of Ubuntu main +# since germinate (?) doesn't handle alternate virtual depends well +# Something like this might be safe for Debian too but why bother if it's not needed? +# gnome-shell isn't currently available on s390x so don't recommend either dependency there +# i386 is partial arch +override_dh_gencontrol: +ifneq ($(shell dpkg-vendor --query vendor),Ubuntu) + dh_gencontrol -- -Vnotification-daemon:Recommends='notification-daemon' +else +ifeq (,$(filter i386 s390x,$(DEB_HOST_ARCH))) + dh_gencontrol -- -Vnotification-daemon:Recommends='gnome-shell | notification-daemon' +else + dh_gencontrol +endif +endif diff -pruN 0.7.9-1/debian/tests/build 0.7.9-1ubuntu2/debian/tests/build --- 0.7.9-1/debian/tests/build 2020-02-28 15:56:21.000000000 +0000 +++ 0.7.9-1ubuntu2/debian/tests/build 2020-03-13 08:12:50.000000000 +0000 @@ -9,6 +9,13 @@ set -e WORKDIR=$(mktemp -d) trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM cd $WORKDIR + +if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then + CROSS_COMPILE="$DEB_HOST_GNU_TYPE-" +else + CROSS_COMPILE= +fi + cat < libnotify_test.c #include #include @@ -33,8 +40,8 @@ int main(void) } EOF -gcc -o libnotify_test libnotify_test.c \ -`pkg-config --cflags --libs libnotify` -Wall -Werror +${CROSS_COMPILE}gcc -o libnotify_test libnotify_test.c \ +`${CROSS_COMPILE}pkg-config --cflags --libs libnotify` -Wall -Werror echo "build: OK" [ -x libnotify_test ] dbus-run-session -- xvfb-run ./libnotify_test diff -pruN 0.7.9-1/debian/tests/control 0.7.9-1ubuntu2/debian/tests/control --- 0.7.9-1/debian/tests/control 2020-02-28 15:56:21.000000000 +0000 +++ 0.7.9-1ubuntu2/debian/tests/control 2020-03-20 15:56:09.000000000 +0000 @@ -1,2 +1,2 @@ Tests: build -Depends: build-essential, dbus (>= 1.8), notification-daemon, xauth, xvfb, libnotify-dev, pkg-config +Depends: build-essential, dbus (>= 1.8), xauth, xvfb, libnotify-dev, pkg-config