[mate-desktop] 10/13: Drop 2001_omit-gfdl-licensed-user-guide.patch. Applied upstream.

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository mate-desktop.

commit 07340d6f4d7737df13a95966a2271a2693c4830a
Author: Martin Wimpress <code at flexion.org>
Date:   Thu Jun 11 15:00:39 2015 +0100

    Drop 2001_omit-gfdl-licensed-user-guide.patch. Applied upstream.
---
 .../2001_omit-gfdl-licensed-user-guide.patch       | 68 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 69 deletions(-)

diff --git a/debian/patches/2001_omit-gfdl-licensed-user-guide.patch b/debian/patches/2001_omit-gfdl-licensed-user-guide.patch
deleted file mode 100644
index 66b1280..0000000
--- a/debian/patches/2001_omit-gfdl-licensed-user-guide.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: Don't build non-DFSG (GFDL 1.1 licensed) user-guide files
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Abstract:
- This patch is interesting for Debian only.
- .
- During repacking of the the upstream tarball, we strip off
- non-DFSG user guide files and also a set of multi-lingual
- license files (GPL, LGPL, GFDL) that are not used elsewhere
- by the MATE desktop components.
- .
- This patch makes sure, that the code still builds without
- errors.
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,12 +3,6 @@
- if MATE_ABOUT_ENABLED
- SUBDIRS += mate-about
- endif
--if DESKTOP_DOCS_ENABLED
--SUBDIRS += desktop-docs
--endif
--if USER_GUIDE_ENABLED
--SUBDIRS += user-guide
--endif
- 
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -80,14 +80,6 @@
- 	[AS_HELP_STRING([--disable-mate-about],[dont build mate-about])],
- 	[],[enable_mate_about=yes])
- AM_CONDITIONAL(MATE_ABOUT_ENABLED, test "x$enable_mate_about" = "xyes")
--AC_ARG_ENABLE([desktop-docs],
--	[AS_HELP_STRING([--disable-desktop-docs],[do not build desktop-wide help documents])],
--	[],[enable_desktop_docs=yes])
--AM_CONDITIONAL(DESKTOP_DOCS_ENABLED, test "x$enable_desktop_docs" = "xyes")
--AC_ARG_ENABLE([user-guide],
--	[AS_HELP_STRING([--disable-user-guide],[do not build user guide])],
--	[],[enable_user_guide=yes])
--AM_CONDITIONAL(USER_GUIDE_ENABLED, test "x$enable_user_guide" = "xyes")
- 
- 
- # Install tool to migrate 1.4 MateConf settings
-@@ -332,16 +324,10 @@
- docs/reference/mate-desktop/Makefile
- mate-version.xml.in
- po/Makefile.in
--desktop-docs/Makefile
--desktop-docs/fdl/Makefile
--desktop-docs/gpl/Makefile
--desktop-docs/lgpl/Makefile
- schemas/Makefile
- man/Makefile
- tools/mate-conf-import.desktop.in
- tools/Makefile
--user-guide/Makefile
--user-guide/mate-user-guide.desktop.in
- ])
- 
- AC_OUTPUT
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -29,4 +29,3 @@
- schemas/org.mate.thumbnailers.gschema.xml.in.in
- schemas/org.mate.typing-break.gschema.xml.in.in
- tools/mate-conf-import.desktop.in.in
--user-guide/mate-user-guide.desktop.in.in
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c97dc73..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-2001_omit-gfdl-licensed-user-guide.patch

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