[SCM] guitarix/master: Fix d/ file's styles with `wrap-and-sort -t`

viccuad-guest at users.alioth.debian.org viccuad-guest at users.alioth.debian.org
Wed May 11 11:26:36 UTC 2016 

The following commit has been merged in the master branch:
commit a3df10ba3dbf59ad8a4e8b1186247b0db31c61e2
Author: Víctor Cuadrado Juan <me at viccuad.me>
Date:   Wed May 11 13:23:11 2016 +0200

    Fix d/ file's styles with `wrap-and-sort -t`

diff --git a/debian/control b/debian/control
index 12ff889..eff6493 100644
--- a/debian/control
+++ b/debian/control
@@ -3,30 +3,27 @@ Section: sound
 Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Víctor Cuadrado Juan <me at viccuad.me>
-Build-Depends:
- debhelper (>= 9),
- python,
- libjack-dev,
- libsndfile1-dev,
- libgtk2.0-dev,
- ladspa-sdk,
- libzita-convolver-dev,
- libgtkmm-2.4-dev,
- libboost-dev (>= 1.53),
- libboost-thread-dev (>= 1.53),
- intltool,
- liblrdf0-dev,
- libboost-system-dev (>= 1.53),
- lv2-dev,
- libavahi-gobject-dev,
- libeigen3-dev,
- libzita-resampler-dev,
- libbluetooth-dev [linux-any],
- liblilv-dev,
- libwebkitgtk-dev
-Build-Depends-Indep:
- doxygen,
- graphviz
+Build-Depends: debhelper (>= 9),
+               intltool,
+               ladspa-sdk,
+               libavahi-gobject-dev,
+               libbluetooth-dev [linux-any],
+               libboost-dev (>= 1.53),
+               libboost-system-dev (>= 1.53),
+               libboost-thread-dev (>= 1.53),
+               libeigen3-dev,
+               libgtk2.0-dev,
+               libgtkmm-2.4-dev,
+               libjack-dev,
+               liblilv-dev,
+               liblrdf0-dev,
+               libsndfile1-dev,
+               libwebkitgtk-dev,
+               libzita-convolver-dev,
+               libzita-resampler-dev,
+               lv2-dev,
+               python,
+Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 3.9.8
 Homepage: http://guitarix.sourceforge.net/
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/guitarix.git
@@ -34,15 +31,15 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/guitarix.git
 
 Package: guitarix
 Architecture: any
-Depends:
- guitarix-common (= ${source:Version}),
- guitarix-ladspa (>= ${source:Version}),
- guitarix-lv2 (>= ${source:Version}),
- ${shlibs:Depends}, ${misc:Depends},
- gtk2-engines,
- gtk2-engines-pixbuf,
- fonts-roboto
-Recommends: jack-capture, vorbis-tools, lame
+Depends: fonts-roboto,
+         gtk2-engines,
+         gtk2-engines-pixbuf,
+         guitarix-common (= ${source:Version}),
+         guitarix-ladspa (>= ${source:Version}),
+         guitarix-lv2 (>= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: jack-capture, lame, vorbis-tools
 Description: Rock guitar amplifier for Jack
  Guitarix is a rock guitar amplifier for the Jack Audio Connection Kit with
  one input and two outputs. It provides one JACK input port and two JACK output
@@ -56,8 +53,7 @@ Package: guitarix-common
 Architecture: all
 Breaks: guitarix (<< 0.34.0-1)
 Replaces: guitarix (<< 0.34.0-1)
-Depends:
- ${misc:Depends}
+Depends: ${misc:Depends}
 Description: Guitarix - Common files
  Guitarix is a rock guitar amplifier for the Jack Audio Connection Kit with
  one input and two outputs. It is designed to produce nice
@@ -72,7 +68,7 @@ Architecture: any
 Breaks: guitarix (<< 0.34.0-1)
 Replaces: guitarix (<< 0.34.0-1)
 Provides: ladspa-plugin
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Guitarix - ladspa plugins
  Guitarix is a rock guitar amplifier for the Jack Audio Connection Kit with
  one input and two outputs. It is designed to produce nice
@@ -87,7 +83,7 @@ Architecture: any
 Breaks: guitarix (<< 0.34.0-1)
 Replaces: guitarix (<< 0.34.0-1)
 Provides: lv2-plugin
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Guitarix - LV2 plugins
  Guitarix is a rock guitar amplifier for the Jack Audio Connection Kit with
  one input and two outputs. It is designed to produce nice
@@ -101,8 +97,7 @@ Package: guitarix-doc
 Section: doc
 Architecture: all
 Priority: optional
-Depends: ${misc:Depends},
- libjs-jquery
+Depends: libjs-jquery, ${misc:Depends}
 Suggests: guitarix
 Description: Guitarix - Development documentation
  Guitarix is a rock guitar amplifier for the Jack Audio Connection Kit with
@@ -112,13 +107,12 @@ Description: Guitarix - Development documentation
  .
  This package contains Guitarix's Development documentation.
 
-
 Package: libgxw0
 Section: libs
 Architecture: any
 Breaks: guitarix (<< 0.34.0-1)
 Replaces: guitarix (<< 0.34.0-1)
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Guitarix - GTK+ library
  Guitarix is a rock guitar amplifier for the Jack Audio Connection Kit with
  one input and two outputs. It is designed to produce nice
@@ -130,7 +124,7 @@ Description: Guitarix - GTK+ library
 Package: libgxw-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libgxw0 (= ${binary:Version})
+Depends: libgxw0 (= ${binary:Version}), ${misc:Depends}
 Recommends: guitarix-doc
 Description: Guitarix - GTK+ library (development files)
  Guitarix is a rock guitar amplifier for the Jack Audio Connection Kit with
@@ -145,7 +139,7 @@ Section: libs
 Architecture: any
 Breaks: guitarix (<< 0.34.0-1)
 Replaces: guitarix (<< 0.34.0-1)
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Guitarix - GTK+ C++ widget library
  Guitarix is a rock guitar amplifier for the Jack Audio Connection Kit with
  one input and two outputs. It is designed to produce nice
@@ -157,7 +151,7 @@ Description: Guitarix - GTK+ C++ widget library
 Package: libgxwmm-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libgxwmm0 (= ${binary:Version})
+Depends: libgxwmm0 (= ${binary:Version}), ${misc:Depends}
 Recommends: guitarix-doc
 Description: Guitarix - GTK+ C++ widget library (development files)
  Guitarix is a rock guitar amplifier for the Jack Audio Connection Kit with
@@ -170,7 +164,7 @@ Description: Guitarix - GTK+ C++ widget library (development files)
 Package: gxw-glade
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Guitarix - GTK+ library Glade support
  Guitarix is a rock guitar amplifier for the Jack Audio Connection Kit with
  one input and two outputs. It is designed to produce nice
diff --git a/debian/guitarix-common.install b/debian/guitarix-common.install
index ee71753..6d57084 100644
--- a/debian/guitarix-common.install
+++ b/debian/guitarix-common.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/share/gx_head/*
 debian/tmp/usr/share/locale/*
-debian/tmp/usr/share/pixmaps/*
\ No newline at end of file
+debian/tmp/usr/share/pixmaps/*
diff --git a/debian/guitarix-doc.docs b/debian/guitarix-doc.docs
index 97f732c..4e3f492 100644
--- a/debian/guitarix-doc.docs
+++ b/debian/guitarix-doc.docs
@@ -1 +1 @@
-documentation/html/*
\ No newline at end of file
+documentation/html/*
diff --git a/debian/guitarix-ladspa.install b/debian/guitarix-ladspa.install
index e400d18..75aeb55 100644
--- a/debian/guitarix-ladspa.install
+++ b/debian/guitarix-ladspa.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/ladspa/*
-debian/tmp/usr/share/ladspa/*
\ No newline at end of file
+debian/tmp/usr/share/ladspa/*
diff --git a/debian/guitarix-lv2.install b/debian/guitarix-lv2.install
index c4a3c9f..828f52b 100644
--- a/debian/guitarix-lv2.install
+++ b/debian/guitarix-lv2.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lv2/*
\ No newline at end of file
+debian/tmp/usr/lib/lv2/*
diff --git a/debian/gxw-glade.install b/debian/gxw-glade.install
index b994888..a883a34 100644
--- a/debian/gxw-glade.install
+++ b/debian/gxw-glade.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/glade3/*
-debian/tmp/usr/share/guitarix/icons/hicolor/22x22/actions/widget-gxwidgets*
-debian/tmp/usr/share/guitarix/icons/hicolor/16x16/actions/widget-gxwidgets*
 debian/tmp/usr/share/glade3/*
+debian/tmp/usr/share/guitarix/icons/hicolor/16x16/actions/widget-gxwidgets*
+debian/tmp/usr/share/guitarix/icons/hicolor/22x22/actions/widget-gxwidgets*
diff --git a/debian/libgxw-dev.install b/debian/libgxw-dev.install
index 5a37201..dbba3a2 100644
--- a/debian/libgxw-dev.install
+++ b/debian/libgxw-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/gxw/*
 debian/tmp/usr/include/gxw.h
-debian/tmp/usr/lib/pkgconfig/gxw.pc
+debian/tmp/usr/include/gxw/*
 debian/tmp/usr/lib/libgxw.so
+debian/tmp/usr/lib/pkgconfig/gxw.pc
diff --git a/debian/libgxw0.install b/debian/libgxw0.install
index 0862018..1a10cec 100644
--- a/debian/libgxw0.install
+++ b/debian/libgxw0.install
@@ -1,2 +1 @@
 debian/tmp/usr/lib/libgxw.so.*
-
diff --git a/debian/libgxwmm-dev.install b/debian/libgxwmm-dev.install
index a311a03..20d306f 100644
--- a/debian/libgxwmm-dev.install
+++ b/debian/libgxwmm-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/gxwmm/*
 debian/tmp/usr/include/gxwmm.h
-debian/tmp/usr/lib/pkgconfig/gxwmm.pc
+debian/tmp/usr/include/gxwmm/*
 debian/tmp/usr/lib/libgxwmm.so
+debian/tmp/usr/lib/pkgconfig/gxwmm.pc
diff --git a/debian/libgxwmm0.install b/debian/libgxwmm0.install
index 3622007..9b0df33 100644
--- a/debian/libgxwmm0.install
+++ b/debian/libgxwmm0.install
@@ -1,2 +1 @@
 debian/tmp/usr/lib/libgxwmm.so.*
-

-- 
guitarix packaging

More information about the pkg-multimedia-commits mailing list