r17471 - /desktop/experimental/gtk+2.0/debian/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Tue Nov 11 16:24:30 UTC 2008 

Author: joss
Date: Tue Nov 11 16:24:30 2008
New Revision: 17471

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17471
Log:
* Do not install libgailutil in libgtk2.0-0.
* Do not install gtk libs in libgail-dev.
* Rework docs installation.
* Add doc links where needed.
* Install .devhelp files at the correct places. Closes: #504807.
* Bump dependencies for the development package.
* Fix dependencies of gail packages.
* Don’t install libgail in the udeb.
* Stop shipping /usr/lib/pkgconfig/libgtk-directfb-2.0-0/, nobody uses 
  it.

Added:
    desktop/experimental/gtk+2.0/debian/libgail-doc.links
Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/control
    desktop/experimental/gtk+2.0/debian/control.in
    desktop/experimental/gtk+2.0/debian/libgail-common.install.in
    desktop/experimental/gtk+2.0/debian/libgail-dev.install
    desktop/experimental/gtk+2.0/debian/libgail-doc.install
    desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0-udeb.install.in
    desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-dev.install.in
    desktop/experimental/gtk+2.0/debian/libgtk2.0-0.install.in
    desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.install.in
    desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.install.in
    desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.links.in
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=17471&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Tue Nov 11 16:24:30 2008
@@ -4,6 +4,16 @@
   * Do not ship .la files for gail modules.
   * Generate shlibs for libgail.
   * Bump shlibs version to 2.14.0.
+  * Do not install libgailutil in libgtk2.0-0.
+  * Do not install gtk libs in libgail-dev.
+  * Rework docs installation.
+  * Add doc links where needed.
+  * Install .devhelp files at the correct places. Closes: #504807.
+  * Bump dependencies for the development package.
+  * Fix dependencies of gail packages.
+  * Don’t install libgail in the udeb.
+  * Stop shipping /usr/lib/pkgconfig/libgtk-directfb-2.0-0/, nobody uses 
+    it.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 11 Nov 2008 14:44:21 +0100
 

Modified: desktop/experimental/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control?rev=17471&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control (original)
+++ desktop/experimental/gtk+2.0/debian/control Tue Nov 11 16:24:30 2008
@@ -188,9 +188,9 @@
          libgtk2.0-common,
          ${misc:Depends},
          ${shlibs:Depends},
-         libglib2.0-dev (>= 2.12.0),
-         libpango1.0-dev (>= 1.10.0-2),
-         libatk1.0-dev (>= 1.6.1-2),
+         libglib2.0-dev (>= 2.17.6),
+         libpango1.0-dev (>= 1.20),
+         libatk1.0-dev (>= 1.13.0),
          libcairo2-dev (>= 1.6.4-6.1),
          libx11-dev (>= 2:1.0.0-6),
          libxext-dev (>= 1:1.0.1-2),
@@ -315,7 +315,9 @@
 
 Package: libgail18
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgtk2.0-0 (= ${binary:Version})
 Replaces: libgail17
 Description: GNOME Accessibility Implementation Library -- shared libraries
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
@@ -327,7 +329,9 @@
 
 Package: libgail-common
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgail18 (= ${binary:Version})
 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
@@ -339,7 +343,12 @@
 Package: libgail-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libgail18 (= ${binary:Version}), libgail-common (= ${binary:Version}), libgtk2.0-dev (>= 2.9.4), pkg-config, libatk1.0-dev (>= 1.13.0)
+Depends: ${misc:Depends},
+         libgail18 (= ${binary:Version}),
+         libgail-common (= ${binary:Version}), 
+         libgtk2.0-dev (= ${binary:Version}),
+         pkg-config,
+         libatk1.0-dev (>= 1.13.0)
 Suggests: libgail-doc
 Description: GNOME Accessibility Implementation Library -- development files
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
@@ -354,6 +363,7 @@
 Section: libdevel
 Priority: extra
 Depends: ${misc:Depends}, libgail18 (= ${binary:Version})
+Recommends: libgtk2.0-0-dbg
 Description: Gail libraries and debugging symbols
  Gail is the "GNOME Accessibility Implementation Library".
  .

Modified: desktop/experimental/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control.in?rev=17471&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control.in (original)
+++ desktop/experimental/gtk+2.0/debian/control.in Tue Nov 11 16:24:30 2008
@@ -188,9 +188,9 @@
          @COMMON_PKG@,
          ${misc:Depends},
          ${shlibs:Depends},
-         libglib2.0-dev (>= 2.12.0),
-         libpango1.0-dev (>= 1.10.0-2),
-         libatk1.0-dev (>= 1.6.1-2),
+         libglib2.0-dev (>= 2.17.6),
+         libpango1.0-dev (>= 1.20),
+         libatk1.0-dev (>= 1.13.0),
          libcairo2-dev (>= 1.6.4-6.1),
          libx11-dev (>= 2:1.0.0-6),
          libxext-dev (>= 1:1.0.1-2),
@@ -315,7 +315,9 @@
 
 Package: libgail18
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         @SHARED_PKG@ (= ${binary:Version})
 Replaces: libgail17
 Description: GNOME Accessibility Implementation Library -- shared libraries
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
@@ -327,7 +329,9 @@
 
 Package: libgail-common
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgail18 (= ${binary:Version})
 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
@@ -339,7 +343,12 @@
 Package: libgail-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libgail18 (= ${binary:Version}), libgail-common (= ${binary:Version}), libgtk2.0-dev (>= 2.9.4), pkg-config, libatk1.0-dev (>= 1.13.0)
+Depends: ${misc:Depends},
+         libgail18 (= ${binary:Version}),
+         libgail-common (= ${binary:Version}), 
+         @DEV_PKG@ (= ${binary:Version}),
+         pkg-config,
+         libatk1.0-dev (>= 1.13.0)
 Suggests: libgail-doc
 Description: GNOME Accessibility Implementation Library -- development files
  Gail implements ATK interfaces for GTK+ widgets which are dynamically
@@ -354,6 +363,7 @@
 Section: libdevel
 Priority: extra
 Depends: ${misc:Depends}, libgail18 (= ${binary:Version})
+Recommends: @DEBUG_PKG@
 Description: Gail libraries and debugging symbols
  Gail is the "GNOME Accessibility Implementation Library".
  .

Modified: desktop/experimental/gtk+2.0/debian/libgail-common.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgail-common.install.in?rev=17471&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgail-common.install.in (original)
+++ desktop/experimental/gtk+2.0/debian/libgail-common.install.in Tue Nov 11 16:24:30 2008
@@ -1,1 +1,1 @@
-debian/install/shared/@MODULES_BASE_PATH@/modules/*.so @MODULES_BASE_PATH@/modules
+debian/install/shared/@LIBDIR@/gtk- at APIVER@/modules/*.so @LIBDIR@/gtk- at APIVER@/modules

Modified: desktop/experimental/gtk+2.0/debian/libgail-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgail-dev.install?rev=17471&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgail-dev.install (original)
+++ desktop/experimental/gtk+2.0/debian/libgail-dev.install Tue Nov 11 16:24:30 2008
@@ -1,3 +1,5 @@
-debian/install/shared/usr/include/* /usr/include
-debian/install/shared/usr/lib/lib*.{so,la,a} /usr/lib
-debian/install/shared/usr/lib/pkgconfig/*.pc /usr/lib/pkgconfig
+debian/install/shared/usr/include/gail* /usr/include
+debian/install/shared/usr/lib/libgail*.so /usr/lib
+debian/install/shared/usr/lib/libgail*.la /usr/lib
+debian/install/static/usr/lib/libgail*.a @LIBDIR@
+debian/install/shared/usr/lib/pkgconfig/gail*.pc /usr/lib/pkgconfig

Modified: desktop/experimental/gtk+2.0/debian/libgail-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgail-doc.install?rev=17471&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgail-doc.install (original)
+++ desktop/experimental/gtk+2.0/debian/libgail-doc.install Tue Nov 11 16:24:30 2008
@@ -1,1 +1,2 @@
+debian/install/shared/usr/share/gtk-doc/html/gail* usr/share/gtk-doc/html
 docs/reference/libgail-util/html usr/share/doc/libgail-doc/gail-libgail-util

Added: desktop/experimental/gtk+2.0/debian/libgail-doc.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgail-doc.links?rev=17471&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgail-doc.links (added)
+++ desktop/experimental/gtk+2.0/debian/libgail-doc.links Tue Nov 11 16:24:30 2008
@@ -1,0 +1,1 @@
+/usr/share/gtk-doc/html/gail-libgail-util /usr/share/doc/libgail-doc/html

Modified: desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0-udeb.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk-directfb-2.0-0-udeb.install.in?rev=17471&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0-udeb.install.in (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0-udeb.install.in Tue Nov 11 16:24:30 2008
@@ -1,3 +1,3 @@
 # from the directfb flavor
 debian/install/directfb/@MODULES_BASE_PATH@/loaders/libpixbufloader-png.so @MODULES_BASE_PATH@/loaders
-debian/install/directfb/@LIBDIR@/*.so.* @LIBDIR@
+debian/install/directfb/@LIBDIR@/libg?k*.so.* @LIBDIR@

Modified: desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk-directfb-2.0-dev.install.in?rev=17471&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-dev.install.in (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-dev.install.in Tue Nov 11 16:24:30 2008
@@ -1,6 +1,5 @@
 # from the directfb flavor
 debian/install/directfb/usr/include/gtk- at APIVER@/gdk/*directfb* usr/include/gtk- at APIVER@/gdk
 debian/install/directfb/@LIBDIR@/*directfb*.so @LIBDIR@
-debian/install/directfb/@LIBDIR@/pkgconfig/* @LIBDIR@/pkgconfig/@DIRECTFB_PKG@
 debian/install/directfb/@LIBDIR@/pkgconfig/*directfb* @LIBDIR@/pkgconfig
 debian/install/directfb/@LIBDIR@/gtk- at APIVER@/include/gdkconfig.h @LIBDIR@/gtk- at APIVER@/include/directfb

Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.install.in?rev=17471&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.install.in (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.install.in Tue Nov 11 16:24:30 2008
@@ -9,4 +9,5 @@
 debian/install/shared/@MODULES_BASE_PATH@/loaders/*.so @MODULES_BASE_PATH@/loaders
 debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules
 debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends
-debian/install/shared/@LIBDIR@/*.so.* @LIBDIR@
+debian/install/shared/@LIBDIR@/libgtk*.so.* @LIBDIR@
+debian/install/shared/@LIBDIR@/libgdk*.so.* @LIBDIR@

Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-dev.install.in?rev=17471&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.install.in (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.install.in Tue Nov 11 16:24:30 2008
@@ -3,12 +3,12 @@
 # from the shared flavor
 debian/install/shared/usr/bin/gdk-pixbuf-csource  usr/bin
 debian/install/shared/usr/bin/gtk-builder-convert usr/bin
-debian/install/shared/usr/include usr
-debian/install/shared/@LIBDIR@/*.la @LIBDIR@
-debian/install/shared/@LIBDIR@/*.so @LIBDIR@
-debian/install/shared/@LIBDIR@/pkgconfig @LIBDIR@
+debian/install/shared/usr/include/gtk* usr/include
+debian/install/shared/@LIBDIR@/g?k*.la @LIBDIR@
+debian/install/shared/@LIBDIR@/g?k*.so @LIBDIR@
+debian/install/shared/@LIBDIR@/pkgconfig/g?k* @LIBDIR@/pkgconfig
 debian/install/shared/@LIBDIR@/gtk- at APIVER@/include @LIBDIR@/gtk- at APIVER@
 debian/install/shared/usr/share/aclocal usr/share
 debian/install/shared/usr/share/man/man1/gdk-pixbuf-csource.1 usr/share/man/man1/
 # from the static flavor
-debian/install/static/@LIBDIR@/*.a @LIBDIR@
+debian/install/static/@LIBDIR@/g?k*.a @LIBDIR@

Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-doc.install.in?rev=17471&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.install.in (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.install.in Tue Nov 11 16:24:30 2008
@@ -1,8 +1,9 @@
 # from Debian
-debian/gtk-faq.devhelp usr/share/doc/@DOC_PKG@/gtk-faq
-debian/gtk-tutorial.devhelp usr/share/doc/@DOC_PKG@/gtk-tutorial
+debian/gtk-faq.devhelp usr/share/doc/@DOC_PKG@/faq/html
+debian/gtk-tutorial.devhelp usr/share/doc/@DOC_PKG@/tutorial/html
 # from the shared flavor
-debian/install/shared/usr/share/doc/@DOC_PKG@ usr/share/doc
+debian/install/shared/usr/share/gtk-doc/html/gtk* usr/share/doc/@DOC_PKG@
+debian/install/shared/usr/share/gtk-doc/html/gdk* usr/share/doc/@DOC_PKG@
 # from the source
 docs/faq/html usr/share/doc/@DOC_PKG@/faq
 docs/tutorial/html usr/share/doc/@DOC_PKG@/tutorial

Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-doc.links.in?rev=17471&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.links.in (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.links.in Tue Nov 11 16:24:30 2008
@@ -1,6 +1,8 @@
 usr/share/doc/@DOC_PKG@/gdk usr/share/gtk-doc/html/gdk
 usr/share/doc/@DOC_PKG@/gdk-pixbuf usr/share/gtk-doc/html/gdk-pixbuf
 usr/share/doc/@DOC_PKG@/gtk usr/share/gtk-doc/html/gtk
+usr/share/doc/@DOC_PKG@/faq usr/share/gtk-doc/html/gtk-faq
+usr/share/doc/@DOC_PKG@/tutorial usr/share/gtk-doc/html/gtk-tutorial
 usr/share/doc/libatk1.0-doc/atk usr/share/doc/@DOC_PKG@/atk
 usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DOC_PKG@/glib
 usr/share/doc/libglib2.0-doc/gobject usr/share/doc/@DOC_PKG@/gobject

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=17471&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Tue Nov 11 16:24:30 2008
@@ -118,7 +118,6 @@
 			--mandir=\$${prefix}/share/man \
 			--infodir=\$${prefix}/share/info \
 			--sysconfdir=/etc \
-			--with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
 			--enable-test-print-backend
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 	common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
@@ -269,8 +268,6 @@
 	# install copyright in all packages; the -p is for the special behavior
 	# of dh_installdocs (ship README.Debian etc. in the first package)
 	dh_installdocs -p$(COMMON_PKG) -i
-	# we will install the gail docs to libgail-doc
-	rm -rf debian/$(DOC_PKG)/usr/share/doc/$(DOC_PKG)/gail-libgail-util
 	dh_installman -i
 	dh_link -i
 	dh_compress -i -X.sgml -X.devhelp
@@ -337,8 +334,7 @@
 		--add-udeb=$(UDEB_PKG)
 	dh_makeshlibs -plibgail18 \
 		-X$(MODULES_BASE_PATH) \
-		-V"libgail18 (>= $(SHVER))" \
-		--add-udeb=$(UDEB_PKG)
+		-V"libgail18 (>= $(SHVER))"
 	dh_installdeb -s
 	# override shlibs for libraries from this source before computing
 	# dependencies of packages generated from this source; we already have

More information about the pkg-gnome-commits mailing list