diff -Nru gnome-disk-utility-3.18.2/configure gnome-disk-utility-3.18.3.1/configure --- gnome-disk-utility-3.18.2/configure 2015-11-06 21:59:40.000000000 +0000 +++ gnome-disk-utility-3.18.3.1/configure 2015-11-27 04:10:54.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNOME Disk Utility 3.18.2. +# Generated by GNU Autoconf 2.69 for GNOME Disk Utility 3.18.3.1. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='GNOME Disk Utility' PACKAGE_TARNAME='gnome-disk-utility' -PACKAGE_VERSION='3.18.2' -PACKAGE_STRING='GNOME Disk Utility 3.18.2' +PACKAGE_VERSION='3.18.3.1' +PACKAGE_STRING='GNOME Disk Utility 3.18.3.1' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-disk-utility' PACKAGE_URL='' @@ -1432,7 +1432,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNOME Disk Utility 3.18.2 to adapt to many kinds of systems. +\`configure' configures GNOME Disk Utility 3.18.3.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1503,7 +1503,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNOME Disk Utility 3.18.2:";; + short | recursive ) echo "Configuration of GNOME Disk Utility 3.18.3.1:";; esac cat <<\_ACEOF @@ -1673,7 +1673,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNOME Disk Utility configure 3.18.2 +GNOME Disk Utility configure 3.18.3.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1951,7 +1951,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNOME Disk Utility $as_me 3.18.2, which was +It was created by GNOME Disk Utility $as_me 3.18.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4126,7 +4126,7 @@ # Define the identity of the package. PACKAGE='gnome-disk-utility' - VERSION='3.18.2' + VERSION='3.18.3.1' cat >>confdefs.h <<_ACEOF @@ -15915,7 +15915,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNOME Disk Utility $as_me 3.18.2, which was +This file was extended by GNOME Disk Utility $as_me 3.18.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15981,7 +15981,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNOME Disk Utility config.status 3.18.2 +GNOME Disk Utility config.status 3.18.3.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru gnome-disk-utility-3.18.2/configure.ac gnome-disk-utility-3.18.3.1/configure.ac --- gnome-disk-utility-3.18.2/configure.ac 2015-11-06 21:58:56.000000000 +0000 +++ gnome-disk-utility-3.18.3.1/configure.ac 2015-11-27 04:09:13.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([GNOME Disk Utility],[3.18.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-disk-utility],[gnome-disk-utility]) +AC_INIT([GNOME Disk Utility],[3.18.3.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-disk-utility],[gnome-disk-utility]) AX_IS_RELEASE([git-directory]) diff -Nru gnome-disk-utility-3.18.2/debian/changelog gnome-disk-utility-3.18.3.1/debian/changelog --- gnome-disk-utility-3.18.2/debian/changelog 2015-11-09 11:27:15.000000000 +0000 +++ gnome-disk-utility-3.18.3.1/debian/changelog 2015-12-01 16:35:08.000000000 +0000 @@ -1,3 +1,19 @@ +gnome-disk-utility (3.18.3.1-1ubuntu1) xenial; urgency=medium + + * Resynchronize on Debian, remaining changes + - Build-Depends dh-translations, gnome-common and appstream-util + - build with dh-translations + - debian/patches/dont-use-libdvdread: Revert commit that depends on + libdvdread since it's in universe + + -- Sebastien Bacher Mon, 26 Oct 2015 11:29:08 +0100 + +gnome-disk-utility (3.18.3.1-1) unstable; urgency=medium + + * New upstream release. + + -- Michael Biebl Mon, 30 Nov 2015 00:00:02 +0100 + gnome-disk-utility (3.18.2-0ubuntu1) xenial; urgency=medium * New upstream version diff -Nru gnome-disk-utility-3.18.2/NEWS gnome-disk-utility-3.18.3.1/NEWS --- gnome-disk-utility-3.18.2/NEWS 2015-11-06 21:58:48.000000000 +0000 +++ gnome-disk-utility-3.18.3.1/NEWS 2015-11-27 04:09:57.000000000 +0000 @@ -1,3 +1,8 @@ +3.18.3.1 - November 26, 2015 +============================ + +* Fix the --restore-disk-image option (Matthias Clasen) + 3.18.2 - November 6, 2015 ========================= diff -Nru gnome-disk-utility-3.18.2/src/disks/gduapplication.c gnome-disk-utility-3.18.3.1/src/disks/gduapplication.c --- gnome-disk-utility-3.18.2/src/disks/gduapplication.c 2015-10-09 02:45:16.000000000 +0000 +++ gnome-disk-utility-3.18.3.1/src/disks/gduapplication.c 2015-11-27 03:43:44.000000000 +0000 @@ -173,7 +173,7 @@ g_variant_dict_lookup (options, "block-device", "&s", &opt_block_device); g_variant_dict_lookup (options, "format-device", "b", &opt_format); g_variant_dict_lookup (options, "xid", "i", &opt_xid); - g_variant_dict_lookup (options, "restore-disk-image", "&s", &opt_restore_disk_image); + g_variant_dict_lookup (options, "restore-disk-image", "^&ay", &opt_restore_disk_image); if (opt_format && opt_block_device == NULL) { diff -Nru gnome-disk-utility-3.18.2/src/disks/resources.c gnome-disk-utility-3.18.3.1/src/disks/resources.c --- gnome-disk-utility-3.18.2/src/disks/resources.c 2015-10-09 02:45:31.000000000 +0000 +++ gnome-disk-utility-3.18.3.1/src/disks/resources.c 2015-11-27 04:11:01.000000000 +0000 @@ -26067,17 +26067,43 @@ #define G_HAS_CONSTRUCTORS 1 -#define G_DEFINE_CONSTRUCTOR(_func) \ +/* We do some weird things to avoid the constructors being optimized + * away on VS2015 if WholeProgramOptimization is enabled. First we + * make a reference to the array from the wrapper to make sure its + * references. Then we use a pragma to make sure the wrapper function + * symbol is always included at the link stage. Also, the symbols + * need to be extern (but not dllexport), even though they are not + * really used from another object file. + */ + +/* We need to account for differences between the mangling of symbols + * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed + * with an underscore but symbols on x64 are not. + */ +#ifdef _WIN64 +#define G_MSVC_SYMBOL_PREFIX "" +#else +#define G_MSVC_SYMBOL_PREFIX "_" +#endif + +#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX) +#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX) + +#define G_MSVC_CTOR(_func,_sym_prefix) \ static void _func(void); \ - static int _func ## _wrapper(void) { _func(); return 0; } \ + extern int (* _array ## _func)(void); \ + int _func ## _wrapper(void) { _func(); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \ __pragma(section(".CRT$XCU",read)) \ - __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _wrapper; + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper; -#define G_DEFINE_DESTRUCTOR(_func) \ +#define G_MSVC_DTOR(_func,_sym_prefix) \ static void _func(void); \ - static int _func ## _constructor(void) { atexit (_func); return 0; } \ + extern int (* _array ## _func)(void); \ + int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \ __pragma(section(".CRT$XCU",read)) \ - __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor; + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor; #elif defined (_MSC_VER)