[SCM] mate-netbook Debian package branch, wheezy-bpo, updated. debian/1.8.0-2-3-g1f88d02

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-netbook.git;a=commitdiff;h=cc6da76

The following commit has been merged in the wheezy-bpo branch:
commit cc6da76ab7c6c648b8173d5369192589cdff91b8
Merge: 2754cc368066b564f738859ce0132b0399fa36be f4482a983784767acf690c4e21c2eb8bd0b042a4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 4 17:32:08 2014 +0200

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

 debian/changelog                                   | 19 ++++++++++-
 debian/mate-netbook.install                        |  1 -
 ..._fix-mwp-applet-segfaulting-while-loading.patch | 37 ++++++++++++++++++++++
 debian/patches/README                              |  3 ++
 debian/patches/series                              |  1 +
 debian/rules                                       |  3 +-
 6 files changed, 61 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index c926e4e,5522668..ba5c6ec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,26 @@@
- mate-netbook (1.8.0-1~bpo70+1) wheezy-backports; urgency=low
++mate-netbook (1.8.0-2~bpo70+1) UNRELEASED; urgency=low
 +
 +  * Upload to wheezy-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Mon, 05 May 2014 11:23:31 +0200
 +
+ mate-netbook (1.8.0-2) unstable; urgency=medium
+ 
+   [ Mike Gabriel ]
+   * debian/mate-netbook.install:
+     + Drop mate-conf .convert files from package (again).
+   * debian/patches:
+     + Add 0001_fix-mwp-applet-segfaulting-while-loading.patch.
+       Fix segfaulting of mate-windowpicker-applet while it is loading. (Closes:
+       #748351).
+ 
+   [ Vangelis Mouhtsis ]
+   * debian/rules:
+     + Replace on dh_install --list-missing -> --fail-missing.
+     + Remove non-packaged *.convert files after build.
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Mon, 07 Jul 2014 23:14:23 +0200
+ 
  mate-netbook (1.8.0-1) unstable; urgency=low
  
    * Initial release. (Closes: #734940).

-- 
mate-netbook Debian package