r33026 - in /desktop/experimental/gdl/debian: changelog control control.in gir1.2-gdl-3.install libgdl-3-2.install libgdl-3-dev.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Mon Mar 12 16:00:17 UTC 2012 

Author: biebl
Date: Mon Mar 12 16:00:15 2012
New Revision: 33026

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33026
Log:
Convert libgdl to multiarch.

Modified:
    desktop/experimental/gdl/debian/changelog
    desktop/experimental/gdl/debian/control
    desktop/experimental/gdl/debian/control.in
    desktop/experimental/gdl/debian/gir1.2-gdl-3.install
    desktop/experimental/gdl/debian/libgdl-3-2.install
    desktop/experimental/gdl/debian/libgdl-3-dev.install
    desktop/experimental/gdl/debian/rules

Modified: desktop/experimental/gdl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdl/debian/changelog?rev=33026&op=diff
==============================================================================
--- desktop/experimental/gdl/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdl/debian/changelog [utf-8] Mon Mar 12 16:00:15 2012
@@ -11,6 +11,7 @@
   * Split the API documentation from libgdl-3-common into a separate package
     libgdl-3-doc. Add the necessary Breaks/Replaces.
   * Add Suggests: libgdl-3-doc to libgdl-3-dev.
+  * Convert libgdl to multiarch.
 
  -- Michael Biebl <biebl at debian.org>  Mon, 12 Mar 2012 16:48:00 +0100
 

Modified: desktop/experimental/gdl/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdl/debian/control?rev=33026&op=diff
==============================================================================
--- desktop/experimental/gdl/debian/control [utf-8] (original)
+++ desktop/experimental/gdl/debian/control [utf-8] Mon Mar 12 16:00:15 2012
@@ -8,7 +8,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3),
                cdbs,
                autotools-dev,
                libgtk-3-dev,
@@ -27,20 +27,23 @@
 Package: libgdl-3-dev
 Section: libdevel
 Architecture: any
-Depends: libgdl-3-1 (= ${binary:Version}),
+Depends: libgdl-3-2 (= ${binary:Version}),
          gir1.2-gdl-3 (= ${binary:Version}),
          libgtk-3-dev,
          libxml2-dev (>= 2.2.8),
          ${misc:Depends},
          ${shlibs:Depends}
+Suggests: libgdl-3-doc
 Description: GNOME DevTool libraries - development files
  Provides a support library for development tools from the GNOME environment.
  Including symbol browser, dock and editor components.
  .
  This package contains the development files.
 
-Package: libgdl-3-1
+Package: libgdl-3-2
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgdl-3-common (= ${source:Version})
@@ -53,6 +56,7 @@
 Package: libgdl-3-common
 Section: gnome
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: GNOME DevTool libraries - common files
  Provides a support library for development tools from the GNOME environment.
@@ -60,11 +64,25 @@
  .
  This package contains the common files.
 
+Package: libgdl-3-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Suggests: devhelp
+Breaks: libgdl-3-common (<< 3.3.91-1)
+Replaces: libgdl-3-common (<< 3.3.91-1)
+Description: GNOME DevTool libraries - documentation
+ Provides a support library for development tools from the GNOME environment.
+ Including symbol browser, dock and editor components.
+ .
+ This package contains the API documentation.
+
 Package: libgdl-3-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libgdl-3-1 (= ${binary:Version}),
+Depends: libgdl-3-2 (= ${binary:Version}),
          ${misc:Depends}
 Description: GNOME DevTool libraries - debug files
  Provides a support library for development tools from the GNOME environment.

Modified: desktop/experimental/gdl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdl/debian/control.in?rev=33026&op=diff
==============================================================================
--- desktop/experimental/gdl/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdl/debian/control.in [utf-8] Mon Mar 12 16:00:15 2012
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3),
                cdbs,
                autotools-dev,
                libgtk-3-dev,
@@ -37,6 +37,8 @@
 
 Package: libgdl-3-2
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgdl-3-common (= ${source:Version})
@@ -49,6 +51,7 @@
 Package: libgdl-3-common
 Section: gnome
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: GNOME DevTool libraries - common files
  Provides a support library for development tools from the GNOME environment.
@@ -59,6 +62,7 @@
 Package: libgdl-3-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Suggests: devhelp
 Breaks: libgdl-3-common (<< 3.3.91-1)

Modified: desktop/experimental/gdl/debian/gir1.2-gdl-3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdl/debian/gir1.2-gdl-3.install?rev=33026&op=diff
==============================================================================
--- desktop/experimental/gdl/debian/gir1.2-gdl-3.install [utf-8] (original)
+++ desktop/experimental/gdl/debian/gir1.2-gdl-3.install [utf-8] Mon Mar 12 16:00:15 2012
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0/Gdl-3.typelib
+usr/lib/*/girepository-1.0 usr/lib/

Modified: desktop/experimental/gdl/debian/libgdl-3-2.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdl/debian/libgdl-3-2.install?rev=33026&op=diff
==============================================================================
--- desktop/experimental/gdl/debian/libgdl-3-2.install [utf-8] (original)
+++ desktop/experimental/gdl/debian/libgdl-3-2.install [utf-8] Mon Mar 12 16:00:15 2012
@@ -1,1 +1,1 @@
-usr/lib/libgdl-3.so.*
+usr/lib/*/libgdl-3.so.*

Modified: desktop/experimental/gdl/debian/libgdl-3-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdl/debian/libgdl-3-dev.install?rev=33026&op=diff
==============================================================================
--- desktop/experimental/gdl/debian/libgdl-3-dev.install [utf-8] (original)
+++ desktop/experimental/gdl/debian/libgdl-3-dev.install [utf-8] Mon Mar 12 16:00:15 2012
@@ -1,4 +1,4 @@
 usr/include
-usr/lib/pkgconfig/
-usr/lib/libgdl-3.so
+usr/lib/*/pkgconfig/
+usr/lib/*/libgdl-3.so
 usr/share/gir-1.0/Gdl-3.gir

Modified: desktop/experimental/gdl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdl/debian/rules?rev=33026&op=diff
==============================================================================
--- desktop/experimental/gdl/debian/rules [utf-8] (original)
+++ desktop/experimental/gdl/debian/rules [utf-8] Mon Mar 12 16:00:15 2012
@@ -8,4 +8,5 @@
 
 GNOME_MODULE := gdl
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
+                             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)

More information about the pkg-gnome-commits mailing list