r39426 - in /packages/experimental/meld/debian: changelog control control.in patches/copyright-fsf-address.patch patches/empty-directory.patch patches/man1-hyphen-to-minus.patch patches/series

[rbalint at users.alioth.debian.org]

Author: rbalint
Date: Sun Sep  1 10:40:07 2013
New Revision: 39426

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39426
Log:
New upstream development snapshot release 1.7.5

Removed:
    packages/experimental/meld/debian/patches/copyright-fsf-address.patch
    packages/experimental/meld/debian/patches/man1-hyphen-to-minus.patch
Modified:
    packages/experimental/meld/debian/changelog
    packages/experimental/meld/debian/control
    packages/experimental/meld/debian/control.in
    packages/experimental/meld/debian/patches/empty-directory.patch
    packages/experimental/meld/debian/patches/series

Modified: packages/experimental/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/changelog?rev=39426&op=diff
==============================================================================
--- packages/experimental/meld/debian/changelog	[utf-8] (original)
+++ packages/experimental/meld/debian/changelog	[utf-8] Sun Sep  1 10:40:07 2013
@@ -1,3 +1,13 @@
+meld (1.7.5-1) experimental; urgency=low
+
+  * New upstream development snapshot release 1.7.5
+  * Drop Arch, Codeville and RCS as supported VCS-es in the package
+    documentation
+  * Drop copyright-fsf-address.patch and man1-hyphen-to-minus.patch since
+    they have been integrated upstream
+
+ -- Balint Reczey <balint at balintreczey.hu>  Sun, 01 Sep 2013 10:01:57 +0200
+
 meld (1.7.4-1) experimental; urgency=low
 
   * New upstream development snapshot release 1.7.4

Modified: packages/experimental/meld/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/control?rev=39426&op=diff
==============================================================================
--- packages/experimental/meld/debian/control	[utf-8] (original)
+++ packages/experimental/meld/debian/control	[utf-8] Sun Sep  1 10:40:07 2013
@@ -13,7 +13,7 @@
 Build-Depends-Indep: python (>=2.6.6-3~),
                      intltool,
                      scrollkeeper
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Balint Reczey <balint at balintreczey.hu>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/packages/unstable/meld
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/meld/
@@ -35,6 +35,6 @@
 Description: graphical tool to diff and merge files
  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.
+ diffing  of directories under version control (Bazaar, Codeville, CVS,
+ Darcs, Fossil SCM, Git, Mercurial, Monotone, Subversion), 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=39426&op=diff
==============================================================================
--- packages/experimental/meld/debian/control.in	[utf-8] (original)
+++ packages/experimental/meld/debian/control.in	[utf-8] Sun Sep  1 10:40:07 2013
@@ -30,6 +30,6 @@
 Description: graphical tool to diff and merge files
  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.
+ diffing  of directories under version control (Bazaar, Codeville, CVS,
+ Darcs, Fossil SCM, Git, Mercurial, Monotone, Subversion), as well as
+ the  ability  to manually and automatically merge file differences.

Modified: 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=39426&op=diff
==============================================================================
--- packages/experimental/meld/debian/patches/empty-directory.patch	[utf-8] (original)
+++ packages/experimental/meld/debian/patches/empty-directory.patch	[utf-8] Sun Sep  1 10:40:07 2013
@@ -2,19 +2,19 @@
 Author: Boruch Baum <boruch_baum at gmx.com>
 --- a/Makefile
 +++ b/Makefile
-@@ -38,7 +38,6 @@
- 		$(DESTDIR)$(sharedir_)/icons \
+@@ -40,7 +40,6 @@
  		$(DESTDIR)$(docdir_) \
  		$(DESTDIR)$(sharedir)/applications \
+ 		$(DESTDIR)$(sharedir)/mime/packages \
 -		$(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_) \
+@@ -130,7 +129,6 @@
  		$(bindir)/meld \
  		$(sharedir)/applications/meld.desktop \
+ 		$(sharedir)/mime/packages/meld.xml \
 -		$(sharedir)/pixmaps/meld.png
  	$(MAKE) -C po uninstall
  	$(MAKE) -C help uninstall
- 
+ 	$(update_mime_database)

Modified: packages/experimental/meld/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/patches/series?rev=39426&op=diff
==============================================================================
--- packages/experimental/meld/debian/patches/series	[utf-8] (original)
+++ packages/experimental/meld/debian/patches/series	[utf-8] Sun Sep  1 10:40:07 2013
@@ -1,2 +1,3 @@
+empty-directory.patch
 sourceview-package.patch
 python-path.patch