r37961 - in /packages/experimental/meld/debian: changelog compat control control.in copyright patches/copyright-fsf-address.patch patches/empty-directory.patch patches/man1-hyphen-to-minus.patch
rbalint-guest at users.alioth.debian.org
rbalint-guest at users.alioth.debian.org
Sat May 25 06:09:26 UTC 2013
Author: rbalint-guest
Date: Sat May 25 06:09:26 2013
New Revision: 37961
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37961
Log:
1.7.2 and changes from Boruch Baum
Added:
packages/experimental/meld/debian/patches/copyright-fsf-address.patch
packages/experimental/meld/debian/patches/empty-directory.patch
packages/experimental/meld/debian/patches/man1-hyphen-to-minus.patch
Modified:
packages/experimental/meld/debian/changelog
packages/experimental/meld/debian/compat
packages/experimental/meld/debian/control
packages/experimental/meld/debian/control.in
packages/experimental/meld/debian/copyright
Modified: packages/experimental/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/changelog?rev=37961&op=diff
==============================================================================
--- packages/experimental/meld/debian/changelog [utf-8] (original)
+++ packages/experimental/meld/debian/changelog [utf-8] Sat May 25 06:09:26 2013
@@ -1,3 +1,22 @@
+meld (1.7.2-1) experimental; urgency=low
+
+ [Boruch Baum <boruch_baum at gmx.com> ]
+ * New upstream development snapshot release
+ I have to note here that Gianfranco Costamagna
+ <costamagnagianfranco at yahoo.it> sent me patches updating the Debian
+ package in very similar ways, too.
+ * debian/control.in:
+ - Standards-Version is 3.9.4, no changes needed.
+ - debhelper updated to 9
+ - expanded length of long description
+ * debian/compat
+ - updated from 5 to 9
+ * debian/copyright
+ - updated to format 1.0
+ - added copyright and license details
+
+ -- Balint Reczey <balint at balintreczey.hu> Thu, 23 May 2013 16:37:08 -0500
+
meld (1.6.1-1) unstable; urgency=low
* New upstream release
Modified: packages/experimental/meld/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/compat?rev=37961&op=diff
==============================================================================
--- packages/experimental/meld/debian/compat [utf-8] (original)
+++ packages/experimental/meld/debian/compat [utf-8] Sat May 25 06:09:26 2013
@@ -1,1 +1,1 @@
-5
+9
Modified: packages/experimental/meld/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/control?rev=37961&op=diff
==============================================================================
--- packages/experimental/meld/debian/control [utf-8] (original)
+++ packages/experimental/meld/debian/control [utf-8] Sat May 25 06:09:26 2013
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Ross Burton <ross at debian.org>
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 9),
cdbs (>= 0.4.90~),
gnome-pkg-tools
Build-Depends-Indep: python (>=2.6.6-3~),
@@ -15,7 +15,7 @@
scrollkeeper
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Balint Reczey <balint at balintreczey.hu>
DM-Upload-Allowed: yes
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/meld
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/
Homepage: http://meldmerge.org
@@ -34,5 +34,8 @@
python-gconf,
python-gtksourceview2 (>= 2.4)
Description: graphical tool to diff and merge files
- Meld is a tool which allows the user to see the changes in, and merge between,
- either two files, two directories, or two files with a common ancestor.
+ Meld is a graphical diff viewer and merge application for the Gnome
+ desktop. It supports 2 and 3-file diffs, recursive directory diffs,
+ diffing of directories under version control (Arch, Bazaar, Codeville,
+ CVS, Darcs, Git, Mercurial, Monotone, RCS), as well as the ability to
+ manually and automatically merge file differences.
Modified: packages/experimental/meld/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/control.in?rev=37961&op=diff
==============================================================================
--- packages/experimental/meld/debian/control.in [utf-8] (original)
+++ packages/experimental/meld/debian/control.in [utf-8] Sat May 25 06:09:26 2013
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Ross Burton <ross at debian.org>
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 9),
cdbs (>= 0.4.90~),
gnome-pkg-tools
Build-Depends-Indep: python (>=2.6.6-3~),
@@ -10,7 +10,7 @@
scrollkeeper
Uploaders: @GNOME_TEAM@, Balint Reczey <balint at balintreczey.hu>
DM-Upload-Allowed: yes
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/meld
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/
Homepage: http://meldmerge.org
@@ -29,5 +29,8 @@
python-gconf,
python-gtksourceview2 (>= 2.4)
Description: graphical tool to diff and merge files
- Meld is a tool which allows the user to see the changes in, and merge between,
- either two files, two directories, or two files with a common ancestor.
+ Meld is a graphical diff viewer and merge application for the Gnome
+ desktop. It supports 2 and 3-file diffs, recursive directory diffs,
+ diffing of directories under version control (Arch, Bazaar, Codeville,
+ CVS, Darcs, Git, Mercurial, Monotone, RCS), as well as the ability to
+ manually and automatically merge file differences.
Modified: packages/experimental/meld/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/copyright?rev=37961&op=diff
==============================================================================
--- packages/experimental/meld/debian/copyright [utf-8] (original)
+++ packages/experimental/meld/debian/copyright [utf-8] Sat May 25 06:09:26 2013
@@ -1,26 +1,157 @@
-This package was debianized by Ross Burton <ross at debian.org> on
-Fri, 20 Sep 2002 18:46:55 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: meld
+Upstream-Contact: Kai Willadsen <kai.willadsen at gmail.com>
+Source: http://ftp.gnome.org/pub/GNOME/sources/meld/1.7/meld-1.7.0.tar.xz
+Copyright: 2009-2012 Kai Willadsen <kai.willadsen at gmail.com>
+ 2002-2009 Stephen Kennedy <stevek at gnome.org>
+ 2009, 2012 Piotr Piastucki <the_leech at users.berlios.de>
+ 2009 Vincent Legoll <vincent.legoll at gmail.com>
+ 2007,2008 Colin Walters <walters at verbum.org>
+ 2005 VMware, Inc.
+ 2005 Daniel Thompson <daniel at redfelineninja.org.uk>
+ 2005 Ali Afshar <aafshar at gmail.com>
+ 2005 Aaron Bentley <aaron.bentley at utoronto.ca>
+ 2011 Jan Danielsson <jan.m.danielsson at gmail.com>
+ 2007 José Fonseca <j_r_fonseca at yahoo.co.uk>
+License: GPL-2
-It was downloaded from:
- <http://ftp.gnome.org/pub/GNOME/sources/meld/>
+Files: *
+Copyright: 2009-2012 Kai Willadsen <kai.willadsen at gmail.com>
+ 2002-2009 Stephen Kennedy <stevek at gnome.org>
+License: GPL-2+
-Copyright (C) 2002 - 2008 Stephen Kennedy <steve at gnome.org>
+Files: debian/*
+Copyright: 2002-2009 Ross Burton <ross at debian.org>
+ 2009-2013 Balint Reczey <balint at balintreczey.hu>
+ 2013 Boruch Baum <boruch-baum at gmx.com>
+License: GPL-2
-License:
+Files: ui/msgarea.py
+Copyright: 2007,2008 Colin Walters <walters at verbum.org>
+License: GPL-2+
- This package is free software; you can redistribute it and/or modify
+Files: filemerge.py
+Copyright: 2009, 2012 Piotr Piastucki <the_leech at users.berlios.de>
+ 2012 Kai Willadsen <kai.willadsen at gmail.com>
+License: GPL-2+
+
+Files: matchers.py merge.py
+Copyright: 2009 Piotr Piastucki <the_leech at users.berlios.de>
+License: GPL-2+
+
+Files: misc.py
+Copyright: 2002-2006 Stephen Kennedy <stevek at gnome.org>
+ 2009 Vincent Legoll <vincent.legoll at gmail.com>
+License: GPL-2+
+
+Files: util/sourceviewer.py
+Copyright: 2009 Vincent Legoll <vincent.legoll at gmail.com>
+ 2010-2011 Kai Willadsen <kai.willadsen at gmail.com>
+License: GPL-2+
+
+Files: vc/cdv.py
+Copyright: 2009 Vincent Legoll <vincent.legoll at gmail.com>
+License: BSD-2-clause
+
+Files: vc/rcs.py
+Copyright: 2002-2005 Stephen Kennedy <stevek at gnome.org>, Oliver Gerlich
+ 2009 Vincent Legoll <vincent.legoll at gmail.com>
+License: BSD-2-clause
+
+Files: vc/git.py
+Copyright: 2002-2005 Stephen Kennedy <stevek at gnome.org>
+ 2005 Aaron Bentley <aaron.bentley at utoronto.ca>
+ 2007 José Fonseca <j_r_fonseca at yahoo.co.uk>
+ 2010-2012 Kai Willadsen <kai.willadsen at gmail.com>
+License: BSD-2-clause
+
+Files: vc/tla.py
+Copyright: 2005 Ali Afshar <aafshar at gmail.com>
+License: Expat
+
+Files: vc/monotone.py
+Copyright: 2002-2005 Stephen Kennedy <stevek at gnome.org>
+ 2005 Daniel Thompson <daniel at redfelineninja.org.uk>
+License: BSD-2-clause
+
+Files: vc/fossil.py
+Copyright: 2002-2005 Stephen Kennedy <stevek at gnome.org>
+ 2005 Daniel Thompson <daniel at redfelineninja.org.uk>
+ 2011 Jan Danielsson <jan.m.danielsson at gmail.com>
+License: BSD-2-clause
+
+Files: vc/bzr.py
+Copyright: 2002-2005 Stephen Kennedy <stevek at gnome.org>
+ 2005 Aaron Bentley <aaron.bentley at utoronto.ca>
+License: BSD-2-clause
+
+Files: vc/svk.py
+Copyright: 2009 Vincent Legoll <vincent.legoll at gmail.com>
+License: BSD-2-clause
+
+Files: vc/darcs.py
+Copyright: 2005 Ali Afshar <aafshar at gmail.com>
+License: Expat
+
+Files: wraplabel.PY
+Copyright: 2005 VMware, Inc.
+License: Expat
+
+License: GPL-2
+ /usr/share/common-licenses/GPL-2
+
+License: GPL-2+
+ 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; version 2 dated June, 1991.
-
- This package is distributed in the hope that it will be useful,
+ 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301, USA.
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+License: Expat
+ 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
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
Added: packages/experimental/meld/debian/patches/copyright-fsf-address.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/patches/copyright-fsf-address.patch?rev=37961&op=file
==============================================================================
--- packages/experimental/meld/debian/patches/copyright-fsf-address.patch (added)
+++ packages/experimental/meld/debian/patches/copyright-fsf-address.patch [utf-8] Sat May 25 06:09:26 2013
@@ -1,0 +1,13 @@
+Description: Update address of FSF
+Author: Boruch Baum <boruch_baum at gmx.com>
+--- a/COPYING
++++ b/COPYING
+@@ -2,7 +2,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
Added: packages/experimental/meld/debian/patches/empty-directory.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/patches/empty-directory.patch?rev=37961&op=file
==============================================================================
--- packages/experimental/meld/debian/patches/empty-directory.patch (added)
+++ packages/experimental/meld/debian/patches/empty-directory.patch [utf-8] Sat May 25 06:09:26 2013
@@ -1,0 +1,20 @@
+Description: remove reference to directory not used
+Author: Boruch Baum <boruch_baum at gmx.com>
+--- a/Makefile
++++ b/Makefile
+@@ -38,7 +38,6 @@
+ $(DESTDIR)$(sharedir_)/icons \
+ $(DESTDIR)$(docdir_) \
+ $(DESTDIR)$(sharedir)/applications \
+- $(DESTDIR)$(sharedir)/pixmaps \
+ $(DESTDIR)$(sharedir)/icons/hicolor/16x16/apps \
+ $(DESTDIR)$(sharedir)/icons/hicolor/22x22/apps \
+ $(DESTDIR)$(sharedir)/icons/hicolor/32x32/apps \
+@@ -106,7 +105,6 @@
+ $(libdir_) \
+ $(bindir)/meld \
+ $(sharedir)/applications/meld.desktop \
+- $(sharedir)/pixmaps/meld.png
+ $(MAKE) -C po uninstall
+ $(MAKE) -C help uninstall
+
Added: packages/experimental/meld/debian/patches/man1-hyphen-to-minus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/patches/man1-hyphen-to-minus.patch?rev=37961&op=file
==============================================================================
--- packages/experimental/meld/debian/patches/man1-hyphen-to-minus.patch (added)
+++ packages/experimental/meld/debian/patches/man1-hyphen-to-minus.patch [utf-8] Sat May 25 06:09:26 2013
@@ -1,0 +1,13 @@
+Description: change hypens to minuses
+Author: Boruch Baum <boruch_baum at gmx.com>
+--- a/meld.1
++++ b/meld.1
+@@ -73,7 +73,7 @@
+ .br
+ Initiate a recursive 3-way diff between directory DIR1, DIR2, and DIR3.
+ .TP
+-\fBmeld\fR --diff FILE1 FILE2 --diff FILE3 FILE4
++\fBmeld\fR \-\-diff FILE1 FILE2 \-\-diff FILE3 FILE4
+ .br
+ Initiate a diff between FILE1 and FILE2, and a separate diff between FILE3 and
+ FILE4.
More information about the pkg-gnome-commits
mailing list