[SCM] mate-file-manager Debian package branch, master, updated. 0aad6c57ff9981de4dca4f9ce57b4d0ea95fd9b4
Mike Gabriel
sunweaver at moszumanska.debian.org
Thu Feb 20 14:42:33 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-mate/caja.git;a=commitdiff;h=1da6e42
The following commit has been merged in the master branch:
commit 1da6e420c21439d1963e3904c58c1473d5243b82
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Feb 11 08:49:49 2014 +0100
New upstream release, make package build against caja 1.6.4
---
debian/README.source | 17 ------------
debian/caja.lintian-overrides | 2 +-
debian/changelog | 2 +-
...001_add-manpage-for-caja-autorun-software.patch | 30 ----------------------
debian/patches/series | 1 -
debian/rules | 19 +-------------
6 files changed, 3 insertions(+), 68 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 87cbcc3..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,17 +0,0 @@
-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.lintian-overrides b/debian/caja.lintian-overrides
index b173470..686b252 100644
--- a/debian/caja.lintian-overrides
+++ b/debian/caja.lintian-overrides
@@ -3,7 +3,7 @@
caja: spelling-error-in-copyright GNU Public License GNU General Public License
# this currently is work in progress on the upstream
-# side (https://github.com/mate-desktop/caja/issues/249)
+# side (https://github.com/mate-desktop/caja/issues/252)
caja: desktop-entry-lacks-main-category usr/share/applications/caja-computer.desktop
caja: desktop-entry-lacks-main-category usr/share/applications/caja-home.desktop
caja: desktop-entry-lacks-main-category usr/share/applications/mate-network-scheme.desktop
diff --git a/debian/changelog b/debian/changelog
index 84858b9..18085cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-caja (1.6.3+dfsg1-1) UNRELEASED; urgency=low
+caja (1.6.4-1) UNRELEASED; urgency=low
* Initial release. (Closes: #727061).
diff --git a/debian/patches/0001_add-manpage-for-caja-autorun-software.patch b/debian/patches/0001_add-manpage-for-caja-autorun-software.patch
deleted file mode 100644
index dbe2800..0000000
--- a/debian/patches/0001_add-manpage-for-caja-autorun-software.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Manual page for caja-autorun-software
-Author: Stefano Karapetsas <stefano at karapetsas.com>
-Origin: https://github.com/mate-desktop/caja/commit/70559a30ba34d71d0d9567457c3ec20de7d25fb7
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -4,6 +4,7 @@
-
- man_MANS = \
- caja.1 \
-+ caja-autorun-software.1 \
- caja-connect-server.1 \
- caja-file-management-properties.1 \
- $(NULL)
---- /dev/null
-+++ b/docs/caja-autorun-software.1
-@@ -0,0 +1,14 @@
-+.IX Title "caja-autorun-software 1"
-+.TH caja-autorun-software 1 "26 Sep 2013"
-+.SH "NAME"
-+caja\-autorun\-software \- Auto-Run software with Caja
-+.SH "SYNOPSIS"
-+.IX Header "SYNOPSIS"
-+This executable is part of the package 'caja': The \s-1MATE\s0 Desktop File Manager
-+.SH "DESCRIPTION"
-+.IX Header "DESCRIPTION"
-+This package contains Caja, the file manager for the \s-1MATE\s0
-+Desktop Environment.
-+.SH "LICENSE"
-+.IX Header "LICENSE"
-+\&\s-1GPL\s0 v2 or later
diff --git a/debian/patches/series b/debian/patches/series
index 79d4cd5..bc1e32e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001_add-manpage-for-caja-autorun-software.patch
1001_add-keywords-to-desktop-files.patch
diff --git a/debian/rules b/debian/rules
index e3d57d3..606c69d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
PKD = $(abspath $(dir $(MAKEFILE_LIST)))
PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
UVER = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
-DTYPE = +dfsg1
+DTYPE =
VER ?= $(subst $(DTYPE),,$(UVER))
%:
@@ -39,20 +39,3 @@ get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYP
$(PKG)_$(VER)$(DTYPE).orig.tar.xz:
@echo "# Downloading..."
uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
- $(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..))
- @echo "# Extracting..."
- mkdir $(PKG)-$(VER) \
- && 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 \
- COPYING-DOCS
-###
- $(RM) -v $(PKG)_$(VER).orig.tar.*
- @echo "# Packing..."
- find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
- | XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
- && $(RM) -r "$(PKG)-$(VER)"
--
mate-file-manager Debian package
More information about the pkg-mate-commits
mailing list