diff --git a/debian/patches/1-AM_INIT_AUTOMAKE.patch b/debian/patches/1-AM_INIT_AUTOMAKE.patch deleted file mode 100644 index 0c91718..0000000 --- a/debian/patches/1-AM_INIT_AUTOMAKE.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: fix args to AM_INIT_AUTOMAKE - arguments to AM_INIT_AUTOMAKE have been deprecated. - see http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation -Author: IOhannes m zmölnig -Forwarded: https://github.com/dyne/frei0r/pull/5 -Last-Update: 2014-05-20 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- frei0r.orig/configure.ac -+++ frei0r/configure.ac -@@ -5,7 +5,7 @@ - AC_INIT(frei0r-plugins, [1.5.0], [frei0r-devel@dyne.org]) - AC_CONFIG_MACRO_DIR([m4]) - --AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -+AM_INIT_AUTOMAKE([foreign]) - - # Checks for programs. - AC_PROG_CXX diff --git a/debian/patches/1-build-doc.patch b/debian/patches/1-build-doc.patch deleted file mode 100644 index ff4f737..0000000 --- a/debian/patches/1-build-doc.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: fix install target for doc -Author: IOhannes m zmölnig -Forwarded: https://github.com/dyne/frei0r/pull/5 -Last-Update: 2014-05-20 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- frei0r.orig/doc/Makefile.am -+++ frei0r/doc/Makefile.am -@@ -22,10 +22,10 @@ - -cp -ra html $(distdir)/doc/ - - install-data: -- install -c -m 644 -d $(htmldocs_DATA) $(htmldocsdir) -+ install -c -m 644 -d $(htmldocs_DATA) $(DESTDIR)$(htmldocsdir) - - # Modify the install hook, so we can install directories - install-htmldocsDATA: -- mkdir -p $(htmldocsdir) -- cp -r ./html $(htmldocsdir)/ -+ mkdir -p $(DESTDIR)$(htmldocsdir) -+ cp -r ./html $(DESTDIR)$(htmldocsdir)/ - diff --git a/debian/patches/1-fix-spelling.patch b/debian/patches/1-fix-spelling.patch deleted file mode 100644 index 6d050c8..0000000 --- a/debian/patches/1-fix-spelling.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Fixing spelling mistakes -Author: IOhannes m zmölnig -Forwarded: https://github.com/dyne/frei0r/pull/5 -Forwarded: http://lists.dyne.org/lurker/message/20140521.064611.ef8b1c6a.en.html -Last-Update: 2014-05-21 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- frei0r.orig/src/filter/spillsupress/spillsupress.c -+++ frei0r/src/filter/spillsupress/spillsupress.c -@@ -124,7 +124,7 @@ - case 0: - info->name = "supresstype"; - info->type = F0R_PARAM_DOUBLE; -- info->explanation = "Defines if green or blue screen spill supress is applied"; -+ info->explanation = "Defines if green or blue screen spill suppress is applied"; - break; - } - } diff --git a/debian/patches/2-docs_DATA.patch b/debian/patches/2-docs_DATA.patch deleted file mode 100644 index d84dbb9..0000000 --- a/debian/patches/2-docs_DATA.patch +++ /dev/null @@ -1,13 +0,0 @@ -Description: Fixed files enumerated in Makefile.am - docs_DATA lists a few files without the .txt extension -Author: IOhannes m zmölnig ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- frei0r.orig/Makefile.am -+++ frei0r/Makefile.am -@@ -16,4 +16,4 @@ - pkgconfig_DATA = frei0r.pc - - docsdir = ${prefix}/share/doc/${PACKAGE} --docs_DATA = README ChangeLog TODO AUTHORS -+docs_DATA = README.txt ChangeLog.txt TODO.txt AUTHORS.txt diff --git a/debian/patches/docs_DATA.patch b/debian/patches/docs_DATA.patch new file mode 100644 index 0000000..d84dbb9 --- /dev/null +++ b/debian/patches/docs_DATA.patch @@ -0,0 +1,13 @@ +Description: Fixed files enumerated in Makefile.am + docs_DATA lists a few files without the .txt extension +Author: IOhannes m zmölnig +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- frei0r.orig/Makefile.am ++++ frei0r/Makefile.am +@@ -16,4 +16,4 @@ + pkgconfig_DATA = frei0r.pc + + docsdir = ${prefix}/share/doc/${PACKAGE} +-docs_DATA = README ChangeLog TODO AUTHORS ++docs_DATA = README.txt ChangeLog.txt TODO.txt AUTHORS.txt diff --git a/debian/patches/series b/debian/patches/series index 52e7385..3c06b3e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ -1-AM_INIT_AUTOMAKE.patch -2-docs_DATA.patch -1-build-doc.patch -1-fix-spelling.patch +docs_DATA.patch