--- debian/control | 1 + debian/patches/remove-appdata.patch | 58 ------------------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 debian/patches/remove-appdata.patch
diff --git a/debian/control b/debian/control index c907bf6..a51512d 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Uploaders: Reinhard Tartler <siret...@tauware.de>, James Cowgill <james...@cowgill.org.uk> Build-Depends: + appdata-tools, debhelper (>= 9), desktop-file-utils, dh-autoreconf, diff --git a/debian/patches/remove-appdata.patch b/debian/patches/remove-appdata.patch deleted file mode 100644 index e1d9b19..0000000 --- a/debian/patches/remove-appdata.patch +++ /dev/null @@ -1,58 +0,0 @@ -Description: Remove AppData from build system - This requires the appdata-tools package which is not in Debian yet. - Partially reverts upstream commit https://git.gnome.org/browse/easytag/commit/?id=02d199b2cac7c34b36cb534a48eda32172efb941 -Author: James Cowgill <james...@cowgill.org.uk> -Forwarded: not-needed -Last-Update: 2014-02-22 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/configure.ac -+++ b/configure.ac -@@ -27,9 +27,6 @@ - AS_IF([test "x$USE_NLS" != "xno"], - [AC_DEFINE([ENABLE_NLS], [1], [Native Language support is enabled])]) - --dnl AppData --APPDATA_XML -- - dnl ------------------------------- - dnl Checks for programs. - dnl ------------------------------- ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,6 @@ - ACLOCAL_AMFLAGS = -I m4 - - DISTCHECK_CONFIGURE_FLAGS = \ -- --enable-appdata-check \ - --enable-flac \ - --enable-id3v23 \ - --enable-ogg \ -@@ -149,11 +148,6 @@ - $(AM_V_at)$(MKDIR_P) $(@D) - $(AM_V_at)touch $@ - --@APPDATA_XML_RULES@ --@INTLTOOL_XML_RULE@ --appdata_in_files = data/easytag.appdata.xml.in --appdata_XML = $(appdata_in_files:.appdata.xml.in=.appdata.xml) -- - @INTLTOOL_DESKTOP_RULE@ - desktopdir = $(datadir)/applications - desktop_in_files = data/easytag.desktop.in -@@ -230,7 +224,6 @@ - test -n "$(DESTDIR)" || $(UPDATE_ICON_CACHE) "$(iconthemedir)" - - dist_noinst_DATA = \ -- $(appdata_in_files) \ - $(desktop_in_files) \ - $(easytag_headers) \ - src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff \ -@@ -267,7 +260,6 @@ - endif - - CLEANFILES = \ -- $(appdata_XML) \ - $(check_SCRIPTS) \ - $(desktop_DATA) \ - $(easytag_rc) \ diff --git a/debian/patches/series b/debian/patches/series index 79b5abe..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -remove-appdata.patch -- 1.8.5.3 _______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers