r26531 - /desktop/experimental/gtk+3.0/debian/

robert_ancell-guest at users.alioth.debian.org robert_ancell-guest at users.alioth.debian.org
Tue Feb 15 01:30:15 UTC 2011


Author: robert_ancell-guest
Date: Tue Feb 15 01:30:13 2011
New Revision: 26531

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26531
Log:
* Rename binary packages to new so naming
* debian/libgail-3-0.symbols:
* debian/libgtk-3-0.symbols:

Added:
    desktop/experimental/gtk+3.0/debian/gir1.2-gtk-3.0.install.in
    desktop/experimental/gtk+3.0/debian/gtk-3-examples.examples
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/gtk3.0-examples.examples
    desktop/experimental/gtk+3.0/debian/gtk-3-examples.install.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/gtk3.0-examples.install.in
    desktop/experimental/gtk+3.0/debian/libgail-3-0-dbg.dirs
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgail3.0-0-dbg.dirs
    desktop/experimental/gtk+3.0/debian/libgail-3-0.install
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgail3.0-0.install
    desktop/experimental/gtk+3.0/debian/libgail-3-0.opt
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgail3.0-0.opt
    desktop/experimental/gtk+3.0/debian/libgail-3-0.symbols
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgail3.0-0.symbols
    desktop/experimental/gtk+3.0/debian/libgail-3-common.install.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgail3.0-common.install.in
    desktop/experimental/gtk+3.0/debian/libgail-3-dev.install
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgail3.0-dev.install
    desktop/experimental/gtk+3.0/debian/libgail-3-doc.doc-base.gail-reference
      - copied, changed from r26530, desktop/experimental/gtk+3.0/debian/libgail3.0-doc.doc-base.gail-reference
    desktop/experimental/gtk+3.0/debian/libgail-3-doc.install
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgail3.0-doc.install
    desktop/experimental/gtk+3.0/debian/libgail-3-doc.links
      - copied, changed from r26530, desktop/experimental/gtk+3.0/debian/libgail3.0-doc.links
    desktop/experimental/gtk+3.0/debian/libgtk-3-0-dbg.links.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-0-dbg.links.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-0-udeb.install.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-0-udeb.install.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-0.install.in
      - copied, changed from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-0.install.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-0.install.opt
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-0.install.opt
    desktop/experimental/gtk+3.0/debian/libgtk-3-0.links.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-0.links.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-0.postinst.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postinst.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-0.postrm.in
      - copied, changed from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postrm.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-0.symbols
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-0.symbols
    desktop/experimental/gtk+3.0/debian/libgtk-3-0.triggers.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-0.triggers.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install.in
      - copied, changed from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.install.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-bin.links.in
      - copied, changed from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.links.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-bin.manpages
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.manpages
    desktop/experimental/gtk+3.0/debian/libgtk-3-bin.postrm
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.postrm
    desktop/experimental/gtk+3.0/debian/libgtk-3-bin.preinst
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.preinst
    desktop/experimental/gtk+3.0/debian/libgtk-3-common.install
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-common.install
    desktop/experimental/gtk+3.0/debian/libgtk-3-common.preinst.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-common.preinst.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-dev.install.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-dev.install.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-dev.links.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-dev.links.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-doc.doc-base.gdk.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.doc-base.gdk.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-doc.doc-base.gtk.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.doc-base.gtk.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-doc.install.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.install.in
    desktop/experimental/gtk+3.0/debian/libgtk-3-doc.links.in
      - copied unchanged from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.links.in
Removed:
    desktop/experimental/gtk+3.0/debian/gtk3.0-examples.examples
    desktop/experimental/gtk+3.0/debian/gtk3.0-examples.install.in
    desktop/experimental/gtk+3.0/debian/libgail3.0-0-dbg.dirs
    desktop/experimental/gtk+3.0/debian/libgail3.0-0.install
    desktop/experimental/gtk+3.0/debian/libgail3.0-0.opt
    desktop/experimental/gtk+3.0/debian/libgail3.0-0.symbols
    desktop/experimental/gtk+3.0/debian/libgail3.0-common.install.in
    desktop/experimental/gtk+3.0/debian/libgail3.0-dev.install
    desktop/experimental/gtk+3.0/debian/libgail3.0-doc.doc-base.gail-reference
    desktop/experimental/gtk+3.0/debian/libgail3.0-doc.install
    desktop/experimental/gtk+3.0/debian/libgail3.0-doc.links
    desktop/experimental/gtk+3.0/debian/libgtk3.0-0-dbg.links.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-0-udeb.install.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-0.install.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-0.install.opt
    desktop/experimental/gtk+3.0/debian/libgtk3.0-0.links.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postinst.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postrm.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-0.symbols
    desktop/experimental/gtk+3.0/debian/libgtk3.0-0.triggers.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.install.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.links.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.manpages
    desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.postrm
    desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.preinst
    desktop/experimental/gtk+3.0/debian/libgtk3.0-common.install
    desktop/experimental/gtk+3.0/debian/libgtk3.0-common.preinst.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-dev.install.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-dev.links.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.doc-base.gdk.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.doc-base.gtk.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.install.in
    desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.links.in
Modified:
    desktop/experimental/gtk+3.0/debian/changelog
    desktop/experimental/gtk+3.0/debian/control
    desktop/experimental/gtk+3.0/debian/control.in
    desktop/experimental/gtk+3.0/debian/rules

Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=26531&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Tue Feb 15 01:30:13 2011
@@ -1,17 +1,18 @@
 gtk+3.0 (3.0.0-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Rename binary packages to new so naming
   * debian/control:
     - Bump build-depends on libglib2.0-dev, libgdk-pixbuf2.0-dev, libatk1.0-dev,
       gobject-introspection
-  * debian/libgail3.0-0.symbols:
-  * debian/libgtk3.0-0.symbols:
+  * debian/libgail-3-0.symbols:
+  * debian/libgtk-3-0.symbols:
     - Updated
     - Mark symbols with stable version number
   * debian/rules:
     - Bump SHVER
 
- -- Robert Ancell <robert.ancell at canonical.com>  Mon, 14 Feb 2011 09:56:54 +1100
+ -- Robert Ancell <robert.ancell at canonical.com>  Tue, 15 Feb 2011 12:28:34 +1100
 
 gtk+3.0 (2.99.3-1) UNRELEASED; urgency=low
 

Modified: desktop/experimental/gtk+3.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/control?rev=26531&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control [utf-8] Tue Feb 15 01:30:13 2011
@@ -53,17 +53,19 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk+3.0/
 Homepage: http://www.gtk.org/
 
-Package: libgtk3.0-0
-Architecture: any
-Depends: libgtk3.0-common,
+Package: libgtk-3-0
+Architecture: any
+Depends: libgtk-3-common,
          ${misc:Depends},
          ${shlibs:Depends},
          shared-mime-info
 Provides: gtk3.0-binver-3.0.0
 Recommends: hicolor-icon-theme,
-            libgtk3.0-bin
+            libgtk-3-bin
 Suggests: librsvg2-common,
           gvfs
+Conflicts: libgtk3.0-0
+Replaces: libgtk3.0-0
 Description: The GTK+ graphical user interface library
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -72,7 +74,7 @@
  .
  This package contains the shared libraries.
 
-Package: libgtk3.0-0-udeb
+Package: libgtk-3-0-udeb
 XC-Package-Type: udeb
 Section: debian-installer
 Priority: extra
@@ -80,6 +82,8 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Provides: gtk3.0-binver-3.0.0
+Conflicts: libgtk3.0-0-udeb
+Replaces: libgtk3.0-0-udeb
 Description: The GTK+ graphical user interface library - minimal runtime
  This is a udeb, or a microdeb, for the debian-installer.
  .
@@ -91,11 +95,13 @@
  This package contains the minimal runtime library using X11 needed
  by the Debian installer.
 
-Package: libgtk3.0-common
+Package: libgtk-3-common
 Section: misc
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: libgtk3.0-0
+Recommends: libgtk-3-0
+Conflicts: libgtk3.0-common
+Replaces: libgtk3.0-common
 Description: Common files for the GTK+ graphical user interface library
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -104,12 +110,14 @@
  .
  This package contains the common files which the libraries need.
 
-Package: libgtk3.0-bin
+Package: libgtk-3-bin
 Section: misc
 Architecture: all
 Depends: ${misc:Depends},
-         libgtk3.0-0 (>= ${source:Version}),
-         libgtk3.0-common
+         libgtk-3-0 (>= ${source:Version}),
+         libgtk-3-common
+Conflicts: libgtk3.0-bin
+Replaces: libgtk3.0-bin
 Description: The programs for the GTK+ graphical user interface library
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -119,11 +127,11 @@
  This package contains the program files which is used for the libraries
  and others.
 
-Package: libgtk3.0-dev
+Package: libgtk-3-dev
 Section: libdevel
 Architecture: any
-Depends: libgtk3.0-0 (= ${binary:Version}),
-         libgtk3.0-common,
+Depends: libgtk-3-0 (= ${binary:Version}),
+         libgtk-3-common,
          ${misc:Depends},
          ${shlibs:Depends},
          libglib2.0-dev (>= 2.28.0),
@@ -144,7 +152,9 @@
          libxml2-utils
 Recommends: python (>= 2.4),
             debhelper
-Suggests: libgtk3.0-doc
+Suggests: libgtk-3-doc
+Conflicts: libgtk3.0-dev
+Replaces: libgtk3.0-dev
 Description: Development files for the GTK+ library
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -154,13 +164,15 @@
  This package contains the header files and static libraries which is
  needed for developing the GTK+ applications.
 
-Package: libgtk3.0-0-dbg
+Package: libgtk-3-0-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libgtk3.0-0 (= ${binary:Version}),
-         libgtk3.0-common,
+Depends: libgtk-3-0 (= ${binary:Version}),
+         libgtk-3-common,
          ${misc:Depends}
+Conflicts: libgtk3.0-0-dbg
+Replaces: libgtk3.0-0-dbg
 Description: The GTK+ libraries and debugging symbols
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -171,7 +183,7 @@
  .
  Most people will not need this package.
 
-Package: libgtk3.0-doc
+Package: libgtk-3-doc
 Section: doc
 Architecture: all
 Depends: lynx | www-browser,
@@ -179,6 +191,8 @@
 Recommends: libglib2.0-doc,
             libatk1.0-doc,
             libpango1.0-doc
+Conflicts: libgtk3.0-doc
+Replaces: libgtk3.0-doc
 Description: Documentation for the GTK+ graphical user interface library
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -186,31 +200,33 @@
  suites.
  .
  This package contains the HTML documentation for the GTK+ library
- in /usr/share/doc/libgtk3.0-doc/ .
-
-Package: gtk3.0-examples
+ in /usr/share/doc/libgtk-3-doc/ .
+
+Package: gtk-3-examples
 Section: x11
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgtk3.0-0 (= ${binary:Version})
-Description: Examples files for the GTK+ 3.0
+         libgtk-3-0 (= ${binary:Version})
+Conflicts: gtk-3.0-examples
+Replaces: gtk-3.0-examples
+Description: Examples files for GTK+ 3
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
  This package contains the examples files and a demonstration program
- for the GTK+-3.0.
+ for GTK+3.
 
 #Package: gtk3-engines-pixbuf
 #Section: graphics
 #Architecture: any
 #Depends: ${misc:Depends},
 #         ${shlibs:Depends},
-#         libgtk3.0-0 (= ${binary:Version}),
-#         libgtk3.0-common
+#         libgtk-3-0 (= ${binary:Version}),
+#         libgtk-3-common
 #Description: Pixbuf-based theme for GTK+ 3.x
 # The GTK+ is a multi-platform toolkit for creating graphical user
 # interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -221,7 +237,7 @@
 
 Package: gir1.2-gtk-3.0
 Architecture: any
-Depends: libgtk3.0-common,
+Depends: libgtk-3-common,
          ${misc:Depends},
          ${shlibs:Depends},
          ${gir:Depends}
@@ -236,11 +252,13 @@
  This package can be used by other packages using the GIRepository format to
  generate dynamic bindings.
 
-Package: libgail3.0-0
+Package: libgail-3-0
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libgtk3.0-0 (= ${binary:Version})
+         libgtk-3-0 (= ${binary:Version})
+Conflicts: libgail3.0-0
+Replaces: libgail3.0-0
 Description: GNOME Accessibility Implementation Library -- shared libraries
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
  loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -249,11 +267,13 @@
  .
  This package contains the shared library.
 
-Package: libgail3.0-common
+Package: libgail-3-common
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libgail3.0-0 (= ${binary:Version})
+         libgail-3-0 (= ${binary:Version})
+Conflicts: libgail3.0-common
+Replaces: libgail3.0-common
 Description: GNOME Accessibility Implementation Library -- common modules
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
  loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -262,16 +282,18 @@
  .
  This package contains core shared libraries.
 
-Package: libgail3.0-dev
+Package: libgail-3-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libgail3.0-0 (= ${binary:Version}),
-         libgail3.0-common (= ${binary:Version}),
-         libgtk3.0-dev (= ${binary:Version}),
+         libgail-3-0 (= ${binary:Version}),
+         libgail-3-common (= ${binary:Version}),
+         libgtk-3-dev (= ${binary:Version}),
          pkg-config,
          libatk1.0-dev (>= 1.13.0)
-Suggests: libgail3.0-doc
+Suggests: libgail-3-doc
+Conflicts: libgail3.0-dev
+Replaces: libgail3.0-dev
 Description: GNOME Accessibility Implementation Library -- development files
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
  loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -280,12 +302,14 @@
  .
  This package contains the development files for Gail.
 
-Package: libgail3.0-0-dbg
+Package: libgail-3-0-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${misc:Depends}, libgail3.0-0 (= ${binary:Version})
-Recommends: libgtk3.0-0-dbg
+Depends: ${misc:Depends}, libgail-3-0 (= ${binary:Version})
+Recommends: libgtk-3-0-dbg
+Conflicts: libgail3.0-0-dbg
+Replaces: libgail3.0-0-dbg
 Description: Gail libraries and debugging symbols
  Gail is the "GNOME Accessibility Implementation Library".
  .
@@ -293,10 +317,12 @@
  .
  Most people will not need this package.
 
-Package: libgail3.0-doc
+Package: libgail-3-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}, lynx | www-browser
+Conflicts: libgail3.0-doc
+Replaces: libgail3.0-doc
 Description: documentation files of the Gail library
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
  loadable at runtime by a GTK+ application. Once loaded, those parts of

Modified: desktop/experimental/gtk+3.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/control.in?rev=26531&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control.in [utf-8] Tue Feb 15 01:30:13 2011
@@ -1,4 +1,4 @@
-Source: gtk+ at APIVER@
+Source: gtk+3.0
 Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
@@ -64,6 +64,8 @@
             @BIN_PKG@
 Suggests: librsvg2-common,
           gvfs
+Conflicts: libgtk3.0-0
+Replaces: libgtk3.0-0
 Description: The GTK+ graphical user interface library
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -80,6 +82,8 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Provides: @GTK_BINVER_DEP@
+Conflicts: libgtk3.0-0-udeb
+Replaces: libgtk3.0-0-udeb
 Description: The GTK+ graphical user interface library - minimal runtime
  This is a udeb, or a microdeb, for the debian-installer.
  .
@@ -96,6 +100,8 @@
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: @SHARED_PKG@
+Conflicts: libgtk3.0-common
+Replaces: libgtk3.0-common
 Description: Common files for the GTK+ graphical user interface library
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -110,6 +116,8 @@
 Depends: ${misc:Depends},
          @SHARED_PKG@ (>= ${source:Version}),
          @COMMON_PKG@
+Conflicts: libgtk3.0-bin
+Replaces: libgtk3.0-bin
 Description: The programs for the GTK+ graphical user interface library
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -145,6 +153,8 @@
 Recommends: python (>= 2.4),
             debhelper
 Suggests: @DOC_PKG@
+Conflicts: libgtk3.0-dev
+Replaces: libgtk3.0-dev
 Description: Development files for the GTK+ library
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -161,6 +171,8 @@
 Depends: @SHARED_PKG@ (= ${binary:Version}),
          @COMMON_PKG@,
          ${misc:Depends}
+Conflicts: libgtk3.0-0-dbg
+Replaces: libgtk3.0-0-dbg
 Description: The GTK+ libraries and debugging symbols
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -179,6 +191,8 @@
 Recommends: libglib2.0-doc,
             libatk1.0-doc,
             libpango1.0-doc
+Conflicts: libgtk3.0-doc
+Replaces: libgtk3.0-doc
 Description: Documentation for the GTK+ graphical user interface library
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -195,14 +209,16 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          @SHARED_PKG@ (= ${binary:Version})
-Description: Examples files for the GTK+ 3.0
+Conflicts: gtk-3.0-examples
+Replaces: gtk-3.0-examples
+Description: Examples files for GTK+ 3
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
  for projects ranging from small one-off tools to complete application
  suites.
  .
  This package contains the examples files and a demonstration program
- for the GTK+-3.0.
+ for GTK+3.
 
 #Package: @PIXBUF_PKG@
 #Section: graphics
@@ -236,11 +252,13 @@
  This package can be used by other packages using the GIRepository format to
  generate dynamic bindings.
 
-Package: libgail3.0-0
+Package: libgail-3-0
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          @SHARED_PKG@ (= ${binary:Version})
+Conflicts: libgail3.0-0
+Replaces: libgail3.0-0
 Description: GNOME Accessibility Implementation Library -- shared libraries
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
  loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -249,11 +267,13 @@
  .
  This package contains the shared library.
 
-Package: libgail3.0-common
+Package: libgail-3-common
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libgail3.0-0 (= ${binary:Version})
+         libgail-3-0 (= ${binary:Version})
+Conflicts: libgail3.0-common
+Replaces: libgail3.0-common
 Description: GNOME Accessibility Implementation Library -- common modules
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
  loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -262,16 +282,18 @@
  .
  This package contains core shared libraries.
 
-Package: libgail3.0-dev
+Package: libgail-3-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libgail3.0-0 (= ${binary:Version}),
-         libgail3.0-common (= ${binary:Version}),
+         libgail-3-0 (= ${binary:Version}),
+         libgail-3-common (= ${binary:Version}),
          @DEV_PKG@ (= ${binary:Version}),
          pkg-config,
          libatk1.0-dev (>= 1.13.0)
-Suggests: libgail3.0-doc
+Suggests: libgail-3-doc
+Conflicts: libgail3.0-dev
+Replaces: libgail3.0-dev
 Description: GNOME Accessibility Implementation Library -- development files
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
  loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -280,12 +302,14 @@
  .
  This package contains the development files for Gail.
 
-Package: libgail3.0-0-dbg
+Package: libgail-3-0-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${misc:Depends}, libgail3.0-0 (= ${binary:Version})
+Depends: ${misc:Depends}, libgail-3-0 (= ${binary:Version})
 Recommends: @DEBUG_PKG@
+Conflicts: libgail3.0-0-dbg
+Replaces: libgail3.0-0-dbg
 Description: Gail libraries and debugging symbols
  Gail is the "GNOME Accessibility Implementation Library".
  .
@@ -293,10 +317,12 @@
  .
  Most people will not need this package.
 
-Package: libgail3.0-doc
+Package: libgail-3-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}, lynx | www-browser
+Conflicts: libgail3.0-doc
+Replaces: libgail3.0-doc
 Description: documentation files of the Gail library
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
  loadable at runtime by a GTK+ application. Once loaded, those parts of

Added: desktop/experimental/gtk+3.0/debian/gir1.2-gtk-3.0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/gir1.2-gtk-3.0.install.in?rev=26531&op=file
==============================================================================
--- desktop/experimental/gtk+3.0/debian/gir1.2-gtk-3.0.install.in (added)
+++ desktop/experimental/gtk+3.0/debian/gir1.2-gtk-3.0.install.in [utf-8] Tue Feb 15 01:30:13 2011
@@ -1,0 +1,1 @@
+debian/install/shared/usr/lib/girepository-1.0/ usr/lib/

Copied: desktop/experimental/gtk+3.0/debian/libgail-3-doc.doc-base.gail-reference (from r26530, desktop/experimental/gtk+3.0/debian/libgail3.0-doc.doc-base.gail-reference)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgail-3-doc.doc-base.gail-reference?rev=26531&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgail3.0-doc.doc-base.gail-reference [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgail-3-doc.doc-base.gail-reference [utf-8] Tue Feb 15 01:30:13 2011
@@ -1,4 +1,4 @@
-Document: gail-reference-3.0
+Document: gail-reference-3
 Title: Gail Reference Manual
 Author: Padraig O'Briain <padraig.obriain at sun.com>
 Abstract: This manual describes APIs for libgail-util

Copied: desktop/experimental/gtk+3.0/debian/libgail-3-doc.links (from r26530, desktop/experimental/gtk+3.0/debian/libgail3.0-doc.links)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgail-3-doc.links?rev=26531&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgail3.0-doc.links [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgail-3-doc.links [utf-8] Tue Feb 15 01:30:13 2011
@@ -1,1 +1,1 @@
-/usr/share/gtk-doc/html/gail-libgail-util-3.0 /usr/share/doc/libgail3.0-doc/html
+/usr/share/gtk-doc/html/gail-libgail-util3 /usr/share/doc/libgail-3-doc/html

Copied: desktop/experimental/gtk+3.0/debian/libgtk-3-0.install.in (from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-0.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-0.install.in?rev=26531&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-0.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-0.install.in [utf-8] Tue Feb 15 01:30:13 2011
@@ -1,5 +1,5 @@
 # from the shared flavor
-debian/install/shared/etc/gtk- at APIVER@/im-multipress.conf etc/gtk- at APIVER@
+debian/install/shared/@CONFDIR@/im-multipress.conf @CONFDIR@
 debian/install/shared/usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@
 debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@
 debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules

Copied: desktop/experimental/gtk+3.0/debian/libgtk-3-0.postrm.in (from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postrm.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-0.postrm.in?rev=26531&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postrm.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-0.postrm.in [utf-8] Tue Feb 15 01:30:13 2011
@@ -4,7 +4,7 @@
 
 case "$1" in
   purge)
-    rm -rf /etc/gtk- at APIVER@
+    rm -rf /@CONFDIR@
   ;;
 esac
 

Copied: desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install.in (from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.install.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-bin.install.in?rev=26531&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install.in [utf-8] Tue Feb 15 01:30:13 2011
@@ -1,4 +1,4 @@
 # from the shared flavor
 docs/reference/gtk/gtk-update-icon-cache.1 usr/share/man/man1
-docs/reference/gtk/gtk-query-immodules- at APIVER@.1 usr/share/man/man1
+docs/reference/gtk/gtk-query-immodules-3.0.1 usr/share/man/man1
 debian/update-icon-caches usr/sbin

Copied: desktop/experimental/gtk+3.0/debian/libgtk-3-bin.links.in (from r26530, desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.links.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-bin.links.in?rev=26531&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.links.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-bin.links.in [utf-8] Tue Feb 15 01:30:13 2011
@@ -1,5 +1,5 @@
- at LIBDIR@/@SHARED_PKG@/gtk-query-immodules- at APIVER@ usr/bin/gtk-query-immodules- at APIVER@
- at LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache- at APIVER@ usr/bin/gtk-update-icon-cache- at APIVER@
+ at LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 usr/bin/gtk-query-immodules-3.0
+ at LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache-3.0 usr/bin/gtk-update-icon-cache-3.0
 usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@BIN_PKG@/changelog.gz
 usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@BIN_PKG@/NEWS.gz
 usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@BIN_PKG@/README.gz

Modified: desktop/experimental/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/rules?rev=26531&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/rules [utf-8] Tue Feb 15 01:30:13 2011
@@ -23,7 +23,7 @@
 # Make the linker work a bit harder so dynamic loading can be done faster
 LDFLAGS += -Wl,-O1
 
-APIVER := 3.0
+APIVER := 3
 SONAME := 0
 SHVER := 3.0.0
 
@@ -39,18 +39,21 @@
 # Gtk binary version virtual Provide
 GTK_BINVER_DEP := gtk$(APIVER)-binver-$(GTK_BINARY_VERSION)
 
+# relative base directory for configuration
+CONFDIR := etc/gtk-3.0
+
 # relative base directory for all types of modules
-MODULES_BASE_PATH := $(LIBDIR)/gtk-$(APIVER)/$(GTK_BINARY_VERSION)
+MODULES_BASE_PATH := $(LIBDIR)/gtk-3.0/$(GTK_BINARY_VERSION)
 
 # package names
-SHARED_PKG := libgtk$(APIVER)-$(SONAME)
-COMMON_PKG := libgtk$(APIVER)-common
-DEV_PKG := libgtk$(APIVER)-dev
+SHARED_PKG := libgtk-$(APIVER)-$(SONAME)
+COMMON_PKG := libgtk-$(APIVER)-common
+DEV_PKG := libgtk-$(APIVER)-dev
 UDEB_PKG := $(SHARED_PKG)-udeb
-DOC_PKG := libgtk$(APIVER)-doc
-BIN_PKG := libgtk$(APIVER)-bin
+DOC_PKG := libgtk-$(APIVER)-doc
+BIN_PKG := libgtk-$(APIVER)-bin
 DEBUG_PKG := $(SHARED_PKG)-dbg
-EXAMPLES_PKG := gtk$(APIVER)-examples
+EXAMPLES_PKG := gtk-$(APIVER)-examples
 PIXBUF_PKG := gtk3-engines-pixbuf
 
 
@@ -86,9 +89,9 @@
 DEB_INSTALL_DOCS_$(DOC_PKG) += -X.in
 DEB_DH_MAKESHLIBS_ARGS_ALL += -X$(MODULES_BASE_PATH)
 DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V --add-udeb=$(UDEB_PKG) -- -c4
-DEB_DH_MAKESHLIBS_ARGS_libgail3.0-0 += -V"libgail3.0-0 (>= $(SHVER)), libgail3.0-common (>= $(SHVER))" -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libgail-3-0 += -V"libgail-3-0 (>= $(SHVER)), libgail-3-common (>= $(SHVER))" -- -c4
 DEB_DH_FIXPERMS_ARGS_ALL += -X$(LIBDIR)/$(SHARED_PKG)
-DEB_DH_STRIP_ARGS = --dbg-package=$(if $(findstring libgail,$(cdbs_curpkg)),libgail3.0-0-dbg,$(DEBUG_PKG))
+DEB_DH_STRIP_ARGS = --dbg-package=$(if $(findstring libgail,$(cdbs_curpkg)),libgail-3-0-dbg,$(DEBUG_PKG))
 DEB_DH_STRIP_ARGS_$(UDEB_PKG) = --dbg-package=
 
 # macro computing the list of 'debian/<pkg>.*" files which have a
@@ -131,12 +134,12 @@
 binary-install/$(SHARED_PKG)::
 	# Install the binaries with a -3.0 suffix
 	mv debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/gtk-update-icon-cache \
-	   debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/gtk-update-icon-cache-$(APIVER)
+	   debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/gtk-update-icon-cache-3.0
 
 binary-install/$(BIN_PKG)::
 	# Install the binaries with a -3.0 suffix
 	mv debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache.1 \
-	   debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache-$(APIVER).1
+	   debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache-3.0.1
 
 binary-install/$(UDEB_PKG)::
 	# generate a minimal MIME cache for the udeb




More information about the pkg-gnome-commits mailing list