r42475 - in /desktop/unstable/pango1.0/debian: changelog control control.in pango1.0-tests.install

ah at users.alioth.debian.org ah at users.alioth.debian.org
Thu Sep 4 21:50:09 UTC 2014


Author: ah
Date: Thu Sep  4 21:50:08 2014
New Revision: 42475

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42475
Log:
Run wrap-and-sort

Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/control
    desktop/unstable/pango1.0/debian/control.in
    desktop/unstable/pango1.0/debian/pango1.0-tests.install

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=42475&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog	[utf-8] Thu Sep  4 21:50:08 2014
@@ -5,6 +5,7 @@
     - We rely on gnome-core pulling this in for us in normal operations
       but maybe pango should depend on fonts-cantarell itself to guarantee
       it's actually around?
+  * Run wrap-and-sort
 
  -- Andreas Henriksson <andreas at fatal.se>  Thu, 04 Sep 2014 21:53:41 +0200
 

Modified: desktop/unstable/pango1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control?rev=42475&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control	[utf-8] Thu Sep  4 21:50:08 2014
@@ -2,28 +2,31 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 8.1.3),
+Uploaders: Andreas Henriksson <andreas at fatal.se>,
+           Emilio Pozuelo Monfort <pochu at debian.org>,
+           Iain Lane <laney at debian.org>,
+           Michael Biebl <biebl at debian.org>
+Build-Depends: autotools-dev,
                cdbs (>= 0.4.93),
+               debhelper (>= 8.1.3),
+               dh-autoreconf,
+               fonts-cantarell,
                gnome-pkg-tools (>= 0.11),
-               autotools-dev,
-               dh-autoreconf,
+               gobject-introspection (>= 0.9.12-4~),
                gtk-doc-tools (>= 1.15),
-               perl,
-               fonts-cantarell,
+               libcairo2-dev (>= 1.12.10),
+               libfontconfig1-dev (>= 2.10.91),
                libfreetype6-dev (>= 2.1.7),
+               libgirepository1.0-dev (>= 0.9.5),
+               libglib2.0-dev (>= 2.34.0),
+               libharfbuzz-dev (>= 0.9.9),
+               libthai-dev (>= 0.1.9),
                libx11-dev (>= 2:1.3.3-2),
+               libxft-dev (>= 2.1.14-2),
                libxrender-dev (>= 1:0.9.0.2-2),
                libxt-dev,
-               libglib2.0-dev (>= 2.34.0),
-               pkg-config,
-               libxft-dev (>= 2.1.14-2),
-               libfontconfig1-dev (>= 2.10.91),
-               libcairo2-dev (>= 1.12.10),
-               libthai-dev (>= 0.1.9),
-               libharfbuzz-dev (>= 0.9.9),
-               gobject-introspection (>= 0.9.12-4~),
-               libgirepository1.0-dev (>= 0.9.5)
+               perl,
+               pkg-config
 Build-Depends-Indep: libglib2.0-doc
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/pango1.0
@@ -34,13 +37,13 @@
 Section: oldlibs
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libpango-1.0-0 (= ${binary:Version}),
+Depends: libpango-1.0-0 (= ${binary:Version}),
          libpangocairo-1.0-0 (= ${binary:Version}),
+         libpangoft2-1.0-0 (= ${binary:Version}),
+         libpangox-1.0-0 (>= 0.0.2-2~),
          libpangoxft-1.0-0 (= ${binary:Version}),
-         libpangoft2-1.0-0 (= ${binary:Version}),
-         libpangox-1.0-0 (>= 0.0.2-2~)
+         ${misc:Depends},
+         ${shlibs:Depends}
 Provides: pango1.0-multiarch-modver-1.8.0
 Multi-Arch: same
 Description: Layout and rendering of internationalized text
@@ -61,12 +64,9 @@
 
 Package: libpango-1.0-0
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         fontconfig (>= 2.1.91)
+Depends: fontconfig (>= 2.1.91), ${misc:Depends}, ${shlibs:Depends}
 Replaces: libpango1.0-0 (<< 1.32.5-2)
-Breaks:  libpango1.0-0 (<< 1.32.5-2),
-         plymouth (<< 0.8.3-19)
+Breaks: libpango1.0-0 (<< 1.32.5-2), plymouth (<< 0.8.3-19)
 Provides: pango1.0-multiarch-modver-1.8.0
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -88,8 +88,7 @@
 
 Package: libpangocairo-1.0-0
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libpango1.0-0 (<< 1.32.5-2)
 Replaces: libpango1.0-0 (<< 1.32.5-2)
 Pre-Depends: ${misc:Pre-Depends}
@@ -112,8 +111,7 @@
 
 Package: libpangoxft-1.0-0
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libpango1.0-0 (<< 1.32.5-2)
 Replaces: libpango1.0-0 (<< 1.32.5-2)
 Pre-Depends: ${misc:Pre-Depends}
@@ -136,8 +134,7 @@
 
 Package: libpangoft2-1.0-0
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libpango1.0-0 (<< 1.32.5-2)
 Replaces: libpango1.0-0 (<< 1.32.5-2)
 Pre-Depends: ${misc:Pre-Depends}
@@ -162,8 +159,7 @@
 Package-Type: udeb
 Section: debian-installer
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: pango1.0-multiarch-modver-1.8.0
 Description: Layout and rendering of internationalized text - minimal runtime
  This is a udeb, or a microdeb, for the debian-installer.
@@ -185,27 +181,25 @@
 Package: libpango1.0-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: gir1.2-pango-1.0 (= ${binary:Version}),
+         libcairo2-dev (>= 1.12.10),
+         libfontconfig1-dev (>= 2.10.91),
+         libfreetype6-dev,
+         libglib2.0-dev (>= 2.34.0),
+         libharfbuzz-dev (>= 0.9.9),
          libpango-1.0-0 (= ${binary:Version}),
          libpangocairo-1.0-0 (= ${binary:Version}),
          libpangoft2-1.0-0 (= ${binary:Version}),
          libpangoxft-1.0-0 (= ${binary:Version}),
-         gir1.2-pango-1.0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.34.0),
-         libfreetype6-dev,
          libx11-dev,
+         libxft-dev,
          libxrender-dev,
          pkg-config,
-         libxft-dev,
-         libfontconfig1-dev (>= 2.10.91),
-         libharfbuzz-dev (>= 0.9.9),
-         libcairo2-dev (>= 1.12.10)
-Suggests: libpango1.0-doc,
-          imagemagick
+         ${misc:Depends},
+         ${shlibs:Depends}
+Suggests: imagemagick, libpango1.0-doc
 Recommends: debhelper
-Replaces: gir-repository-dev,
-          gobject-introspection-repository
+Replaces: gir-repository-dev, gobject-introspection-repository
 Description: Development files for the Pango
  Pango is a library for layout and rendering of text, with an emphasis
  on internationalization. Pango can be used anywhere that text layout is
@@ -227,11 +221,8 @@
 Section: debug
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends},
-         libpango-1.0-0 (= ${binary:Version}) |
-         libpangocairo-1.0-0 (= ${binary:Version}) |
-         libpangoft2-1.0-0 (= ${binary:Version}) |
-         libpangoxft-1.0-0 (= ${binary:Version})
+Depends: libpango-1.0-0 (= ${binary:Version}) | libpangocairo-1.0-0 (= ${binary:Version}) | libpangoft2-1.0-0 (= ${binary:Version}) | libpangoxft-1.0-0 (= ${binary:Version}),
+         ${misc:Depends}
 Description: Pango library and debugging symbols
  Pango is a library for layout and rendering of text, with an emphasis
  on internationalization. Pango can be used anywhere that text layout is
@@ -252,8 +243,7 @@
 Package: libpango1.0-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends},
-         lynx | www-browser
+Depends: lynx | www-browser, ${misc:Depends}
 Recommends: libglib2.0-doc
 Multi-Arch: foreign
 Description: Documentation files for the Pango
@@ -276,9 +266,7 @@
 Package: gir1.2-pango-1.0
 Section: introspection
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         ${gir:Depends}
+Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Replaces: gir1.0-gtk-2.0 (<< 2.22),
           gir1.0-pango-1.0,
           gobject-introspection-repository
@@ -302,8 +290,7 @@
 
 Package: pango1.0-tests
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: Layout and rendering of internationalized text - installed tests
  Pango is a library for layout and rendering of text, with an emphasis
@@ -321,4 +308,3 @@
  .
  This package contains test programs, designed to be run as part of a
  regression testsuite.
-

Modified: desktop/unstable/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control.in?rev=42475&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control.in	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control.in	[utf-8] Thu Sep  4 21:50:08 2014
@@ -3,27 +3,27 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8.1.3),
+Build-Depends: autotools-dev,
                cdbs (>= 0.4.93),
+               debhelper (>= 8.1.3),
+               dh-autoreconf,
+               fonts-cantarell,
                gnome-pkg-tools (>= 0.11),
-               autotools-dev,
-               dh-autoreconf,
+               gobject-introspection (>= 0.9.12-4~),
                gtk-doc-tools (>= 1.15),
-               perl,
-               fonts-cantarell,
+               libcairo2-dev (>= 1.12.10),
+               libfontconfig1-dev (>= 2.10.91),
                libfreetype6-dev (>= 2.1.7),
+               libgirepository1.0-dev (>= 0.9.5),
+               libglib2.0-dev (>= 2.34.0),
+               libharfbuzz-dev (>= 0.9.9),
+               libthai-dev (>= 0.1.9),
                libx11-dev (>= 2:1.3.3-2),
+               libxft-dev (>= 2.1.14-2),
                libxrender-dev (>= 1:0.9.0.2-2),
                libxt-dev,
-               libglib2.0-dev (>= 2.34.0),
-               pkg-config,
-               libxft-dev (>= 2.1.14-2),
-               libfontconfig1-dev (>= 2.10.91),
-               libcairo2-dev (>= 1.12.10),
-               libthai-dev (>= 0.1.9),
-               libharfbuzz-dev (>= 0.9.9),
-               gobject-introspection (>= 0.9.12-4~),
-               libgirepository1.0-dev (>= 0.9.5)
+               perl,
+               pkg-config
 Build-Depends-Indep: libglib2.0-doc
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/pango1.0
@@ -34,13 +34,13 @@
 Section: oldlibs
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libpango-1.0-0 (= ${binary:Version}),
+Depends: libpango-1.0-0 (= ${binary:Version}),
          libpangocairo-1.0-0 (= ${binary:Version}),
+         libpangoft2-1.0-0 (= ${binary:Version}),
+         libpangox-1.0-0 (>= 0.0.2-2~),
          libpangoxft-1.0-0 (= ${binary:Version}),
-         libpangoft2-1.0-0 (= ${binary:Version}),
-         libpangox-1.0-0 (>= 0.0.2-2~)
+         ${misc:Depends},
+         ${shlibs:Depends}
 Provides: @PANGO_MODVER_DEP@
 Multi-Arch: same
 Description: Layout and rendering of internationalized text
@@ -61,12 +61,9 @@
 
 Package: libpango-1.0- at SONAME@
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         fontconfig (>= 2.1.91)
+Depends: fontconfig (>= 2.1.91), ${misc:Depends}, ${shlibs:Depends}
 Replaces: libpango1.0-0 (<< 1.32.5-2)
-Breaks:  libpango1.0-0 (<< 1.32.5-2),
-         plymouth (<< 0.8.3-19)
+Breaks: libpango1.0-0 (<< 1.32.5-2), plymouth (<< 0.8.3-19)
 Provides: @PANGO_MODVER_DEP@
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -88,8 +85,7 @@
 
 Package: libpangocairo-1.0- at SONAME@
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libpango1.0-0 (<< 1.32.5-2)
 Replaces: libpango1.0-0 (<< 1.32.5-2)
 Pre-Depends: ${misc:Pre-Depends}
@@ -112,8 +108,7 @@
 
 Package: libpangoxft-1.0- at SONAME@
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libpango1.0-0 (<< 1.32.5-2)
 Replaces: libpango1.0-0 (<< 1.32.5-2)
 Pre-Depends: ${misc:Pre-Depends}
@@ -136,8 +131,7 @@
 
 Package: libpangoft2-1.0- at SONAME@
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libpango1.0-0 (<< 1.32.5-2)
 Replaces: libpango1.0-0 (<< 1.32.5-2)
 Pre-Depends: ${misc:Pre-Depends}
@@ -162,8 +156,7 @@
 Package-Type: udeb
 Section: debian-installer
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: @PANGO_MODVER_DEP@
 Description: Layout and rendering of internationalized text - minimal runtime
  This is a udeb, or a microdeb, for the debian-installer.
@@ -185,27 +178,25 @@
 Package: libpango1.0-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: gir1.2-pango-1.0 (= ${binary:Version}),
+         libcairo2-dev (>= 1.12.10),
+         libfontconfig1-dev (>= 2.10.91),
+         libfreetype6-dev,
+         libglib2.0-dev (>= 2.34.0),
+         libharfbuzz-dev (>= 0.9.9),
          libpango-1.0- at SONAME@ (= ${binary:Version}),
          libpangocairo-1.0- at SONAME@ (= ${binary:Version}),
          libpangoft2-1.0- at SONAME@ (= ${binary:Version}),
          libpangoxft-1.0- at SONAME@ (= ${binary:Version}),
-         gir1.2-pango-1.0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.34.0),
-         libfreetype6-dev,
          libx11-dev,
+         libxft-dev,
          libxrender-dev,
          pkg-config,
-         libxft-dev,
-         libfontconfig1-dev (>= 2.10.91),
-         libharfbuzz-dev (>= 0.9.9),
-         libcairo2-dev (>= 1.12.10)
-Suggests: libpango1.0-doc,
-          imagemagick
+         ${misc:Depends},
+         ${shlibs:Depends}
+Suggests: imagemagick, libpango1.0-doc
 Recommends: debhelper
-Replaces: gir-repository-dev,
-          gobject-introspection-repository
+Replaces: gir-repository-dev, gobject-introspection-repository
 Description: Development files for the Pango
  Pango is a library for layout and rendering of text, with an emphasis
  on internationalization. Pango can be used anywhere that text layout is
@@ -227,11 +218,8 @@
 Section: debug
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends},
-         libpango-1.0- at SONAME@ (= ${binary:Version}) |
-         libpangocairo-1.0- at SONAME@ (= ${binary:Version}) |
-         libpangoft2-1.0- at SONAME@ (= ${binary:Version}) |
-         libpangoxft-1.0- at SONAME@ (= ${binary:Version})
+Depends: libpango-1.0- at SONAME@ (= ${binary:Version}) | libpangocairo-1.0- at SONAME@ (= ${binary:Version}) | libpangoft2-1.0- at SONAME@ (= ${binary:Version}) | libpangoxft-1.0- at SONAME@ (= ${binary:Version}),
+         ${misc:Depends}
 Description: Pango library and debugging symbols
  Pango is a library for layout and rendering of text, with an emphasis
  on internationalization. Pango can be used anywhere that text layout is
@@ -252,8 +240,7 @@
 Package: libpango1.0-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends},
-         lynx | www-browser
+Depends: lynx | www-browser, ${misc:Depends}
 Recommends: libglib2.0-doc
 Multi-Arch: foreign
 Description: Documentation files for the Pango
@@ -276,9 +263,7 @@
 Package: gir1.2-pango-1.0
 Section: introspection
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         ${gir:Depends}
+Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Replaces: gir1.0-gtk-2.0 (<< 2.22),
           gir1.0-pango-1.0,
           gobject-introspection-repository
@@ -302,8 +287,7 @@
 
 Package: pango1.0-tests
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: Layout and rendering of internationalized text - installed tests
  Pango is a library for layout and rendering of text, with an emphasis
@@ -321,4 +305,3 @@
  .
  This package contains test programs, designed to be run as part of a
  regression testsuite.
-

Modified: desktop/unstable/pango1.0/debian/pango1.0-tests.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/pango1.0-tests.install?rev=42475&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/pango1.0-tests.install	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/pango1.0-tests.install	[utf-8] Thu Sep  4 21:50:08 2014
@@ -1,2 +1,2 @@
+usr/lib/pango1.0/installed-tests
 usr/share/installed-tests
-usr/lib/pango1.0/installed-tests




More information about the pkg-gnome-commits mailing list