From 1966bd35b756f80a4ecacd4ca0e06e981c5b477f Mon Sep 17 00:00:00 2001 From: corsac Date: Thu, 9 Oct 2014 09:05:13 +0000 Subject: [PATCH] * debian/patches: - 04_fix-double-free-configuration-key-source dropped, included upstream. git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@8647 0c9b3bff-18ee-0310-b944-d1aa2700132f --- debian/changelog | 2 ++ ...4_fix-double-free-configuration-key-source.patch | 13 ------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 debian/patches/04_fix-double-free-configuration-key-source.patch diff --git a/debian/changelog b/debian/changelog index e7938cd..f570930 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ lightdm (1.10.3-1) UNRELEASED; urgency=medium * New upstream release. + * debian/patches: + - 04_fix-double-free-configuration-key-source dropped, included upstream. * debian/upstream/signing-key.pgp added, add PGP key for Robert Ancell (0x18EAA1890F7C882E). * debian/watch updated, add mangle option to check PGP signatures. diff --git a/debian/patches/04_fix-double-free-configuration-key-source.patch b/debian/patches/04_fix-double-free-configuration-key-source.patch deleted file mode 100644 index 5d1251d..0000000 --- a/debian/patches/04_fix-double-free-configuration-key-source.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'common/configuration.c' ---- lightdm/common/configuration.c 2014-09-07 23:28:20 +0000 -+++ lightdm/common/configuration.c 2014-10-08 19:52:42 +0000 -@@ -311,7 +311,7 @@ - { - config->priv = G_TYPE_INSTANCE_GET_PRIVATE (config, CONFIGURATION_TYPE, ConfigurationPrivate); - config->priv->key_file = g_key_file_new (); -- config->priv->key_sources = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); -+ config->priv->key_sources = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - } - - static void - diff --git a/debian/patches/series b/debian/patches/series index c778f6f..c9f9a54 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 01_set-default-path.patch 02_fix-apparmor-profile.patch -04_fix-double-free-configuration-key-source.patch 05_debianize-pam-files.patch 06_change-user-dirs.patch -- 2.39.2