[mate-control-center] 03/14: debian/{control, copyright, *.install}: Process with wrap-and-sort.

Mike Gabriel sunweaver at debian.org
Thu Jun 18 09:03:04 UTC 2015


This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch debian/experimental
in repository mate-control-center.

commit 1475e26e48855b05e368a0373175f2fd83aeac18
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jun 17 16:33:29 2015 +0200

    debian/{control,copyright,*.install}: Process with wrap-and-sort.
---
 debian/control                             | 95 ++++++++++++++----------------
 debian/copyright                           | 18 +++---
 debian/libmate-slab-dev.install            |  2 +-
 debian/libmate-window-settings-dev.install |  2 +-
 debian/libmate-window-settings1.install    |  2 +-
 debian/mate-control-center-common.install  |  2 +-
 6 files changed, 57 insertions(+), 64 deletions(-)

diff --git a/debian/control b/debian/control
index fe281d3..3921441 100644
--- a/debian/control
+++ b/debian/control
@@ -6,41 +6,41 @@ Uploaders: Mike Gabriel <sunweaver at debian.org>,
            John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>,
            Stefano Karapetsas <stefano at karapetsas.com>,
            Vangelis Mouhtsis <vangelis at gnugr.org>,
-Build-Depends: debhelper (>= 9),
-               mate-common (>= 1.10),
+Build-Depends: autotools-dev,
+               debhelper (>= 9),
+               desktop-file-utils,
                docbook-to-man,
-               autotools-dev,
-               yelp-tools,
                intltool,
-               libxt-dev,
-               libx11-dev,
-               libxss-dev,
                libcanberra-gtk-dev,
-               libgtk2.0-dev,
-               libglib2.0-dev,
-               libmate-desktop-dev,
-               libmatemenu-dev,
                libdbus-1-dev,
                libdbus-glib-1-dev,
-               libxml2-dev,
+               libdconf-dev,
+               libglib2.0-dev,
+               libgtk2.0-dev,
+               libgtop2-dev,
                libmarco-dev,
-               libxft-dev,
-               libxrender-dev,
-               libxrandr-dev,
+               libmate-desktop-dev,
+               libmatekbd-dev,
+               libmatemenu-dev,
+               libpango1.0-dev,
+               librsvg2-dev,
+               libstartup-notification0-dev,
+               libunique-dev,
+               libx11-dev,
                libxcursor-dev,
+               libxft-dev,
                libxi-dev,
-               libmatekbd-dev,
                libxklavier-dev,
-               libunique-dev,
-               desktop-file-utils,
+               libxml2-dev,
+               libxrandr-dev,
+               libxrender-dev,
+               libxss-dev,
+               libxt-dev,
+               mate-common (>= 1.10),
+               mate-settings-daemon,
                shared-mime-info,
-               libgtop2-dev,
                xsltproc,
-               libstartup-notification0-dev,
-               libpango1.0-dev,
-               librsvg2-dev,
-               libdconf-dev,
-               mate-settings-daemon,
+               yelp-tools
 Standards-Version: 3.9.6
 Homepage: http://www.mate-desktop.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mate/mate-control-center.git;a=summary
@@ -48,20 +48,20 @@ Vcs-Git: git://anonscm.debian.org/pkg-mate/mate-control-center.git
 
 Package: mate-control-center
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libmate-window-settings1 (= ${binary:Version}),
+Depends: caja-common (>= 1.8.0),
+         desktop-file-utils,
+         gsettings-desktop-schemas,
+         libglib2.0-bin,
          libmate-slab0 (= ${binary:Version}),
-         mate-control-center-common (>= ${source:Version}),
+         libmate-window-settings1 (= ${binary:Version}),
          marco-common (>= 1.8.0),
-         caja-common (>= 1.8.0),
-         mate-settings-daemon,
-         mate-menus,
+         mate-control-center-common (>= ${source:Version}),
          mate-desktop (>= 1.8.1+dfsg1-3),
          mate-icon-theme,
-         desktop-file-utils,
-         gsettings-desktop-schemas,
-         libglib2.0-bin
+         mate-menus,
+         mate-settings-daemon,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: gconf2
 Description: utilities to configure the MATE desktop
  The MATE control center contains configuration applets for the MATE desktop,
@@ -74,8 +74,8 @@ Description: utilities to configure the MATE desktop
 
 Package: mate-control-center-common
 Architecture: all
-Depends: ${misc:Depends},
-Breaks: mate-control-center (<< 1.8.1),
+Depends: ${misc:Depends}
+Breaks: mate-control-center (<< 1.8.1)
 Description: utilities to configure the MATE desktop (common files)
  The MATE control center contains configuration applets for the MATE desktop,
  allowing to set accessibility configuration, desktop fonts, keyboard
@@ -89,8 +89,7 @@ Package: libmate-window-settings1
 Section: libs
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: utilities to configure the MATE desktop (window settings library)
  The MATE control center contains configuration applets for the MATE desktop,
  allowing to set accessibility configuration, desktop fonts, keyboard
@@ -104,8 +103,7 @@ Package: libmate-window-settings-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         libmate-window-settings1 (= ${binary:Version}),
+Depends: libmate-window-settings1 (= ${binary:Version}), ${misc:Depends}
 Description: utilities to configure the MATE desktop (window settings headers)
  The MATE control center contains configuration applets for the MATE desktop,
  allowing to set accessibility configuration, desktop fonts, keyboard
@@ -121,8 +119,7 @@ Priority: extra
 Architecture: any
 Multi-Arch: same
 Provides: libmate-window-settings-dbg
-Depends: ${misc:Depends},
-         libmate-window-settings1 (= ${binary:Version}),
+Depends: libmate-window-settings1 (= ${binary:Version}), ${misc:Depends}
 Description: utilities to configure the MATE desktop (window settings debugging symbols)
  The MATE control center contains configuration applets for the MATE desktop,
  allowing to set accessibility configuration, desktop fonts, keyboard
@@ -138,8 +135,7 @@ Package: libmate-slab0
 Section: libs
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: beautification app library
  This library provides functionality to create applications like MATE
  control center and the application-browser from gnome-main-menu.
@@ -150,9 +146,8 @@ Package: libmate-slab-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Provides: libmate-slab0-dev,
-Depends: ${misc:Depends},
-         libmate-slab0 (= ${binary:Version}),
+Provides: libmate-slab0-dev
+Depends: libmate-slab0 (= ${binary:Version}), ${misc:Depends}
 Description: beautification app library (development headers)
  The libmate-slab library provides functionality to create applications
  like MATE control center and the application-browser from gnome-main-menu.
@@ -164,8 +159,7 @@ Section: debug
 Priority: extra
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         libmate-slab0 (= ${binary:Version}),
+Depends: libmate-slab0 (= ${binary:Version}), ${misc:Depends}
 Description: beautification app library (window settings debugging symbols)
  The libmate-slab library provides functionality to create applications
  like MATE control center and the application-browser from gnome-main-menu.
@@ -179,8 +173,7 @@ Package: mate-control-center-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends},
-         mate-control-center (= ${binary:Version})
+Depends: mate-control-center (= ${binary:Version}), ${misc:Depends}
 Description: utilities to configure the MATE desktop (debugging symbols)
  The MATE control center contains configuration applets for the MATE desktop,
  allowing to set accessibility configuration, desktop fonts, keyboard
diff --git a/debian/copyright b/debian/copyright
index e7fa086..8121466 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,7 +38,7 @@ Files: libslab/app-resizer.c
        libslab/tile.h
 Copyright: 2006-2007, Novell, Inc.
 License: LGPL-2+
- 
+
 Files: capplets/appearance/appearance-desktop.c
        capplets/appearance/appearance-desktop.h
        capplets/appearance/appearance-main.c
@@ -56,7 +56,7 @@ Files: capplets/appearance/appearance-desktop.c
        capplets/keyboard/mate-keyboard-properties-a11y.c
 Copyright: 2007-2010, The GNOME Foundation
 License: GPL-2+
- 
+
 Files: capplets/appearance/mate-wp-info.c
        capplets/appearance/mate-wp-info.h
        capplets/appearance/mate-wp-item.c
@@ -74,7 +74,7 @@ Files: capplets/display/mate-display-properties-install-systemwide.c
        shell/control-center.c
 Copyright: 2006-2010 Novell, Inc.
 License: GPL-2+
- 
+
 Files: capplets/keyboard/mate-keyboard-properties-xkb.c
        capplets/keyboard/mate-keyboard-properties-xkblt.c
        capplets/keyboard/mate-keyboard-properties-xkbltadd.c
@@ -83,7 +83,7 @@ Files: capplets/keyboard/mate-keyboard-properties-xkb.c
        capplets/keyboard/mate-keyboard-properties-xkbpv.c
 Copyright: 2003-2007, Sergey V. Udaltsov
 License: GPL-2+
- 
+
 Files: capplets/about-me/fingerprint-strings.h
        capplets/about-me/mate-about-me-fingerprint.c
        capplets/about-me/mate-about-me-fingerprint.h
@@ -91,7 +91,7 @@ Files: capplets/about-me/fingerprint-strings.h
        font-viewer/totem-resources.h
 Copyright: 2007-2008, Bastien Nocera <hadess at hadess.net>
 License: GPL-2+
- 
+
 Files: capplets/windows/mate-window-properties.c
        libwindow-settings/marco-window-manager.c
        libwindow-settings/mate-window-manager.c
@@ -108,7 +108,7 @@ Files: capplets/common/capplet-util.c
        capplets/keyboard/mate-keyboard-properties-a11y.h
 Copyright: 2001-2002, Ximian, Inc.
 License: GPL-2+
- 
+
 Files: typing-break/drw-break-window.c
        typing-break/drw-break-window.h
        typing-break/drw-monitor.c
@@ -116,7 +116,7 @@ Files: typing-break/drw-break-window.c
 Copyright: 2002, CodeFactory AB
            2002-2003, Richard Hult <richard at imendio.com>
 License: GPL-2+
- 
+
 Files: capplets/appearance/appearance-support.c
        capplets/appearance/appearance-support.h
        capplets/common/dconf-util.c
@@ -230,7 +230,7 @@ License: GPL-2+
 Files: capplets/network/mate-network-properties.c
 Copyright: 2002, Sun Microsystems, Inc.
 License: GPL-2+
- 
+
 Files: capplets/common/mate-theme-apply.c
 Copyright: 2002, Jonathan Blandford <aes at gnome.org>
 License: LGPL-2.1+
@@ -497,7 +497,7 @@ License: MIT~OldStyle+LegalDisclaimer
  documentation, and that the name of the copyright holder not be used
  in advertising or publicity pertaining to distribution of the software
  without specific, written prior permission.  The copyright holder makes
- no representations about the suitability of this software for any purpose. 
+ no representations about the suitability of this software for any purpose.
  It is provided "as is" without express or implied warranty.
  .
  THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
diff --git a/debian/libmate-slab-dev.install b/debian/libmate-slab-dev.install
index 50422a7..98ae13a 100644
--- a/debian/libmate-slab-dev.install
+++ b/debian/libmate-slab-dev.install
@@ -1,3 +1,3 @@
 usr/include/libmate-slab/
 usr/lib/*/libmate-slab.so
-usr/lib/*/pkgconfig/mate-slab.pc
\ No newline at end of file
+usr/lib/*/pkgconfig/mate-slab.pc
diff --git a/debian/libmate-window-settings-dev.install b/debian/libmate-window-settings-dev.install
index fb9e970..1f7bf88 100644
--- a/debian/libmate-window-settings-dev.install
+++ b/debian/libmate-window-settings-dev.install
@@ -1,3 +1,3 @@
 usr/include/mate-window-settings-2.0/
 usr/lib/*/libmate-window-settings.so
-usr/lib/*/pkgconfig/mate-window-settings-2.0.pc
\ No newline at end of file
+usr/lib/*/pkgconfig/mate-window-settings-2.0.pc
diff --git a/debian/libmate-window-settings1.install b/debian/libmate-window-settings1.install
index 7d05c5f..1ad5822 100644
--- a/debian/libmate-window-settings1.install
+++ b/debian/libmate-window-settings1.install
@@ -1,2 +1,2 @@
 usr/lib/*/libmate-window-settings.so.*
-usr/lib/*/window-manager-settings/
\ No newline at end of file
+usr/lib/*/window-manager-settings/
diff --git a/debian/mate-control-center-common.install b/debian/mate-control-center-common.install
index b02047e..8fc3cfb 100644
--- a/debian/mate-control-center-common.install
+++ b/debian/mate-control-center-common.install
@@ -1,6 +1,6 @@
+usr/share/MateConf/
 usr/share/desktop-directories/
 usr/share/glib-2.0/
 usr/share/icons/
 usr/share/locale/
 usr/share/mate/
-usr/share/MateConf/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-control-center.git



More information about the pkg-mate-commits mailing list