From 9767c8681e2b3f093bb11880789cf552c033c62b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 24 Jan 2015 11:31:16 +0100 Subject: Remove upstream applied patches --- debian/changelog | 9 +++++++++ debian/patches/001-gee-0.8.patch | 29 ----------------------------- debian/patches/002-desktop_file.patch | 15 --------------- debian/patches/series | 2 -- 4 files changed, 9 insertions(+), 46 deletions(-) delete mode 100644 debian/patches/001-gee-0.8.patch delete mode 100644 debian/patches/002-desktop_file.patch diff --git a/debian/changelog b/debian/changelog index e6c594f..12d383a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +gnome-pie (0.5.7-1) UNRELEASED; urgency=low + + * New upstream release. + * debian/patches: + - Remove 001-gee-0.8.patch, applied upstream. + - Remove 002-desktop_file.patch, applied upstream. + + -- Jörg Frings-Fürst Sat, 24 Jan 2015 11:04:13 +0100 + gnome-pie (0.5.6-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/001-gee-0.8.patch b/debian/patches/001-gee-0.8.patch deleted file mode 100644 index 72e3c7a..0000000 --- a/debian/patches/001-gee-0.8.patch +++ /dev/null @@ -1,29 +0,0 @@ -Description: change gee API to 0.8 -Author: Jörg Frings-Fürst -Bug: https://github.com/Simmesimme/Gnome-Pie/issues/77 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=753863 -Last-Update: 2014-07-21 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/CMakeLists.txt -=================================================================== ---- trunk.orig/CMakeLists.txt 2013-03-17 12:15:02.000000000 +0100 -+++ trunk/CMakeLists.txt 2014-07-21 17:44:36.814563290 +0200 -@@ -43,7 +43,7 @@ - - pkg_check_modules(GIO REQUIRED gio-unix-2.0) - pkg_check_modules(CAIRO REQUIRED cairo) --pkg_check_modules(GEE REQUIRED gee-1.0) -+pkg_check_modules(GEE REQUIRED gee-0.8) - pkg_check_modules(X11 REQUIRED x11) - pkg_check_modules(XML REQUIRED libxml-2.0) - pkg_check_modules(XTST REQUIRED xtst) -@@ -155,7 +155,7 @@ - - set(VALA_PKGS - cairo -- gee-1.0 -+ gee-0.8 - x11 - gio-unix-2.0 - posix diff --git a/debian/patches/002-desktop_file.patch b/debian/patches/002-desktop_file.patch deleted file mode 100644 index 04fbc8e..0000000 --- a/debian/patches/002-desktop_file.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Add missing Keyword entry to desktop file -Author: Jörg Frings-Fürst -Forwarded: https://github.com/Simmesimme/Gnome-Pie/issues/78 -Last-Update: 2015-01-15 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/resources/gnome-pie.desktop -=================================================================== ---- trunk.orig/resources/gnome-pie.desktop -+++ trunk/resources/gnome-pie.desktop -@@ -5,3 +5,4 @@ Comment=Cakes don't lie. - Exec=gnome-pie - Icon=gnome-pie - Categories=GNOME;Utility; -+Keywords=Utility;Menu; diff --git a/debian/patches/series b/debian/patches/series index 8241731..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +0,0 @@ -002-desktop_file.patch -001-gee-0.8.patch -- cgit v1.2.3