[SCM] mate-file-manager Debian package branch, master, updated. acaee79f37cffa010111206b7f16aae1b8967baf

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/caja.git;a=commitdiff;h=7b93f30

The following commit has been merged in the master branch:
commit 7b93f303ddd3ed5640fdb343a08a0c86d05c7cfa
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 10 15:39:33 2014 +0100

    COPYING-DOCS: the file (containing GFDL-1.1) referred to a not-existant-anymore help/ folder in pre-2.0 Nautilus sources
---
 debian/README.source                      | 17 +++++++++++++
 debian/caja.install                       |  1 +
 debian/patches/2001_dfsg-non-gnufdl.patch | 41 -------------------------------
 debian/patches/series                     |  1 -
 debian/rules                              |  9 ++-----
 5 files changed, 20 insertions(+), 49 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..87cbcc3
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,17 @@
+The original source tarball caja-1.6.3.tar.gz ships a COPYING-DOCS file that
+refers to the GNU FDL 1.1 License. Later versions of Caja have this file
+removed due to the following reason...
+
+Quoting Emilio Pozuelo Monfort pochu at debian.org from [1]
+
+"""
+ This [i.e. the COPYING-DOCS] file is a leftover for the help/ subdir that was present in nautilus
+ pre-2.0 (e.g. nautilus 1.1.1). Those were released under the GFDL. Nothing is
+ licensed under the GFDL anymore so this is fine. In any case, even if something
+ was released under the GFDL, it would have to specify any Invariant Section for
+ it to be considered non-free. There are no mentions of invariant sections so
+ we're fine. I'll ask upstream to remove that file from the repo.
+"""
+
+[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=738537#10
+
diff --git a/debian/caja.install b/debian/caja.install
index f73a381..ebf0ac9 100644
--- a/debian/caja.install
+++ b/debian/caja.install
@@ -3,3 +3,4 @@ usr/lib/caja/
 usr/share/caja/
 usr/share/applications/
 usr/share/man/
+usr/share/gtk-doc/
\ No newline at end of file
diff --git a/debian/patches/2001_dfsg-non-gnufdl.patch b/debian/patches/2001_dfsg-non-gnufdl.patch
deleted file mode 100644
index d929096..0000000
--- a/debian/patches/2001_dfsg-non-gnufdl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Omit non-DFSG files during build
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -1,7 +1,5 @@
- NULL = 
- 
--SUBDIRS = reference
--
- man_MANS = \
- 	caja.1 \
- 	caja-autorun-software.1 \
-@@ -11,16 +9,4 @@
- 
- EXTRA_DIST = \
- 	$(man_MANS) \
--	architecture.txt \
--	dnd.txt \
--	load-states.dia \
--	caja-internals.sxw \
--	caja-internals.pdf \
--	caja-io.txt \
--	caja.faq \
--	recommended-books.html \
--	smoketests.html \
--	state-machines.txt \
--	style-guide.html \
--	key_mouse_navigation.txt \
- 	$(NULL)
---- a/configure.ac
-+++ b/configure.ac
-@@ -461,9 +461,6 @@
- data/caja-browser.desktop.in
- data/caja-autorun-software.desktop.in
- docs/Makefile
--docs/reference/Makefile
--docs/reference/libcaja-extension/Makefile
--docs/reference/libcaja-extension/version.xml
- eel/Makefile
- icons/Makefile
- libcaja-private/Makefile
diff --git a/debian/patches/series b/debian/patches/series
index f5f0d10..79d4cd5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001_add-manpage-for-caja-autorun-software.patch
 1001_add-keywords-to-desktop-files.patch
-2001_dfsg-non-gnufdl.patch
diff --git a/debian/rules b/debian/rules
index 3bc4b89..e3d57d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,17 +45,12 @@ $(PKG)_$(VER)$(DTYPE).orig.tar.xz:
 	    && tar -xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER) --strip-components 1 \
 	    || $(RM) -r $(PKG)-$(VER)
 	@echo "# Cleaning-up..."
+### see README.source...
 	cd $(PKG)-$(VER) \
 	    && find . -depth -type d -name 'windows' -exec $(RM) -r {} \; -printf 'removed %p
' \
 	    && $(RM) -r -v \
-	        docs/*.txt \
-	        docs/*.pdf \
-	        docs/*.sxw \
-	        docs/*.faq \
-	        docs/*.dia \
-	        docs/*.html \
-	        docs/reference \
 	        COPYING-DOCS
+###
 	$(RM) -v $(PKG)_$(VER).orig.tar.*
 	@echo "# Packing..."
 	find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \

-- 
mate-file-manager Debian package