[SCM] easytag/master: Remove AppData support from build system

jcowgill-guest at users.alioth.debian.org jcowgill-guest at users.alioth.debian.org
Tue Feb 25 15:39:59 UTC 2014


The following commit has been merged in the master branch:
commit 99718cdff30c6962047459616a5b268ed1c8a99a
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sun Feb 23 13:35:19 2014 +0000

    Remove AppData support from build system
    
    - AppData support requires the appdata-tools package which is
      not yet available in Debian.

diff --git a/debian/patches/remove-appdata.patch b/debian/patches/remove-appdata.patch
new file mode 100644
index 0000000..e1d9b19
--- /dev/null
+++ b/debian/patches/remove-appdata.patch
@@ -0,0 +1,58 @@
+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 <james410 at 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 $@
+ 
+- at APPDATA_XML_RULES@
+- at 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 e69de29..79b5abe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove-appdata.patch

-- 
easytag packaging



More information about the pkg-multimedia-commits mailing list