[Pkg-libvirt-maintainers] [Pkg-libvirt-commits] [gtk-vnc] 01/26: Run wrap-and-sort command
Guido Günther
agx at sigxcpu.org
Mon Jan 9 06:40:49 UTC 2017
On Mon, Jan 09, 2017 at 06:28:11AM +0000, Joao Eriberto Mota Filho wrote:
> This is an automated email from the git hooks/post-receive script.
>
> eriberto pushed a commit to branch debian/sid
> in repository gtk-vnc.
>
> commit d745b664e573c1cc4316bb10d0e12f2229f06f12
> Author: Joao Eriberto Mota Filho <eriberto at debian.org>
> Date: Sun Jan 8 13:36:06 2017 -0200
>
> Run wrap-and-sort command
Please use
wrap-and-sort -ast
for pkg-libvirt. Everything else has far too much whitespace and
introduces too much line noise on changes.
Cheers
-- Guido
> ---
> debian/control | 115 +++++++++++++++++++-------------------
> debian/copyright | 18 +++---
> debian/gvncviewer.install | 2 +-
> debian/libgtk-vnc-1.0-dev.install | 2 +-
> debian/libgtk-vnc-2.0-dev.install | 2 +-
> debian/libgvnc-1.0-dev.install | 9 ++-
> 6 files changed, 70 insertions(+), 78 deletions(-)
>
> diff --git a/debian/control b/debian/control
> index 1dac18c..e5ce9b7 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -2,32 +2,28 @@ Source: gtk-vnc
> Section: gnome
> Priority: optional
> Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
> -Uploaders: Guido Günther <agx at sigxcpu.org>, Laurent Léonard <laurent at open-minds.org>
> +Uploaders: Guido Günther <agx at sigxcpu.org>,
> + Laurent Léonard <laurent at open-minds.org>
> Standards-Version: 3.9.8
> -Build-Depends:
> - debhelper (>= 7.0.50~),
> - python-dev,
> - libgnutls28-dev,
> - libgcrypt20-dev,
> - libcairo2-dev,
> - autotools-dev,
> - dh-autoreconf,
> - libffi-dev,
> - libsasl2-dev,
> - intltool,
> - libtext-csv-perl,
> -# GTK2 build
> - libgtk2.0-dev,
> - python-gtk2-dev (>= 2.0),
> -# GTK3 build
> - libgtk-3-dev,
> - libgirepository1.0-dev,
> - gobject-introspection,
> - libtool,
> -# for vala bindings
> - valac (>= 0.20),
> -# audio extension
> - libpulse-dev
> +Build-Depends: autotools-dev,
> + debhelper (>= 7.0.50~),
> + dh-autoreconf,
> + gobject-introspection,
> + intltool,
> + libcairo2-dev,
> + libffi-dev,
> + libgcrypt20-dev,
> + libgirepository1.0-dev,
> + libgnutls28-dev,
> + libgtk-3-dev,
> + libgtk2.0-dev,
> + libpulse-dev,
> + libsasl2-dev,
> + libtext-csv-perl,
> + libtool,
> + python-dev,
> + python-gtk2-dev (>= 2.0),
> + valac (>= 0.20)
> Build-Conflicts: libffi4-dev, valac-0.12
> X-Python-Version: >= 2.5
> Vcs-Git: git://git.debian.org/git/pkg-libvirt/gtk-vnc.git
> @@ -36,7 +32,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-libvirt/gtk-vnc.git
> Package: libgvnc-1.0-0
> Architecture: any
> Section: libs
> -Depends: ${shlibs:Depends}, ${misc:Depends}
> +Depends: ${misc:Depends}, ${shlibs:Depends}
> Replaces: libgtk-vnc-1.0-0 (<= 0.4.3-1)
> Description: VNC gobject wrapper (runtime libraries)
> It is built using coroutines, allowing it to be completely asynchronous while
> @@ -52,9 +48,8 @@ Description: VNC gobject wrapper (runtime libraries)
> Package: libgvnc-1.0-0-dbg
> Architecture: any
> Section: debug
> -Depends: ${shlibs:Depends}, ${misc:Depends},
> - libgvnc-1.0-0 (=${binary:Version})
> -Breaks: libgtk-vnc-1.0-0-dbg (<< 0.4.3-2)
> +Depends: libgvnc-1.0-0 (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
> +Breaks: libgtk-vnc-1.0-0-dbg (<< 0.4.3-2)
> Replaces: libgtk-vnc-1.0-0-dbg (<< 0.4.3-2)
> Priority: extra
> Description: VNC gobject wrapper (debugging symbols)
> @@ -71,11 +66,11 @@ Description: VNC gobject wrapper (debugging symbols)
> Package: libgvnc-1.0-dev
> Architecture: any
> Section: libdevel
> -Depends: ${misc:Depends},
> - libgvnc-1.0-0 (= ${binary:Version}),
> - libglib2.0-dev,
> - libgnutls28-dev,
> - libcairo2-dev (>= 1.2.0)
> +Depends: libcairo2-dev (>= 1.2.0),
> + libglib2.0-dev,
> + libgnutls28-dev,
> + libgvnc-1.0-0 (= ${binary:Version}),
> + ${misc:Depends}
> Replaces: libgtk-vnc-1.0-dev (<= 0.4.3-1)
> Description: VNC GObject wrapper (development files)
> It is built using coroutines, allowing it to be completely asynchronous while
> @@ -91,7 +86,7 @@ Description: VNC GObject wrapper (development files)
> Package: libgtk-vnc-1.0-0
> Architecture: any
> Section: libs
> -Depends: ${shlibs:Depends}, ${misc:Depends}
> +Depends: ${misc:Depends}, ${shlibs:Depends}
> Description: VNC viewer widget for GTK+2 (runtime libraries)
> It is built using coroutines, allowing it to be completely asynchronous while
> remaining single threaded. It supports RFB protocols 3.3 through 3.8 and the
> @@ -106,8 +101,9 @@ Description: VNC viewer widget for GTK+2 (runtime libraries)
> Package: libgtk-vnc-1.0-0-dbg
> Architecture: any
> Section: debug
> -Depends: ${shlibs:Depends}, ${misc:Depends},
> - libgtk-vnc-1.0-0 (=${binary:Version})
> +Depends: libgtk-vnc-1.0-0 (=${binary:Version}),
> + ${misc:Depends},
> + ${shlibs:Depends}
> Priority: extra
> Description: VNC viewer widget for GTK+2 (debugging symbols)
> It is built using coroutines, allowing it to be completely asynchronous while
> @@ -123,12 +119,12 @@ Description: VNC viewer widget for GTK+2 (debugging symbols)
> Package: libgtk-vnc-1.0-dev
> Architecture: any
> Section: libdevel
> -Depends: ${misc:Depends},
> - libgtk-vnc-1.0-0 (= ${binary:Version}),
> - libgvnc-1.0-dev (= ${binary:Version}),
> - libgtk2.0-dev (>= 2.0),
> - libgnutls28-dev,
> - libcairo2-dev (>= 1.2.0)
> +Depends: libcairo2-dev (>= 1.2.0),
> + libgnutls28-dev,
> + libgtk-vnc-1.0-0 (= ${binary:Version}),
> + libgtk2.0-dev (>= 2.0),
> + libgvnc-1.0-dev (= ${binary:Version}),
> + ${misc:Depends}
> Description: VNC viewer widget for GTK+2 (development files)
> It is built using coroutines, allowing it to be completely asynchronous while
> remaining single threaded. It supports RFB protocols 3.3 through 3.8 and the
> @@ -143,7 +139,7 @@ Description: VNC viewer widget for GTK+2 (development files)
> Package: libgtk-vnc-2.0-0
> Architecture: any
> Section: libs
> -Depends: ${shlibs:Depends}, ${misc:Depends}
> +Depends: ${misc:Depends}, ${shlibs:Depends}
> Description: VNC viewer widget for GTK+3 (runtime libraries)
> It is built using coroutines, allowing it to be completely asynchronous while
> remaining single threaded. It supports RFB protocols 3.3 through 3.8 and the
> @@ -158,8 +154,9 @@ Description: VNC viewer widget for GTK+3 (runtime libraries)
> Package: libgtk-vnc-2.0-0-dbg
> Architecture: any
> Section: debug
> -Depends: ${shlibs:Depends}, ${misc:Depends},
> - libgtk-vnc-2.0-0 (=${binary:Version})
> +Depends: libgtk-vnc-2.0-0 (=${binary:Version}),
> + ${misc:Depends},
> + ${shlibs:Depends}
> Priority: extra
> Description: VNC viewer widget for GTK+3 (debugging symbols)
> It is built using coroutines, allowing it to be completely asynchronous while
> @@ -175,13 +172,13 @@ Description: VNC viewer widget for GTK+3 (debugging symbols)
> Package: libgtk-vnc-2.0-dev
> Architecture: any
> Section: libdevel
> -Depends: ${misc:Depends},
> - libgvnc-1.0-dev (= ${binary:Version}),
> - libgtk-vnc-2.0-0 (= ${binary:Version}),
> - gir1.2-gtk-vnc-2.0 (= ${binary:Version}),
> - libgtk-3-dev,
> - libgnutls28-dev,
> - libcairo2-dev (>= 1.2.0)
> +Depends: gir1.2-gtk-vnc-2.0 (= ${binary:Version}),
> + libcairo2-dev (>= 1.2.0),
> + libgnutls28-dev,
> + libgtk-3-dev,
> + libgtk-vnc-2.0-0 (= ${binary:Version}),
> + libgvnc-1.0-dev (= ${binary:Version}),
> + ${misc:Depends}
> Description: VNC viewer widget for GTK+3 (development files)
> It is built using coroutines, allowing it to be completely asynchronous while
> remaining single threaded. It supports RFB protocols 3.3 through 3.8 and the
> @@ -197,9 +194,7 @@ Package: gir1.2-gtk-vnc-2.0
> Section: introspection
> Architecture: any
> Provides: gir1.2-gvnc-1.0
> -Depends: ${gir:Depends},
> - ${shlibs:Depends},
> - ${misc:Depends}
> +Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
> Description: GObject introspection data for GTK-VNC.
> This package contains introspection data for the GTK-VNC library.
> .
> @@ -214,8 +209,10 @@ Description: GObject introspection data for GTK-VNC.
> Package: python-gtk-vnc
> Architecture: any
> Section: python
> -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
> - python-gtk2 (>= 2.0)
> +Depends: python-gtk2 (>= 2.0),
> + ${misc:Depends},
> + ${python:Depends},
> + ${shlibs:Depends}
> Description: VNC viewer widget for GTK+2 (Python binding)
> It is built using coroutines, allowing it to be completely asynchronous while
> remaining single threaded. It supports RFB protocols 3.3 through 3.8 and the
> @@ -230,7 +227,7 @@ Description: VNC viewer widget for GTK+2 (Python binding)
> Package: gvncviewer
> Architecture: any
> Section: x11
> -Depends: ${shlibs:Depends}, ${misc:Depends}
> +Depends: ${misc:Depends}, ${shlibs:Depends}
> Description: VNC viewer using gtk-vnc
> It is built using coroutines, allowing it to be completely asynchronous while
> remaining single threaded. It supports RFB protocols 3.3 through 3.8 and the
> diff --git a/debian/copyright b/debian/copyright
> index fc9bc30..f3f9802 100644
> --- a/debian/copyright
> +++ b/debian/copyright
> @@ -39,28 +39,24 @@ The code of D3DES has the following copyright notice:
> triple-length support removed for use in VNC. Also the bytebit[] array
> has been reversed so that the most significant bit in each byte of the
> key is ignored, not the least significant.
> -
> +
> These changes are:
> Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved.
> -
> +
> This software is distributed in the hope that it will be useful,
> but WITHOUT ANY WARRANTY; without even the implied warranty of
> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> -
> -
> +
> +
> D3DES (V5.09) -
> -
> +
> A portable, public domain, version of the Data Encryption Standard.
> -
> +
> Written with Symantec's THINK (Lightspeed) C by Richard Outerbridge.
> Thanks to: Dan Hoey for his excellent Initial and Inverse permutation
> code; Jim Gillogly & Phil Karn for the DES key schedule code; Dennis
> Ferguson, Eric Young and Dana How for comparing notes; and Ray Lau,
> for humouring me on.
> -
> +
> Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge.
> (GEnie : OUTER; CIS : [71755,204]) Graven Imagery, 1992.
> -
> -
> -
> -
> diff --git a/debian/gvncviewer.install b/debian/gvncviewer.install
> index 8a407cc..9cb5b26 100644
> --- a/debian/gvncviewer.install
> +++ b/debian/gvncviewer.install
> @@ -1,2 +1,2 @@
> -/usr/bin/gvncviewer
> /usr/bin/gvnccapture
> +/usr/bin/gvncviewer
> diff --git a/debian/libgtk-vnc-1.0-dev.install b/debian/libgtk-vnc-1.0-dev.install
> index f665678..656431a 100644
> --- a/debian/libgtk-vnc-1.0-dev.install
> +++ b/debian/libgtk-vnc-1.0-dev.install
> @@ -1,3 +1,3 @@
> -/usr/lib/libgtk-vnc-1.0.so
> /usr/include/gtk-vnc-1.0/
> +/usr/lib/libgtk-vnc-1.0.so
> /usr/lib/pkgconfig/gtk-vnc-1.0.*
> diff --git a/debian/libgtk-vnc-2.0-dev.install b/debian/libgtk-vnc-2.0-dev.install
> index 2452b2a..1d62b05 100644
> --- a/debian/libgtk-vnc-2.0-dev.install
> +++ b/debian/libgtk-vnc-2.0-dev.install
> @@ -1,5 +1,5 @@
> -/usr/lib/libgtk-vnc-2.0.so
> /usr/include/gtk-vnc-2.0/
> +/usr/lib/libgtk-vnc-2.0.so
> /usr/lib/pkgconfig/gtk-vnc-2.0.*
> /usr/share/gir-1.0/GtkVnc-2.0.gir
> /usr/share/vala/vapi/gtk-vnc-2.0.*
> diff --git a/debian/libgvnc-1.0-dev.install b/debian/libgvnc-1.0-dev.install
> index 3430905..c7020cc 100644
> --- a/debian/libgvnc-1.0-dev.install
> +++ b/debian/libgvnc-1.0-dev.install
> @@ -1,11 +1,10 @@
> /usr/include/gvnc-1.0/
> -/usr/lib/pkgconfig/gvnc-1.0.pc
> -/usr/lib/libgvnc-1.0.so
> -/usr/share/gir-1.0/GVnc-1.0.gir
> -/usr/share/vala/vapi/gvnc-1.0.vapi
> -
> /usr/include/gvncpulse-1.0/
> +/usr/lib/libgvnc-1.0.so
> /usr/lib/libgvncpulse-1.0.so
> +/usr/lib/pkgconfig/gvnc-1.0.pc
> /usr/lib/pkgconfig/gvncpulse-1.0.pc
> +/usr/share/gir-1.0/GVnc-1.0.gir
> /usr/share/gir-1.0/GVncPulse-1.0.gir
> +/usr/share/vala/vapi/gvnc-1.0.vapi
> /usr/share/vala/vapi/gvncpulse-1.0.vapi
>
> --
> Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/gtk-vnc.git
>
> _______________________________________________
> Pkg-libvirt-commits mailing list
> Pkg-libvirt-commits at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-libvirt-commits
More information about the Pkg-libvirt-maintainers
mailing list