[SCM] mate-desktop Debian package branch, master, updated. debian/1.6.1-3-18-gb8b8587

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-desktop.git;a=commitdiff;h=de22d26

The following commit has been merged in the master branch:
commit de22d262917822a91c4c48550a77828a326a7205
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 6 09:34:06 2014 +0100

    Remove obsolete license files in desktop-docs/ subfolder from package during repacking.
---
 debian/copyright                                   | 15 +-------
 .../2001_omit-gfdl-licensed-user-guide.patch       | 41 +++++++++++++++++-----
 debian/rules                                       |  1 +
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 4751bde..4671408 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -88,20 +88,7 @@ Files: tools/mpaste
 Copyright: 2013, Steve Zesch
 License: GPL-2+
 
-Files: desktop-docs/gpl/*
-       desktop-docs/fdl/*
-       desktop-docs/lgpl/*
-Copyright: *No copyright*
-License: GPL-2+ or LGPL-2+
-Comment:
- Appropriately assume either license found in COPYING or license found in
- COPYING.LIB file.
-
-Files: desktop-docs/Makefile.am
-       desktop-docs/gpl/Makefile.am
-       desktop-docs/fdl/Makefile.am
-       desktop-docs/lgpl/Makefile.am
-       docs/Makefile.am
+Files: docs/Makefile.am
        docs/reference/Makefile.am
        docs/reference/mate-desktop/html/mate-desktop-Miscellaneous-Functions.html
        docs/reference/mate-desktop/html/mate-desktop-mate-rr-output.html
diff --git a/debian/patches/2001_omit-gfdl-licensed-user-guide.patch b/debian/patches/2001_omit-gfdl-licensed-user-guide.patch
index 4ad9177..66b1280 100644
--- a/debian/patches/2001_omit-gfdl-licensed-user-guide.patch
+++ b/debian/patches/2001_omit-gfdl-licensed-user-guide.patch
@@ -1,11 +1,24 @@
 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
-@@ -6,9 +6,6 @@
- if DESKTOP_DOCS_ENABLED
- SUBDIRS += desktop-docs
+@@ -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
@@ -14,10 +27,14 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  
 --- a/configure.ac
 +++ b/configure.ac
-@@ -84,10 +84,6 @@
- 	[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")
+@@ -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])
@@ -25,7 +42,15 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  
  
  # Install tool to migrate 1.4 MateConf settings
-@@ -340,8 +336,6 @@
+@@ -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
diff --git a/debian/rules b/debian/rules
index cca64fe..5a3ba10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ $(PKG)_$(VER)$(DTYPE).orig.tar.xz:
 	cd $(PKG)-$(VER) \
 	    && find . -depth -type d -name 'windows' -exec $(RM) -r {} \; -printf 'removed %p
' \
 	    && $(RM) -r -v \
+	        desktop-docs \
 	        user-guide
 	$(RM) -v $(PKG)_$(VER).orig.tar.*
 	@echo "# Packing..."

-- 
mate-desktop Debian package