[SCM] pluma Debian package branch, master, updated. 80f13b9a40b68d2f66d5afc16bce823e093ebe69
Vangelis Mouhtsis
gnugr-guest at moszumanska.debian.org
Fri Apr 11 08:26:41 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-mate/pluma.git;a=commitdiff;h=c8f7f26
The following commit has been merged in the master branch:
commit c8f7f26c572fcaf9ba7533fcf3c006e2a69f8f1e
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date: Fri Apr 11 00:40:07 2014 +0300
debian/copyright: Adapt to file changes in new upstream source tree.
---
debian/control | 1 -
debian/copyright | 236 ++-----------------------------------------------------
debian/rules | 6 +-
3 files changed, 9 insertions(+), 234 deletions(-)
diff --git a/debian/control b/debian/control
index 66d52bc..ee876e1 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Build-Depends: debhelper (>= 9),
libgtksourceview2.0-dev,
libx11-dev,
mate-common,
- dh-autoreconf,
python-dev,
python-gobject-2-dev,
python-gtk2-dev,
diff --git a/debian/copyright b/debian/copyright
index 486c9ff..bc549a3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: pluma (old name: mate-text-editor)
Upstream-Contact: Stefano Karapetsas <stefano at karapetsas.com>
-Source: http://pub.mate-desktop.org/releases/
+Source: http://git.mate-desktop.org/pluma/
Files: plugins/docinfo/pluma-docinfo-plugin.c
plugins/docinfo/pluma-docinfo-plugin.h
@@ -134,7 +134,7 @@ Files: pluma/pluma-commands-documents.c
pluma/pluma-view.c
pluma/pluma-view.h
Copyright: 1998-1999, Alex Roberts, Evan Lawrence
- 2000-2002 Chema Celorio, Paolo Maggi
+ 2000-2002, Chema Celorio, Paolo Maggi
2002-2006, Paolo Maggi
License: GPL-2+
@@ -454,9 +454,6 @@ Files: data/*.in.in
pluma/smclient/Makefile.am
pluma/dialogs/Makefile.am
tests/Makefile.am
- m4/gtk-doc.m4
- m4/mate-doc-utils.m4
- m4/python.m4
Makefile.am
config.h.in
configure.ac
@@ -468,94 +465,6 @@ License: GPL-2+
Comment:
Using license from COPYING file.
-Files: INSTALL
-Copyright: 1994-2013, Free Software Foundation, Inc.
-License:
- Copying and distribution of this file, with or without modification,
- are permitted in any medium without royalty provided the copyright
- notice and this notice are preserved. This file is offered as-is,
- without warranty of any kind.
-
-Files: mate-doc-utils.make
-Copyright: 2004-2005, Shaun McCance <shaunm at gnome.org>
-License: GPL-2+~amorph+autoconf
-
-Files: py-compile
-Copyright: 2000-2013, Free Software Foundation, Inc.
-License: GPL-2+~amorph+autoconf
-
-Files: m4/intltool.m4
-Copyright: 2001, Eazel, Inc.
-License: GPL-2+~amorph+autoconf
-
-Files: m4/libtool.m4
-Copyright: 1996-2011, Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: m4/ltoptions.m4
- m4/ltsugar.m4
- m4/ltversion.m4
- m4/lt~obsolete.m4
-Copyright: 2004-2009, Free Software Foundation, Inc.
-License:
- This file is free software; the Free Software Foundation gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
-
-Files: data/Makefile.in
- docs/reference/Makefile.in
- docs/Makefile.in
- Makefile.in
- pixmaps/Makefile.in
- plugin-loaders/c/Makefile.in
- plugin-loaders/Makefile.in
- plugin-loaders/python/Makefile.in
- plugin-loaders/python/bindings/Makefile.in
- plugins/time/Makefile.in
- plugins/docinfo/Makefile.in
- plugins/pythonconsole/pythonconsole/Makefile.in
- plugins/pythonconsole/Makefile.in
- plugins/filebrowser/Makefile.in
- plugins/quickopen/quickopen/Makefile.in
- plugins/quickopen/Makefile.in
- plugins/spell/Makefile.in
- plugins/Makefile.in
- plugins/modelines/Makefile.in
- plugins/externaltools/tools/Makefile.in
- plugins/externaltools/Makefile.in
- plugins/externaltools/data/Makefile.in
- plugins/externaltools/scripts/Makefile.in
- plugins/taglist/Makefile.in
- plugins/changecase/Makefile.in
- plugins/checkupdate/Makefile.in
- plugins/snippets/Makefile.in
- plugins/snippets/data/lang/Makefile.in
- plugins/snippets/data/Makefile.in
- plugins/snippets/snippets/Makefile.in
- plugins/sort/Makefile.in
- pluma/Makefile.in
- pluma/smclient/Makefile.in
- pluma/dialogs/Makefile.in
- tests/Makefile.in
-Copyright: 1994-2013, Free Software Foundation, Inc.
-License:
- This Makefile.in is free software; the Free Software Foundation
- gives unlimited permission to copy and/or distribute it,
- with or without modifications, as long as this notice is preserved.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE.
-
-Files: po/Makefile.in.in
-Copyright: 1995-1997, Ulrich Drepper <drepper at gnu.ai.mit.edu>
- 2004-2008,Rodney Dawes <dobey.pwns at gmail.com>
-License:
- This file may be copied and used freely without restrictions. It may
- be used in projects which are not available under a GNU Public License,
- but which still want to provide support for the GNU gettext functionality.
-
Files: po/*.po
Copyright: 2005, Free Software Foundation, Inc.
2006, Norayr Chilingaryan
@@ -564,61 +473,9 @@ License: GPL-2+ or LGPL-2+
Comment:
Using license from COPYING file.
-Files: aclocal.m4
-Copyright:
- 1996-2013, Free Software Foundation, Inc.
- 2001-2004, Red Hat, Inc.
-License:
- This file is free software; the Free Software Foundation gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE.
- .
- [...]
- .
- This file is free software, distributed under the terms of the GNU
- General Public License. As a special exception to the GNU General
- Public License, this file may be distributed as part of a program
- that contains a configuration script generated by Autoconf, under
- the same distribution terms as the rest of that program.
- .
- This file can be copied and used freely without restrictions. It can
- be used in projects which are not available under the GNU Public License
- but which still want to provide support for the GNU gettext functionality.
-
-Files: ltmain.sh
-Copyright: 1996-2011, Free Software Founation, Inc.
-License: GPL-2+~amorph+libtool
-
-Files: compile
- depcomp
- missing
- test-driver
-Copyright: 1996-2013, Free Software Foundation, Inc.
-License: GPL-2+~amorph+autoconf
-
-Files: config.guess
- config.sub
-Copyright: 1992-2013, Free Software Foundation, Inc.
-License: GPL-3+~amorph+autoconf
-
-Files: configure
-Copyright: 1992-2012, Free Software Foundaction, Inc.
-License:
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
-
-Files: install-sh
-Copyright: 1994, X Consortium
-License: MIT-X11
-
Files: debian/*
-Copyright: 2011 Stefano Karapetsas <stefano at karapetsas.com>
- 2013 Mike Gabriel <sunweaver at debian.org>
+Copyright: 2011, Stefano Karapetsas <stefano at karapetsas.com>
+ 2013, Mike Gabriel <sunweaver at debian.org>
License: GPL-2+ or LGPL-2+
License: GPL-2+
@@ -638,68 +495,6 @@ License: GPL-2+
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: GPL-2+~amorph+autoconf
- This program 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 program 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 General Public License for more details.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-2".
- .
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program that contains a
- configuration script generated by Autoconf, you may include it under
- the same distribution terms that you use for the rest of that program.
-
-License: GPL-2+~amorph+libtool
- This program 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 program 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 General Public License for more details.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-2".
- .
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program that contains a
- configuration script generated by libtool, you may include it under
- the same distribution terms that you use for the rest of that program.
-
-License: GPL-3+~amorph+autoconf
- This program 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 3 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 General Public License for more details.
- .
- You should have received a copy of 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 3 can be found in "/usr/share/common-licenses/GPL-3".
- .
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program that contains a
- configuration script generated by Autoconf, you may include it under
- the same distribution terms that you use for the rest of that
- program. This Exception is an additional permission under section 7
- of the GNU General Public License, version 3 ("GPLv3").
-
License: LGPL-2+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -717,25 +512,4 @@ License: LGPL-2+
On Debian systems, the complete text of the GNU Library General
Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
-License: MIT-X11
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
- TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- .
- Except as contained in this notice, the name of the X Consortium shall not
- be used in advertising or otherwise to promote the sale, use or other deal-
- ings in this Software without prior written authorization from the X Consor-
- tium.
+
diff --git a/debian/rules b/debian/rules
index 8d7ed78..6f92985 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ DTYPE = +dfsg1
VER ?= $(subst $(DTYPE),,$(UVER))
%:
- dh $@ --with autoreconf --with python2
+ dh $@ --with python2
override_dh_install:
rm -rfv debian/tmp/usr/lib/*/pluma/plugin-loaders/*.la
@@ -15,6 +15,8 @@ override_dh_install:
dh_install --list-missing
override_dh_auto_configure:
+ # upstream tarball is without configure. autogen.sh will create it
+ NOCONFIGURE=1 ./autogen.sh
dh_auto_configure -- \
--libexecdir=/usr/lib/ \
--enable-python \
@@ -51,4 +53,4 @@ $(PKG)_$(VER)$(DTYPE).orig.tar.xz:
@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
+ && $(RM) -r "$(PKG)-$(VER)"
--
pluma Debian package
More information about the pkg-mate-commits
mailing list