* 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

diff --git a/debian/changelog b/debian/changelog
index e7938cdc9ed025f0c79a7c8003b415fa2150d9a4..f57093031fd2d265642f6e24402f8a1094f4d8f5 100644 (file)
--- 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 (file)
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 c778f6f6a33d5789f1fb1fafabc197eca5327496..c9f9a5488f2c4fcdbc808110b25b1c421affe7cf 100644 (file)
--- 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