[SCM] engrampa Debian package branch, master, updated. 38c3c6191ed6a4b2e30e621d7a5b42b3495bffd6
Mike Gabriel
sunweaver at moszumanska.debian.org
Mon Apr 21 13:59:29 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-mate/engrampa.git;a=commitdiff;h=b5c91ff
The following commit has been merged in the master branch:
commit b5c91ff96bd65d57221269cdb1b50e433c5a34bc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Apr 21 15:23:15 2014 +0200
debian/patches: Add 2001_omit-gfdl-licensed-help-files.patch. Make package build with help/ subfolder removed from upstream sources.
---
debian/changelog | 4 +-
debian/copyright | 110 ++++++++++-----------
.../2001_omit-gfdl-licensed-help-files.patch | 22 +++++
debian/patches/README | 3 +
debian/patches/series | 1 +
debian/rules | 28 +++++-
debian/watch | 1 +
7 files changed, 105 insertions(+), 64 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6e72510..dc13468 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-engrampa (1.8.0-1) UNRELEASED; urgency=low
+engrampa (1.8.0+dfsg1-1) UNRELEASED; urgency=low
* Initial release. (Closes: #734720).
- --Vangelis Mouhtsis <vangelis at gnugr.org> Fri, 18 Apr 2014 01:58:10 +0300
+ -- Vangelis Mouhtsis <vangelis at gnugr.org> Fri, 18 Apr 2014 01:58:10 +0300
diff --git a/debian/copyright b/debian/copyright
index 0ad894b..1016543 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -55,7 +55,7 @@ Files: src/commands/rpm2cpio.c
src/open-file.c
src/open-file.h
src/typedefs.h
-Copyright: 2001, 2003, 2004, 2006, 2008, 2009, The Free Software Foundation, Inc
+Copyright: 2001-2009, The Free Software Foundation, Inc.
License: GPL-2+
Files: caja/caja-engrampa.c
@@ -105,14 +105,14 @@ Files: caja/caja-engrampa.c
src/preferences.c
src/preferences.h
src/ui.h
-Copyright: 2001, 2003, 2004, 2005, 2007, 2008, Free Software Foundation, Inc
+Copyright: 2001-2008, Free Software Foundation, Inc.
License: GPL-2+
Files: copy-n-paste/eggdesktopfile.h
copy-n-paste/eggsmclient-private.h
copy-n-paste/eggsmclient.c
copy-n-paste/eggsmclient.h
-Copyright: 2007, Novell, Inc
+Copyright: 2007, Novell, Inc.
License: LGPL-2+
Files: autogen.sh
@@ -120,9 +120,9 @@ Files: autogen.sh
src/fr-command-lrzip.h
src/sh/isoinfo.sh
Copyright: *No copyright*
-License: UNKNOWN
-Specified files lack copyright/license information in the
-(non-present) file header.
+License: GPL-2+
+Comment:
+ Using license from COPYING file.
Files: src/eggfileformatchooser.c
src/eggfileformatchooser.h
@@ -130,81 +130,71 @@ Copyright: 2007, Mathias Hasselmann
License: LGPL-2+
Files: copy-n-paste/eggsmclient-xsmp.c
-Copyright: 1998, Carsten Schaar, and twm
+Copyright: 1998, Carsten Schaar
1998, The Open Group
- 2007, Novell, Inc
+ 2007, Novell, Inc.
License: LGPL-2+
Files: src/mkdtemp.c
-Copyright: 1999, 2001-2002, Free Software Foundation, Inc
+Copyright: 1999, 2001-2002, Free Software Foundation, Inc.
License: LGPL-2+
Files: src/eggtreemultidnd.c
-Copyright: 2001, Red Hat, Inc
- 2005, Free Software Foundation, Inc
+Copyright: 2001, Red Hat, Inc.
+ 2005, Free Software Foundation, Inc.
License: LGPL-2+
Files: copy-n-paste/eggdesktopfile.c
-Copyright: 1999-2000, Red Hat Inc
+Copyright: 1999-2000, Red Hat Inc.
2001, George Lebl
- 2007, Novell, Inc
+ 2007, Novell, Inc.
License: LGPL-2+
Files: src/eggtreemultidnd.h
-Copyright: 2001, Red Hat, Inc
+Copyright: 2001, Red Hat, Inc.
License: LGPL-2+
Files: src/egg-macros.h
-Copyright: 2001, Ben Tea Spoons, Inc
-License: UNKNOWN
+Copyright: 2001, Ben Tea Spoons, Inc.
+License: GPL-2+
Using license from COPYING file.
Files: debian/*
-Copyright: 2011, Stefano Karapetsas <stefano at karapetsas.com>
- 2013, Mike Gabriel <sunweaver at debian.org>
-License: GPL-2+
+Copyright: 2011-2014, Stefano Karapetsas <stefano at karapetsas.com>
+ 2014, Mike Gabriel <sunweaver at debian.org>
+License: GPL-2+ or LGPL-2+
License: GPL-2+
-
-This package is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-.
-This package is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Genaral Public License for more details.
-.
-You should have received a copy og the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>
-.
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Genaral Public License for more details.
+ .
+ You should have received a copy og the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
License: LGPL-2+
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it. You can use it for
-your libraries, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-.
-On Debian systems, the complete text of the GNU General
-Public License version LGPL-2 can be found in "/usr/share/common-licenses/LGPL-2".
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version LGPL-2 can be found in "/usr/share/common-licenses/LGPL-2".
diff --git a/debian/patches/2001_omit-gfdl-licensed-help-files.patch b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
new file mode 100644
index 0000000..1bb41a1
--- /dev/null
+++ b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
@@ -0,0 +1,22 @@
+Description: Don't build non-DFSG (GFDL 1.1 licensed) help files
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,7 +11,6 @@
+ copy-n-paste \
+ data \
+ src \
+- help \
+ $(CAJA) \
+ po
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -206,7 +206,6 @@
+ src/commands/Makefile
+ src/sh/Makefile
+ caja/Makefile
+- help/Makefile
+ po/Makefile.in])
+ AC_OUTPUT
+
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..83b110e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+2001_omit-gfdl-licensed-help-files.patch
diff --git a/debian/rules b/debian/rules
index 7930ccf..041d049 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,11 @@
#!/usr/bin/make -f
+PKD = $(word 1,$(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
+VER ?= $(subst $(DTYPE),,$(UVER))
+
DHFLAGS=--parallel
%:
@@ -21,5 +27,23 @@ override_dh_auto_configure:
override_dh_strip:
dh_strip --dbg-package=engrampa-dbg
-get-orig-source:
- uscan --noconf --force-download --rename --download-current-version --destdir=..
+get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE))
+ @
+
+$(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..."
+ cd $(PKG)-$(VER) \
+ && $(RM) -r -v \
+ help/
+ $(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)"
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
index aef7c21..a3357b3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
version=3
+opts=dversionmangle=s/\+dfsg1// \
http://git.mate-desktop.org/engrampa/ \
snapshot/engrampa-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz
--
engrampa Debian package
More information about the pkg-mate-commits
mailing list