Remove patches

7 years ago · cf8ac59d94
3 changed files with 2 additions and 78 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,6 +1,8 @@
 muffin (2.8.1-1~) UNRELEASED; urgency=medium

  * New upstream release (2.8.1).
+  * Remove patch: support-muffin-typelib
+  * Remove patch: revert.patch

 -- Maximiliano Curia <maxy@debian.org>  Wed, 21 Oct 2015 12:58:23 +0200

--- a/debian/patches/revert.patch
+++ b/debian/patches/revert.patch
@ -1,76 +0,0 @@
-Description: Revert of 2 patches to solves a fails to build:
- f0a30f0aa62b00db543cc20edb6d6b03a34275c2
- 6ab824d46591c8db649162060c60127493b7af09
-Probably a better solution should be found and applied probably upstream.
-Author: Fabio Fantoni <fantonifabio@tiscali.it>
-Origin: Debian
---
- Makefile.am                        | 2 --
- src/Makefile.am                    | 4 ++--
- src/compositor/plugins/Makefile.am | 2 +-
- src/tools/Makefile.am              | 2 +-
- src/wm-tester/Makefile.am          | 2 +-
- 5 files changed, 5 insertions(+), 7 deletions(-)
-
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,8 +1,6 @@
- 
- SUBDIRS=src po doc data
- 
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
- EXTRA_DIST = HACKING MAINTAINERS rationales.txt
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -5,7 +5,7 @@
- 
- SUBDIRS=wm-tester tools compositor/plugins
- 
-AM_CPPFLAGS=								\
-+INCLUDES=								\
- 	$(MUFFIN_CFLAGS)						\
- 	-I$(srcdir)							\
- 	-I$(srcdir)/core						\
-@@ -223,7 +223,7 @@
- Meta-$(api_version).gir: libmuffin.la
- @META_GIR@_INCLUDES = GObject-2.0 CDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0
- @META_GIR@_PACKAGES = clutter-1.0 gtk+-3.0
-@META_GIR@_CFLAGS = $(AM_CPPFLAGS)
-+@META_GIR@_CFLAGS = $(INCLUDES)
- @META_GIR@_LIBS = libmuffin.la
- @META_GIR@_FILES =				\
- 	muffin-enum-types.h			\
--- a/src/compositor/plugins/Makefile.am
-+++ b/src/compositor/plugins/Makefile.am
-@@ -1,7 +1,7 @@
- 
- pkglibdir=@MUFFIN_PLUGIN_DIR@
- 
-AM_CPPFLAGS=@MUFFIN_CFLAGS@ -I $(top_srcdir)/src -DMUFFIN_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMUFFIN_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMUFFIN_PKGDATADIR=\"$(pkgdatadir)\" -DMUFFIN_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"muffin\" -DSN_API_NOT_YET_FROZEN=1 -DMUFFIN_MAJOR_VERSION=$(MUFFIN_MAJOR_VERSION) -DMUFFIN_MINOR_VERSION=$(MUFFIN_MINOR_VERSION) -DMUFFIN_MICRO_VERSION=$(MUFFIN_MICRO_VERSION) -DMUFFIN_PLUGIN_API_VERSION=$(MUFFIN_PLUGIN_API_VERSION) -DMUFFIN_PLUGIN_DIR=\"@MUFFIN_PLUGIN_DIR@\"
-+INCLUDES=@MUFFIN_CFLAGS@ -I $(top_srcdir)/src -DMUFFIN_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMUFFIN_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMUFFIN_PKGDATADIR=\"$(pkgdatadir)\" -DMUFFIN_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"muffin\" -DSN_API_NOT_YET_FROZEN=1 -DMUFFIN_MAJOR_VERSION=$(MUFFIN_MAJOR_VERSION) -DMUFFIN_MINOR_VERSION=$(MUFFIN_MINOR_VERSION) -DMUFFIN_MICRO_VERSION=$(MUFFIN_MICRO_VERSION) -DMUFFIN_PLUGIN_API_VERSION=$(MUFFIN_PLUGIN_API_VERSION) -DMUFFIN_PLUGIN_DIR=\"@MUFFIN_PLUGIN_DIR@\"
- 
- default_la_CFLAGS   = -fPIC
- default_la_SOURCES  = default.c
--- a/src/tools/Makefile.am
-+++ b/src/tools/Makefile.am
-@@ -3,7 +3,7 @@
- icondir=$(pkgdatadir)/icons
- icon_DATA=muffin-window-demo.png
- 
-AM_CPPFLAGS=@MUFFIN_WINDOW_DEMO_CFLAGS@ @MUFFIN_MESSAGE_CFLAGS@ \
-+INCLUDES=@MUFFIN_WINDOW_DEMO_CFLAGS@ @MUFFIN_MESSAGE_CFLAGS@ \
- 	-I$(top_srcdir)/src \
- 	-DMUFFIN_ICON_DIR=\"$(pkgdatadir)/icons\" \
- 	-DMUFFIN_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
--- a/src/wm-tester/Makefile.am
-+++ b/src/wm-tester/Makefile.am
-@@ -1,5 +1,5 @@
- 
-AM_CPPFLAGS=@MUFFIN_CFLAGS@
-+INCLUDES=@MUFFIN_CFLAGS@
- 
- wm_tester_SOURCES= 				\
- 	main.c
--- a/debian/patches/series
+++ b/debian/patches/series
@ -1,2 +0,0 @@
-support-muffin-typelib
-revert.patch