[SCM] mate-control-center Debian package branch, master, updated. 421f3a0bba678f03974cb81521c7f6915f8f4e05

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-control-center.git;a=commitdiff;h=e4679b5

The following commit has been merged in the master branch:
commit e4679b5b1f8ef6ee916182d7ce5a30022252534e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Apr 17 22:58:22 2014 +0200

    debian/patches: Add 1001_fix-automake-call.patch. Fix automake run with capplets/windows/ not being in upstream sources.
---
 debian/patches/1001_fix-automake-call.patch        | 38 ++++++++++++++++++++++
 .../2001_omit-gfdl-licensed-help-files.patch       |  4 +--
 debian/patches/series                              |  1 +
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/debian/patches/1001_fix-automake-call.patch b/debian/patches/1001_fix-automake-call.patch
new file mode 100644
index 0000000..684749a
--- /dev/null
+++ b/debian/patches/1001_fix-automake-call.patch
@@ -0,0 +1,38 @@
+Description: Fix automake run, capplets/window/ not present in upstream tarball
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+--- a/configure.ac
++++ b/configure.ac
+@@ -363,8 +363,6 @@
+ capplets/mouse/mate-settings-mouse.desktop.in
+ capplets/network/Makefile
+ capplets/network/mate-network-properties.desktop.in
+-capplets/windows/Makefile
+-capplets/windows/mate-window-properties.desktop.in
+ font-viewer/Makefile
+ font-viewer/mate-font-viewer.desktop.in
+ help/Makefile
+--- a/capplets/Makefile.am
++++ b/capplets/Makefile.am
+@@ -8,20 +8,18 @@
+ 	keybindings \
+ 	mouse \
+ 	network \
+-	windows \
+-        about-me
++	about-me
+ 
+ DIST_SUBDIRS = \
+ 	common \
+ 	accessibility \
+ 	appearance \
+ 	default-applications \
++	display \
+ 	keybindings \
+ 	keyboard \
+ 	mouse \
+ 	network \
+-	windows \
+-	display \
+ 	about-me
+ 
+ -include $(top_srcdir)/git.mk
diff --git a/debian/patches/2001_omit-gfdl-licensed-help-files.patch b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
index c72a1a4..e05cb3a 100644
--- a/debian/patches/2001_omit-gfdl-licensed-help-files.patch
+++ b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
@@ -12,8 +12,8 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  SUBDIRS += libslab
 --- a/configure.ac
 +++ b/configure.ac
-@@ -367,7 +367,6 @@
- capplets/windows/mate-window-properties.desktop.in
+@@ -365,7 +365,6 @@
+ capplets/network/mate-network-properties.desktop.in
  font-viewer/Makefile
  font-viewer/mate-font-viewer.desktop.in
 -help/Makefile
diff --git a/debian/patches/series b/debian/patches/series
index 83b110e..69bd485 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+1001_fix-automake-call.patch
 2001_omit-gfdl-licensed-help-files.patch

-- 
mate-control-center Debian package