r40366 - in /attic/libbonoboui/debian: changelog compat control control.in libbonoboui2-0.install libbonoboui2-bin.install libbonoboui2-common.install libbonoboui2-common.postinst libbonoboui2-dev.install rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Thu Dec 26 15:45:16 UTC 2013
Author: joss
Date: Thu Dec 26 15:45:16 2013
New Revision: 40366
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40366
Log:
* Convert to multi-arch:
+ Require appropriate cdbs/debhelper versions.
+ Bump requirement on libbonobo2-dev for the new server path.
+ Bump requirement on libglade2-dev for the new modules path.
+ Make libbonoboui2-common MA: foreign and libbonoboui2-0 MA: same.
+ Update installation paths.
* Move to section oldlibs.
* Update descriptions.
* Drop .la files.
* Drop gnome:version stuff.
* Move bonobo-browser and test-moniker to a new libbonobo2-bin
package.
+ This allows us to make libbonoboui2-dev MA: same.
Added:
attic/libbonoboui/debian/libbonoboui2-bin.install
Removed:
attic/libbonoboui/debian/libbonoboui2-common.postinst
Modified:
attic/libbonoboui/debian/changelog
attic/libbonoboui/debian/compat
attic/libbonoboui/debian/control
attic/libbonoboui/debian/control.in
attic/libbonoboui/debian/libbonoboui2-0.install
attic/libbonoboui/debian/libbonoboui2-common.install
attic/libbonoboui/debian/libbonoboui2-dev.install
attic/libbonoboui/debian/rules
Modified: attic/libbonoboui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/changelog?rev=40366&op=diff
==============================================================================
--- attic/libbonoboui/debian/changelog [utf-8] (original)
+++ attic/libbonoboui/debian/changelog [utf-8] Thu Dec 26 15:45:16 2013
@@ -1,4 +1,4 @@
-libbonoboui (2.24.5-1) UNRELEASED; urgency=low
+libbonoboui (2.24.5-1) unstable; urgency=low
[ Josselin Mouette ]
* Move documentation to libbonoboui2-dev. Closes: #583121.
@@ -23,8 +23,21 @@
* 01_dont_check_for_pangox.patch. Stop using pangox entirely for
irrelevant checks. Explicitly depend on X11 libraries since
libbonoboui uses them regardless.
-
- -- Josselin Mouette <joss at debian.org> Sun, 31 Oct 2010 14:42:06 +0100
+ * Convert to multi-arch:
+ + Require appropriate cdbs/debhelper versions.
+ + Bump requirement on libbonobo2-dev for the new server path.
+ + Bump requirement on libglade2-dev for the new modules path.
+ + Make libbonoboui2-common MA: foreign and libbonoboui2-0 MA: same.
+ + Update installation paths.
+ * Move to section oldlibs.
+ * Update descriptions.
+ * Drop .la files.
+ * Drop gnome:version stuff.
+ * Move bonobo-browser and test-moniker to a new libbonobo2-bin
+ package.
+ + This allows us to make libbonoboui2-dev MA: same.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 26 Dec 2013 16:44:56 +0100
libbonoboui (2.24.3-1) unstable; urgency=low
Modified: attic/libbonoboui/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/compat?rev=40366&op=diff
==============================================================================
--- attic/libbonoboui/debian/compat [utf-8] (original)
+++ attic/libbonoboui/debian/compat [utf-8] Thu Dec 26 15:45:16 2013
@@ -1 +1 @@
-5
+8
Modified: attic/libbonoboui/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/control?rev=40366&op=diff
==============================================================================
--- attic/libbonoboui/debian/control [utf-8] (original)
+++ attic/libbonoboui/debian/control [utf-8] Thu Dec 26 15:45:16 2013
@@ -4,12 +4,12 @@
# This file is regenerated automatically in the clean target.
Source: libbonoboui
-Section: devel
+Section: oldlibs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: David Weinehall <tao at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 5),
- cdbs,
+Build-Depends: debhelper (>= 8.1.3),
+ cdbs (>= 0.4.93~),
dh-autoreconf,
gnome-pkg-tools (>= 0.10),
dpkg-dev (>= 1.13.19),
@@ -21,13 +21,13 @@
libxt-dev,
libpopt-dev,
libgnomecanvas2-dev (>= 2.14.0-2),
- libbonobo2-dev (>= 2.13.0),
+ libbonobo2-dev (>= 2.32.1-3~),
libgnome2-dev (>= 2.13.7),
libxml2-dev (>= 2.4.20),
libgconf2-dev (>= 2.6.1-2),
libgtk2.0-dev (>= 2.6.0),
libglib2.0-dev (>= 2.6.0),
- libglade2-dev (>= 1:2.4.0),
+ libglade2-dev (>= 1:2.6.4-2~),
xvfb,
xfonts-base,
xauth
@@ -37,22 +37,32 @@
Package: libbonoboui2-common
Architecture: all
-Section: libs
+Multi-Arch: foreign
+Section: oldlibs
Depends: ${misc:Depends}
Conflicts: libbonoboui2-0 (<= 2.4.3-1)
-Description: The Bonobo UI library -- common files
- The Bonobo UI library
+Description: Bonobo UI library - common files
+ Bonobo is a set of language and system independent CORBA interfaces
+ for creating reusable components, controls and creating compound
+ documents.
.
- This package is a part of GNOME.
+ The Bonobo distribution includes a GTK+ based implementation of the
+ Bonobo interfaces, enabling developers to create reusable
+ components and applications that can be used to form more complex
+ documents.
+ .
+ This package contains the support files needed by the GTK+ part of the
+ Bonobo library.
Package: libbonoboui2-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: ${misc:Depends},
libbonoboui2-0 (= ${binary:Version}),
${shlibs:Depends},
libglib2.0-dev (>= 2.6.0),
- libbonobo2-dev (>= 2.13.0),
+ libbonobo2-dev (>= 2.32.1-3~),
libgnomecanvas2-dev (>= 2.6.0),
libgnome2-dev (>= 2.13.0),
liborbit2-dev,
@@ -60,22 +70,61 @@
libsm-dev,
libice-dev,
libx11-dev
-Conflicts: libbonoboui2-common (<< 2.24.3-2)
-Description: The Bonobo UI library - development files
- The Bonobo UI library.
- This package includes development files for libbonoboui.
+Breaks: libbonoboui2-common (<< 2.24.5)
+Replaces: libbonoboui2-common (<< 2.24.5)
+Description: Bonobo UI library - development files
+ Bonobo is a set of language and system independent CORBA interfaces
+ for creating reusable components, controls and creating compound
+ documents.
.
- This package is a part of GNOME.
+ The Bonobo distribution includes a GTK+ based implementation of the
+ Bonobo interfaces, enabling developers to create reusable
+ components and applications that can be used to form more complex
+ documents.
+ .
+ This package contains the development files needed to develop and
+ build GTK+ applications using Bonobo.
Package: libbonoboui2-0
Architecture: any
-Section: libs
+Multi-Arch: same
+Section: oldlibs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends},
- libbonoboui2-common (>= ${gnome:Version}),
- libbonoboui2-common (<< ${gnome:NextVersion})
+ libbonoboui2-common (= ${source:Version})
Replaces: libbonoboui2-common (<= 2.4.3-1)
-Description: The Bonobo UI library
- This package contains the Bonobo UI library.
+Description: Bonobo UI library - runtime
+ Bonobo is a set of language and system independent CORBA interfaces
+ for creating reusable components, controls and creating compound
+ documents.
.
- This package is a part of GNOME.
+ The Bonobo distribution includes a GTK+ based implementation of the
+ Bonobo interfaces, enabling developers to create reusable
+ components and applications that can be used to form more complex
+ documents.
+ .
+ This package contains the runtime libraries needed to run GTK+
+ applications based on Bonobo.
+
+Package: libbonoboui2-bin
+Architecture: any
+Section: devel
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libbonoboui2-common (<< 2.24.5),
+ libbonoboui2-dev (<< 2.24.5)
+Replaces: libbonoboui2-common (<< 2.24.5),
+ libbonoboui2-dev (<< 2.24.5)
+Description: Bonobo UI library - utilities
+ Bonobo is a set of language and system independent CORBA interfaces
+ for creating reusable components, controls and creating compound
+ documents.
+ .
+ The Bonobo distribution includes a GTK+ based implementation of the
+ Bonobo interfaces, enabling developers to create reusable
+ components and applications that can be used to form more complex
+ documents.
+ .
+ This package contains a test binary using the Bonobo UI library and a
+ component browser.
Modified: attic/libbonoboui/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/control.in?rev=40366&op=diff
==============================================================================
--- attic/libbonoboui/debian/control.in [utf-8] (original)
+++ attic/libbonoboui/debian/control.in [utf-8] Thu Dec 26 15:45:16 2013
@@ -1,10 +1,10 @@
Source: libbonoboui
-Section: devel
+Section: oldlibs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5),
- cdbs,
+Build-Depends: debhelper (>= 8.1.3),
+ cdbs (>= 0.4.93~),
dh-autoreconf,
gnome-pkg-tools (>= 0.10),
dpkg-dev (>= 1.13.19),
@@ -16,13 +16,13 @@
libxt-dev,
libpopt-dev,
libgnomecanvas2-dev (>= 2.14.0-2),
- libbonobo2-dev (>= 2.13.0),
+ libbonobo2-dev (>= 2.32.1-3~),
libgnome2-dev (>= 2.13.7),
libxml2-dev (>= 2.4.20),
libgconf2-dev (>= 2.6.1-2),
libgtk2.0-dev (>= 2.6.0),
libglib2.0-dev (>= 2.6.0),
- libglade2-dev (>= 1:2.4.0),
+ libglade2-dev (>= 1:2.6.4-2~),
xvfb,
xfonts-base,
xauth
@@ -32,22 +32,32 @@
Package: libbonoboui2-common
Architecture: all
-Section: libs
+Multi-Arch: foreign
+Section: oldlibs
Depends: ${misc:Depends}
Conflicts: libbonoboui2-0 (<= 2.4.3-1)
-Description: The Bonobo UI library -- common files
- The Bonobo UI library
+Description: Bonobo UI library - common files
+ Bonobo is a set of language and system independent CORBA interfaces
+ for creating reusable components, controls and creating compound
+ documents.
.
- This package is a part of GNOME.
+ The Bonobo distribution includes a GTK+ based implementation of the
+ Bonobo interfaces, enabling developers to create reusable
+ components and applications that can be used to form more complex
+ documents.
+ .
+ This package contains the support files needed by the GTK+ part of the
+ Bonobo library.
Package: libbonoboui2-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: ${misc:Depends},
libbonoboui2-0 (= ${binary:Version}),
${shlibs:Depends},
libglib2.0-dev (>= 2.6.0),
- libbonobo2-dev (>= 2.13.0),
+ libbonobo2-dev (>= 2.32.1-3~),
libgnomecanvas2-dev (>= 2.6.0),
libgnome2-dev (>= 2.13.0),
liborbit2-dev,
@@ -55,22 +65,61 @@
libsm-dev,
libice-dev,
libx11-dev
-Conflicts: libbonoboui2-common (<< 2.24.3-2)
-Description: The Bonobo UI library - development files
- The Bonobo UI library.
- This package includes development files for libbonoboui.
+Breaks: libbonoboui2-common (<< 2.24.5)
+Replaces: libbonoboui2-common (<< 2.24.5)
+Description: Bonobo UI library - development files
+ Bonobo is a set of language and system independent CORBA interfaces
+ for creating reusable components, controls and creating compound
+ documents.
.
- This package is a part of GNOME.
+ The Bonobo distribution includes a GTK+ based implementation of the
+ Bonobo interfaces, enabling developers to create reusable
+ components and applications that can be used to form more complex
+ documents.
+ .
+ This package contains the development files needed to develop and
+ build GTK+ applications using Bonobo.
Package: libbonoboui2-0
Architecture: any
-Section: libs
+Multi-Arch: same
+Section: oldlibs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends},
- libbonoboui2-common (>= ${gnome:Version}),
- libbonoboui2-common (<< ${gnome:NextVersion})
+ libbonoboui2-common (= ${source:Version})
Replaces: libbonoboui2-common (<= 2.4.3-1)
-Description: The Bonobo UI library
- This package contains the Bonobo UI library.
+Description: Bonobo UI library - runtime
+ Bonobo is a set of language and system independent CORBA interfaces
+ for creating reusable components, controls and creating compound
+ documents.
.
- This package is a part of GNOME.
+ The Bonobo distribution includes a GTK+ based implementation of the
+ Bonobo interfaces, enabling developers to create reusable
+ components and applications that can be used to form more complex
+ documents.
+ .
+ This package contains the runtime libraries needed to run GTK+
+ applications based on Bonobo.
+
+Package: libbonoboui2-bin
+Architecture: any
+Section: devel
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libbonoboui2-common (<< 2.24.5),
+ libbonoboui2-dev (<< 2.24.5)
+Replaces: libbonoboui2-common (<< 2.24.5),
+ libbonoboui2-dev (<< 2.24.5)
+Description: Bonobo UI library - utilities
+ Bonobo is a set of language and system independent CORBA interfaces
+ for creating reusable components, controls and creating compound
+ documents.
+ .
+ The Bonobo distribution includes a GTK+ based implementation of the
+ Bonobo interfaces, enabling developers to create reusable
+ components and applications that can be used to form more complex
+ documents.
+ .
+ This package contains a test binary using the Bonobo UI library and a
+ component browser.
Modified: attic/libbonoboui/debian/libbonoboui2-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/libbonoboui2-0.install?rev=40366&op=diff
==============================================================================
--- attic/libbonoboui/debian/libbonoboui2-0.install [utf-8] (original)
+++ attic/libbonoboui/debian/libbonoboui2-0.install [utf-8] Thu Dec 26 15:45:16 2013
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/lib*.so.*
-debian/tmp/usr/lib/libglade/2.0/*.so
+debian/tmp/usr/lib/*/lib*.so.*
+debian/tmp/usr/lib/*/libglade/2.0/*.so
Added: attic/libbonoboui/debian/libbonoboui2-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/libbonoboui2-bin.install?rev=40366&op=file
==============================================================================
--- attic/libbonoboui/debian/libbonoboui2-bin.install (added)
+++ attic/libbonoboui/debian/libbonoboui2-bin.install [utf-8] Thu Dec 26 15:45:16 2013
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin
+debian/tmp/usr/share/gnome-2.0
Modified: attic/libbonoboui/debian/libbonoboui2-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/libbonoboui2-common.install?rev=40366&op=diff
==============================================================================
--- attic/libbonoboui/debian/libbonoboui2-common.install [utf-8] (original)
+++ attic/libbonoboui/debian/libbonoboui2-common.install [utf-8] Thu Dec 26 15:45:16 2013
@@ -1,2 +1 @@
-debian/tmp/usr/share/gnome-2.0
debian/tmp/usr/share/locale
Modified: attic/libbonoboui/debian/libbonoboui2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/libbonoboui2-dev.install?rev=40366&op=diff
==============================================================================
--- attic/libbonoboui/debian/libbonoboui2-dev.install [utf-8] (original)
+++ attic/libbonoboui/debian/libbonoboui2-dev.install [utf-8] Thu Dec 26 15:45:16 2013
@@ -1,7 +1,5 @@
-debian/tmp/usr/bin
debian/tmp/usr/include
-debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/lib*.la
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*/lib*.a
+debian/tmp/usr/lib/*/lib*.so
+debian/tmp/usr/lib/*/pkgconfig
debian/tmp/usr/share/gtk-doc
Modified: attic/libbonoboui/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/rules?rev=40366&op=diff
==============================================================================
--- attic/libbonoboui/debian/rules [utf-8] (original)
+++ attic/libbonoboui/debian/rules [utf-8] Thu Dec 26 15:45:16 2013
@@ -7,8 +7,6 @@
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -22,3 +20,4 @@
rm -f debian/stamp-makefile-check
endif
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
More information about the pkg-gnome-commits
mailing list