[caja-actions] 04/07: debian/patches:Drop 2001_omit-gfdl-license-doc-files.patch and 2002_no-version-in-pkgdocdir.patch.

[Vangelis Mouhtsis]

This is an automated email from the git hooks/post-receive script.

gnugr-guest pushed a commit to branch master
in repository caja-actions.

commit 5661c14a83b0bdf3ee0f3ee0e8de628fd7cf6099
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date:   Wed Nov 11 17:36:43 2015 +0200

    debian/patches:Drop 2001_omit-gfdl-license-doc-files.patch and 2002_no-version-in-pkgdocdir.patch.
---
 .../patches/2001_omit-gfdl-license-doc-files.patch | 33 ----------------------
 debian/patches/2002_no-version-in-pkgdocdir.patch  | 14 ---------
 debian/patches/series                              |  2 --
 3 files changed, 49 deletions(-)

diff --git a/debian/patches/2001_omit-gfdl-license-doc-files.patch b/debian/patches/2001_omit-gfdl-license-doc-files.patch
deleted file mode 100644
index 994695e..0000000
--- a/debian/patches/2001_omit-gfdl-license-doc-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Skip building GFDL-licensed documentation.
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -88,7 +88,6 @@
- 	ChangeLog-2011						\
- 	ChangeLog-2012						\
- 	COPYING								\
--	COPYING-DOCS						\
- 	INSTALL								\
- 	MAINTAINERS							\
- 	NEWS								\
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,7 +43,6 @@
- 	data/actions/Makefile
- 	data/exports/Makefile
- 	docs/Makefile
--	docs/cact/Makefile
- 	docs/reference/Makefile
- 	docs/reference/version.xml
- 	m4/Makefile
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -26,7 +26,6 @@
- #   ... and many others (see AUTHORS)
- 
- SUBDIRS = \
--	cact								\
- 	reference							\
- 	$(NULL)
- 
diff --git a/debian/patches/2002_no-version-in-pkgdocdir.patch b/debian/patches/2002_no-version-in-pkgdocdir.patch
deleted file mode 100644
index 7479a7d..0000000
--- a/debian/patches/2002_no-version-in-pkgdocdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Ship doc files in /usr/share/doc/caja-actions (without version in dirname)
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -77,7 +77,7 @@
- 	gtk-doc.make		\
- 	$(NULL)
- 
--pkgdocdir = $(datarootdir)/doc/@PACKAGE at -@VERSION@
-+pkgdocdir = $(datarootdir)/doc/@PACKAGE@
- 
- dist_pkgdoc_DATA =	\
- 	AUTHORS								\
diff --git a/debian/patches/series b/debian/patches/series
index 1d40788..c876dd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-2001_omit-gfdl-license-doc-files.patch
-2002_no-version-in-pkgdocdir.patch
 2003_no-extra-license-file.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/caja-actions.git