[SCM] qastools/master: wrap-and-sort -a -s

Tue May 15 11:01:50 UTC 2012

The following commit has been merged in the master branch:
commit 1413206d96d1e5bb0fa4026453d23ae93ecb2cd9
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue May 15 13:01:39 2012 +0200

    wrap-and-sort -a -s
    
    Git-Dch: Ignore

diff --git a/debian/control b/debian/control
index b5fcc5e..643b2aa 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,11 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders:
  Alessio Treglia <alessio at debian.org>,
  Sebastian Holtermann <sebholt at xwmw.org>
-Build-Depends: debhelper (>= 8), cmake, libasound2-dev, libqt4-dev
+Build-Depends:
+ cmake,
+ debhelper (>= 8),
+ libasound2-dev,
+ libqt4-dev
 Standards-Version: 3.9.3
 Homepage: http://xwmw.org/qastools
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/qastools.git
@@ -13,9 +17,11 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/qastools.git
 
 Package: qastools-common
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: QasTools common files
- QasTools is a collection of desktop applications for the 
+ QasTools is a collection of desktop applications for the
  Linux sound system ALSA.
  .
  The applications included are:
@@ -27,9 +33,12 @@ Description: QasTools common files
 
 Package: qasconfig
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qastools-common
+Depends:
+ qastools-common,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: ALSA configuration browser
- QasTools is a collection of desktop applications for the 
+ QasTools is a collection of desktop applications for the
  Linux sound system ALSA.
  .
  The applications included are:
@@ -37,16 +46,19 @@ Description: ALSA configuration browser
   - QasHctl - mixer for ALSA's High level Control Interface
   - QasMixer - desktop mixer with features similar to alsamixer
  .
- ALSA's configuration resides in a tree structure which gets built 
+ ALSA's configuration resides in a tree structure which gets built
  from the contents of the files /etc/asound.conf and ~/.asoundrc.
- QasConfig is a simple browser for this configuration tree and can 
- help to analyze and debug an ALSA setup. 
+ QasConfig is a simple browser for this configuration tree and can
+ help to analyze and debug an ALSA setup.
 
 Package: qashctl
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qastools-common
+Depends:
+ qastools-common,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: mixer for ALSA's High level Control Interface
- QasTools is a collection of desktop applications for the 
+ QasTools is a collection of desktop applications for the
  Linux sound system ALSA.
  .
  The applications included are:
@@ -54,16 +66,19 @@ Description: mixer for ALSA's High level Control Interface
   - QasHctl - mixer for ALSA's High level Control Interface
   - QasMixer - desktop mixer with features similar to alsamixer
  .
- QasHctl is a mixer application for ALSA's 
- "High level Control Interface". This interface allows more complex 
- interaction than the "Simple Mixer Interface" which is used by 
+ QasHctl is a mixer application for ALSA's
+ "High level Control Interface". This interface allows more complex
+ interaction than the "Simple Mixer Interface" which is used by
  alsamixer and QasMixer.
 
 Package: qasmixer
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qastools-common
+Depends:
+ qastools-common,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: ALSA mixer for the desktop
- QasTools is a collection of desktop applications for the 
+ QasTools is a collection of desktop applications for the
  Linux sound system ALSA.
  .
  The applications included are:
@@ -71,6 +86,6 @@ Description: ALSA mixer for the desktop
   - QasHctl - mixer for ALSA's High level Control Interface
   - QasMixer - desktop mixer with features similar to alsamixer
  .
- QasMixer is a desktop mixer application for ALSA's 
- "Simple Mixer Interface" and offers features similar to alsamixer. 
+ QasMixer is a desktop mixer application for ALSA's
+ "Simple Mixer Interface" and offers features similar to alsamixer.
  It also features a sytem tray icon with basic mixer functionality.
diff --git a/debian/qasconfig.install b/debian/qasconfig.install
index 9093793..b32cd3d 100644
--- a/debian/qasconfig.install
+++ b/debian/qasconfig.install
@@ -1,8 +1,8 @@
 /usr/bin/qasconfig
+/usr/share/applications/qasconfig.desktop
 /usr/share/icons/hicolor/16x16/apps/qasconfig.png
 /usr/share/icons/hicolor/32x32/apps/qasconfig.png
 /usr/share/icons/hicolor/48x48/apps/qasconfig.png
 /usr/share/icons/hicolor/64x64/apps/qasconfig.png
 /usr/share/icons/hicolor/scalable/apps/qasconfig.svg
-/usr/share/applications/qasconfig.desktop
 /usr/share/man/man1/qasconfig.1.gz
diff --git a/debian/qashctl.install b/debian/qashctl.install
index dbeb577..2714d3d 100644
--- a/debian/qashctl.install
+++ b/debian/qashctl.install
@@ -1,8 +1,8 @@
 /usr/bin/qashctl
+/usr/share/applications/qashctl.desktop
 /usr/share/icons/hicolor/16x16/apps/qashctl.png
 /usr/share/icons/hicolor/32x32/apps/qashctl.png
 /usr/share/icons/hicolor/48x48/apps/qashctl.png
 /usr/share/icons/hicolor/64x64/apps/qashctl.png
 /usr/share/icons/hicolor/scalable/apps/qashctl.svg
-/usr/share/applications/qashctl.desktop
 /usr/share/man/man1/qashctl.1.gz
diff --git a/debian/qasmixer.install b/debian/qasmixer.install
index 338db49..7930272 100644
--- a/debian/qasmixer.install
+++ b/debian/qasmixer.install
@@ -1,10 +1,10 @@
 /usr/bin/qasmixer
+/usr/share/applications/qasmixer.desktop
 /usr/share/icons/hicolor/16x16/apps/qasmixer.png
 /usr/share/icons/hicolor/32x32/apps/qasmixer.png
 /usr/share/icons/hicolor/48x48/apps/qasmixer.png
 /usr/share/icons/hicolor/64x64/apps/qasmixer.png
 /usr/share/icons/hicolor/scalable/apps/qasmixer.svg
-/usr/share/qastools/icons/show-playback.svg
-/usr/share/qastools/icons/show-capture.svg
-/usr/share/applications/qasmixer.desktop
 /usr/share/man/man1/qasmixer.1.gz
+/usr/share/qastools/icons/show-capture.svg
+/usr/share/qastools/icons/show-playback.svg
diff --git a/debian/qastools-common.install b/debian/qastools-common.install
index 74e0332..d2f0f71 100644
--- a/debian/qastools-common.install
+++ b/debian/qastools-common.install
@@ -1,19 +1,19 @@
 /usr/share/qastools/l10n/qastools_cs.qm
-/usr/share/qastools/l10n/qastools_default.qm
 /usr/share/qastools/l10n/qastools_de.qm
+/usr/share/qastools/l10n/qastools_default.qm
 /usr/share/qastools/l10n/qastools_es.qm
 /usr/share/qastools/l10n/qastools_ru.qm
+/usr/share/qastools/widgets/sw_joined_bg_focus.svg
 /usr/share/qastools/widgets/sw_joined_bg_hover_focus.svg
-/usr/share/qastools/widgets/sw_joined_bg_idle.svg
 /usr/share/qastools/widgets/sw_joined_bg_hover_idle.svg
-/usr/share/qastools/widgets/sw_joined_bg_focus.svg
-/usr/share/qastools/widgets/sw_joined_handle_checked_idle.svg
+/usr/share/qastools/widgets/sw_joined_bg_idle.svg
+/usr/share/qastools/widgets/sw_joined_handle_checked_focus.svg
+/usr/share/qastools/widgets/sw_joined_handle_checked_hover_focus.svg
 /usr/share/qastools/widgets/sw_joined_handle_checked_hover_idle.svg
-/usr/share/qastools/widgets/sw_joined_handle_unchecked_idle.svg
-/usr/share/qastools/widgets/sw_joined_handle_unchecked_focus.svg
-/usr/share/qastools/widgets/sw_joined_handle_unchecked_hover_idle.svg
+/usr/share/qastools/widgets/sw_joined_handle_checked_idle.svg
 /usr/share/qastools/widgets/sw_joined_handle_half_checked_focus.svg
-/usr/share/qastools/widgets/sw_joined_handle_checked_hover_focus.svg
-/usr/share/qastools/widgets/sw_joined_handle_checked_focus.svg
-/usr/share/qastools/widgets/sw_joined_handle_unchecked_hover_focus.svg
 /usr/share/qastools/widgets/sw_joined_handle_half_checked_hover_focus.svg
+/usr/share/qastools/widgets/sw_joined_handle_unchecked_focus.svg
+/usr/share/qastools/widgets/sw_joined_handle_unchecked_hover_focus.svg
+/usr/share/qastools/widgets/sw_joined_handle_unchecked_hover_idle.svg
+/usr/share/qastools/widgets/sw_joined_handle_unchecked_idle.svg

-- 
qastools packaging

