[SCM] mate-utils Debian package branch, wheezy-bpo, updated. debian/1.8.0+dfsg1-2_bpo70+1-10-gdfce6a7

Mike Gabriel sunweaver at moszumanska.debian.org
Wed May 14 18:18:13 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-utils.git;a=commitdiff;h=8beca91

The following commit has been merged in the wheezy-bpo branch:
commit 8beca9113fb7c9e71e98d1588e2fca40d731f2e4
Merge: fcdfb7bad64c48a8cb4433caf56e18ad7e1dbcb6 10d208388cfa656487c7f99d7d97e8e018ca1792
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed May 14 20:16:34 2014 +0200

    Merge branch 'master' into wheezy-bpo
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

 debian/changelog                                        | 13 ++++++++++++-
 debian/control                                          |  4 ++++
 debian/patches/0001_symlink-mate-panel-screenshot.patch |  3 +++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index fe89cd7,34713b9..1d4d795
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,20 @@@
- mate-utils (1.8.0+dfsg1-3~bpo70+1) wheezy-backports; urgency=low
++mate-utils (1.8.0+dfsg1-4~bpo70+1) UNRELEASED; urgency=low
 +
 +  * Upload to wheezy-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Thu, 08 May 2014 14:03:06 +0200
 +
+ mate-utils (1.8.0+dfsg1-4) unstable; urgency=low
+ 
+   * debian/control:
+     + Add more Breaks:/Replaces: for internal bin:packages to make upgrade
+       from MATE upstream .deb repo as smooth as possible. (Closes: #747414).
+   * debian/patches:
+     + Add patch description header for
+       0001_symlink-mate-panel-screenshot.patch.
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Wed, 14 May 2014 16:57:22 +0200
+ 
  mate-utils (1.8.0+dfsg1-3) unstable; urgency=low
  
    * debian/rules:

-- 
mate-utils Debian package



More information about the pkg-mate-commits mailing list