diff -Nru elementary-default-settings-7.0.2+r393~ubuntu7.1/accountsservice/meson.build elementary-default-settings-7.1.0+r399~ubuntu7.1/accountsservice/meson.build --- elementary-default-settings-7.0.2+r393~ubuntu7.1/accountsservice/meson.build 2023-06-01 18:58:50.000000000 +0000 +++ elementary-default-settings-7.1.0+r399~ubuntu7.1/accountsservice/meson.build 2023-08-19 22:34:48.000000000 +0000 @@ -1,5 +1,5 @@ dbus_dep = dependency('dbus-1') -dbus_interfaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir', define_variable: ['datadir', datadir]) +dbus_interfaces_dir = dbus_dep.get_variable('interfaces_dir', pkgconfig_define: ['datadir', datadir]) install_data( 'io.elementary.pantheon.AccountsService.xml', @@ -7,7 +7,7 @@ ) polkit_dep = dependency('polkit-gobject-1') -polkit_actiondir = polkit_dep.get_pkgconfig_variable('actiondir', define_variable: ['prefix', prefix]) +polkit_actiondir = polkit_dep.get_variable('actiondir', pkgconfig_define: ['prefix', prefix]) install_data( 'io.elementary.pantheon.AccountsService.policy', @@ -15,10 +15,14 @@ ) act_dep = dependency('accountsservice') -act_interfacesdir = act_dep.get_pkgconfig_variable('interfacesdir', define_variable: ['datadir', datadir], default: datadir /'accountsservice' / 'interfaces') +act_interfacesdir = act_dep.get_variable( + 'interfacesdir', + pkgconfig_define: ['datadir', datadir], + default_value: datadir /'accountsservice' / 'interfaces' +) meson.add_install_script( symlink, - join_paths(dbus_interfaces_dir, 'io.elementary.pantheon.AccountsService.xml'), - join_paths(act_interfacesdir, 'io.elementary.pantheon.AccountsService.xml'), + dbus_interfaces_dir / 'io.elementary.pantheon.AccountsService.xml', + act_interfacesdir / 'io.elementary.pantheon.AccountsService.xml', ) diff -Nru elementary-default-settings-7.0.2+r393~ubuntu7.1/debian/changelog elementary-default-settings-7.1.0+r399~ubuntu7.1/debian/changelog --- elementary-default-settings-7.0.2+r393~ubuntu7.1/debian/changelog 2023-06-01 18:58:50.000000000 +0000 +++ elementary-default-settings-7.1.0+r399~ubuntu7.1/debian/changelog 2023-08-19 22:34:48.000000000 +0000 @@ -1,8 +1,14 @@ -elementary-default-settings (7.0.2+r393~ubuntu7.1) jammy; urgency=low +elementary-default-settings (7.1.0+r399~ubuntu7.1) jammy; urgency=low * Auto build. - -- Danielle Foré Thu, 01 Jun 2023 18:58:50 +0000 + -- Danielle Foré Sat, 19 Aug 2023 22:34:48 +0000 + +elementary-default-settings (7.1.0) jammy; urgency=medium + + * Release 7.1.0 + + -- Danielle Foré Fri, 11 Aug 2023 09:34:35 -0700 elementary-default-settings (7.0.2) jammy; urgency=medium diff -Nru elementary-default-settings-7.0.2+r393~ubuntu7.1/debian/control elementary-default-settings-7.1.0+r399~ubuntu7.1/debian/control --- elementary-default-settings-7.0.2+r393~ubuntu7.1/debian/control 2023-06-01 18:58:50.000000000 +0000 +++ elementary-default-settings-7.1.0+r399~ubuntu7.1/debian/control 2023-08-19 22:34:48.000000000 +0000 @@ -22,6 +22,6 @@ Architecture: all Depends: ${misc:Depends} Conflicts: print-test-page-elementary -Replaces: cups-filters, print-test-page-elementary +Replaces: print-test-page-elementary Description: printer test page for elementary Printer test page for elementary OS. diff -Nru elementary-default-settings-7.0.2+r393~ubuntu7.1/debian/elementary-printer-test-page.postrm elementary-default-settings-7.1.0+r399~ubuntu7.1/debian/elementary-printer-test-page.postrm --- elementary-default-settings-7.0.2+r393~ubuntu7.1/debian/elementary-printer-test-page.postrm 1970-01-01 00:00:00.000000000 +0000 +++ elementary-default-settings-7.1.0+r399~ubuntu7.1/debian/elementary-printer-test-page.postrm 2023-08-19 22:34:48.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh -e + +if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then + dpkg-divert --package elementary-printer-test-page --remove --rename \ + --divert /usr/share/cups/data/default-testpage.pdf.real /usr/share/cups/data/default-testpage.pdf +fi \ No newline at end of file diff -Nru elementary-default-settings-7.0.2+r393~ubuntu7.1/debian/elementary-printer-test-page.preinst elementary-default-settings-7.1.0+r399~ubuntu7.1/debian/elementary-printer-test-page.preinst --- elementary-default-settings-7.0.2+r393~ubuntu7.1/debian/elementary-printer-test-page.preinst 1970-01-01 00:00:00.000000000 +0000 +++ elementary-default-settings-7.1.0+r399~ubuntu7.1/debian/elementary-printer-test-page.preinst 2023-08-19 22:34:48.000000000 +0000 @@ -0,0 +1,4 @@ +#!/bin/sh -e + +dpkg-divert --package elementary-printer-test-page --add --rename \ + --divert /usr/share/cups/data/default-testpage.pdf.real /usr/share/cups/data/default-testpage.pdf \ No newline at end of file diff -Nru elementary-default-settings-7.0.2+r393~ubuntu7.1/debian/git-build-recipe.manifest elementary-default-settings-7.1.0+r399~ubuntu7.1/debian/git-build-recipe.manifest --- elementary-default-settings-7.0.2+r393~ubuntu7.1/debian/git-build-recipe.manifest 2023-06-01 18:58:50.000000000 +0000 +++ elementary-default-settings-7.1.0+r399~ubuntu7.1/debian/git-build-recipe.manifest 2023-08-19 22:34:48.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version {debupstream}+r393 -lp:~elementary-os/elementaryos/+git/default-settings git-commit:a3cb7b23408ee7f54951fca1c6047d2811ade7b6 +# git-build-recipe format 0.4 deb-version {debupstream}+r399 +lp:~elementary-os/elementaryos/+git/default-settings git-commit:7a2ac8a9f2ba699f383d8d3d423151b1a83e33b4 diff -Nru elementary-default-settings-7.0.2+r393~ubuntu7.1/meson/post_install.py elementary-default-settings-7.1.0+r399~ubuntu7.1/meson/post_install.py --- elementary-default-settings-7.0.2+r393~ubuntu7.1/meson/post_install.py 2023-06-01 18:58:50.000000000 +0000 +++ elementary-default-settings-7.1.0+r399~ubuntu7.1/meson/post_install.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -#!/usr/bin/env python3 - -import os -import sys -import subprocess - -if 'DESTDIR' not in os.environ: - schemadir = sys.argv[1] - - print('Compiling GSettings schemas...') - subprocess.call(['glib-compile-schemas', - schemadir]) diff -Nru elementary-default-settings-7.0.2+r393~ubuntu7.1/meson.build elementary-default-settings-7.1.0+r399~ubuntu7.1/meson.build --- elementary-default-settings-7.0.2+r393~ubuntu7.1/meson.build 2023-06-01 18:58:50.000000000 +0000 +++ elementary-default-settings-7.1.0+r399~ubuntu7.1/meson.build 2023-08-19 22:34:48.000000000 +0000 @@ -1,46 +1,48 @@ project( 'elementary-default-settings', - version: '7.0.2', + version: '7.1.0', + meson_version: '>= 0.58.0' ) +gnome = import('gnome') prefix = get_option('prefix') -datadir = join_paths(prefix, get_option('datadir')) +datadir = prefix / get_option('datadir') sysconfdir = get_option('sysconfdir') -schemadir = join_paths(datadir, 'glib-2.0', 'schemas') +schemadir = datadir / 'glib-2.0' / 'schemas' -meson.add_install_script('meson/post_install.py', schemadir) +gnome.post_install(glib_compile_schemas: true) -symlink = join_paths(meson.current_source_dir (), 'meson', 'create-symlink.sh') +symlink = meson.current_source_dir () / 'meson' / 'create-symlink.sh' # Setup system wide global environment for applications install_subdir( 'profile.d', - install_dir: join_paths(sysconfdir, 'profile.d'), + install_dir: sysconfdir / 'profile.d', strip_directory : true ) # Sudo password feedback in terminals install_data( 'sudoers.d/pwfeedback', - install_dir: join_paths(sysconfdir, 'sudoers.d') + install_dir: sysconfdir / 'sudoers.d' ) # CUPS Printing testpage install_data( 'cups/default-testpage.pdf', - install_dir: join_paths(datadir, 'cups', 'data') + install_dir: datadir / 'cups' / 'data' ) # GTK3 Settings install_data( 'gtk/settings.ini', - install_dir: join_paths(sysconfdir, 'gtk-3.0') + install_dir: sysconfdir / 'gtk-3.0' ) # So SessionInstaller can have an Icon install_data( 'sessioninstaller/sessioninstaller.desktop', - install_dir: join_paths(datadir, 'applications') + install_dir: datadir / 'applications' ) # Default gsettings overrides diff -Nru elementary-default-settings-7.0.2+r393~ubuntu7.1/meson_options.txt elementary-default-settings-7.1.0+r399~ubuntu7.1/meson_options.txt --- elementary-default-settings-7.0.2+r393~ubuntu7.1/meson_options.txt 2023-06-01 18:58:50.000000000 +0000 +++ elementary-default-settings-7.1.0+r399~ubuntu7.1/meson_options.txt 2023-08-19 22:34:48.000000000 +0000 @@ -8,6 +8,11 @@ value: '/usr/share/backgrounds/elementaryos-default', description: 'Path to default wallpaper to use in Pantheon.') +option('default-wallpaper-dark', + type: 'string', + value: '', + description: 'Path to dark wallpaper to use in Pantheon.') + option('plank-dockitems', type: 'boolean', value: true, diff -Nru elementary-default-settings-7.0.2+r393~ubuntu7.1/overrides/default-settings.gschema.override.in elementary-default-settings-7.1.0+r399~ubuntu7.1/overrides/default-settings.gschema.override.in --- elementary-default-settings-7.0.2+r393~ubuntu7.1/overrides/default-settings.gschema.override.in 2023-06-01 18:58:50.000000000 +0000 +++ elementary-default-settings-7.1.0+r399~ubuntu7.1/overrides/default-settings.gschema.override.in 2023-08-19 22:34:48.000000000 +0000 @@ -7,6 +7,7 @@ [org.gnome.desktop.background:Pantheon] picture-options='zoom' picture-uri='file://@DEFAULT_WALLPAPER@' +picture-uri-dark='file://@DEFAULT_WALLPAPER_DARK@' primary-color='#000000' [org.gnome.desktop.datetime:Pantheon] diff -Nru elementary-default-settings-7.0.2+r393~ubuntu7.1/overrides/meson.build elementary-default-settings-7.1.0+r399~ubuntu7.1/overrides/meson.build --- elementary-default-settings-7.0.2+r393~ubuntu7.1/overrides/meson.build 2023-06-01 18:58:50.000000000 +0000 +++ elementary-default-settings-7.1.0+r399~ubuntu7.1/overrides/meson.build 2023-08-19 22:34:48.000000000 +0000 @@ -1,14 +1,16 @@ if get_option('default-gsettings-overrides') default_wallpaper = get_option('default-wallpaper') + default_wallpaper_dark = get_option('default-wallpaper-dark') wallpaper_configuration = configuration_data() wallpaper_configuration.set('DEFAULT_WALLPAPER', default_wallpaper) + wallpaper_configuration.set('DEFAULT_WALLPAPER_DARK', default_wallpaper_dark) settings_override = configure_file( input: 'default-settings.gschema.override.in', output: '@BASENAME@', configuration: wallpaper_configuration, - install_dir: join_paths(schemadir) + install_dir: schemadir ) endif @@ -16,6 +18,6 @@ if get_option('plank-dockitems') install_data( 'plank-dockitems.gschema.override', - install_dir: join_paths(schemadir) + install_dir: schemadir ) endif diff -Nru elementary-default-settings-7.0.2+r393~ubuntu7.1/skel/meson.build elementary-default-settings-7.1.0+r399~ubuntu7.1/skel/meson.build --- elementary-default-settings-7.0.2+r393~ubuntu7.1/skel/meson.build 2023-06-01 18:58:50.000000000 +0000 +++ elementary-default-settings-7.1.0+r399~ubuntu7.1/skel/meson.build 2023-08-19 22:34:48.000000000 +0000 @@ -1,10 +1,10 @@ -skeldir = join_paths(sysconfdir, 'skel') +skeldir = sysconfdir / 'skel' # Planks Default DockItems if get_option('plank-dockitems') install_subdir( 'plank', - install_dir: join_paths(skeldir, '.config') + install_dir: skeldir / '.config' ) endif @@ -12,7 +12,7 @@ if get_option('appcenter-flatpak') install_subdir( 'flatpak', - install_dir: join_paths(skeldir, '.local', 'share') + install_dir: skeldir / '.local' / 'share' ) endif