[SCM] mate-control-center Debian package branch, master, updated. 9f797f4749643cc48c05c21586e4dad54a26561a

[Mike Gabriel]

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

The following commit has been merged in the master branch:
commit 9f797f4749643cc48c05c21586e4dad54a26561a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Apr 19 22:20:08 2014 +0200

    debian/rules: Fix creation of repacked upstream tarball, drop 1001_fix-automake-call.patch.
---
 debian/patches/1001_fix-automake-call.patch | 50 -----------------------------
 debian/patches/series                       |  1 -
 debian/rules                                |  1 -
 3 files changed, 52 deletions(-)

diff --git a/debian/patches/1001_fix-automake-call.patch b/debian/patches/1001_fix-automake-call.patch
deleted file mode 100644
index 37b3eab..0000000
--- a/debian/patches/1001_fix-automake-call.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -67,9 +67,6 @@
- capplets/network/mate-network-properties.c
- capplets/network/mate-network-properties.desktop.in.in
- [type: gettext/glade]capplets/network/mate-network-properties.ui
--capplets/windows/mate-metacity-support.c
--capplets/windows/mate-window-properties.c
--capplets/windows/mate-window-properties.desktop.in.in
- libwindow-settings/mate-wm-manager.c
- libwindow-settings/marco-window-manager.c
- shell/control-center.c
diff --git a/debian/patches/series b/debian/patches/series
index 3244287..9089170 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-1001_fix-automake-call.patch
 1002_spelling-check-in-man-pages.patch
 1003_add-keywords-key-to-desktop-files.patch
 1004_add-main-category-to-categories-key-in-desktop-file.patch
diff --git a/debian/rules b/debian/rules
index 6312a3b..eb79986 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,6 @@ $(PKG)_$(VER)$(DTYPE).orig.tar.xz:
 	    || $(RM) -r $(PKG)-$(VER)
 	@echo "# Cleaning-up..."
 	cd $(PKG)-$(VER) \
-	    && find . -depth -type d -name 'windows' -exec $(RM) -r {} \; -printf 'removed %p
' \
 	    && $(RM) -r -v \
 	        help/
 	$(RM) -v $(PKG)_$(VER).orig.tar.*

-- 
mate-control-center Debian package