diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-19 09:46:39 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-19 09:46:39 (GMT) |
| commit | 50178a68d2a352ea7a30231c4ec0c568ee4788fb (patch) | |
| tree | 3bc82406a82e805c3a291f8ee7b4940d6fdac9f4 | |
| parent | a485feb87c8582eec5802bd66d2af0f89a74432f (diff) | |
Drop patch 1002 now applied upstream.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/1002_fix_xsmp_implicit_pointer_conversion.patch | 10 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 735b583..d33984e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ sugar-toolkit (0.82.11-1) UNRELEASED; urgency=low * New upstream release. + * Drop patch 1002 now applied upstream. * Update debian/copyright and copyright hints (new copyright holders and years, same licenses). diff --git a/debian/patches/1002_fix_xsmp_implicit_pointer_conversion.patch b/debian/patches/1002_fix_xsmp_implicit_pointer_conversion.patch deleted file mode 100644 index f7a918f..0000000 --- a/debian/patches/1002_fix_xsmp_implicit_pointer_conversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- sugar-toolkit-0.81.5.orig/src/sugar/_sugarext.c 2008-06-20 10:53:45.000000000 -0600 -+++ sugar-toolkit-0.81.5/src/sugar/_sugarext.c 2008-07-07 16:08:04.000000000 -0600 -@@ -14,6 +14,7 @@ - #include "sugar-preview.h" - #include "sexy-icon-entry.h" - #include "gsm-session.h" -+#include "gsm-xsmp.h" - - #define EGG_SM_CLIENT_BACKEND_XSMP - #include "eggsmclient.h" diff --git a/debian/patches/series b/debian/patches/series index b308237..e25bb0c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 1001_danish_l10n.patch -1002_fix_xsmp_implicit_pointer_conversion.patch 1003_avoid_try-except-finally.patch 2001_sha1_on_older_python.patch 2002_ignore_debian_and_quilt-patches.patch |