r14136 - in /desktop/unstable/libbonobo/debian: changelog control control.in libbonobo2-0.install libbonobo2-bin.install libbonobo2-bin.links libbonobo2-common.install libbonobo2-common.preinst libbonobo2-dev.install libbonobo2-dev.links rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Jan 12 01:12:16 UTC 2008 

Author: joss
Date: Sat Jan 12 01:12:16 2008
New Revision: 14136

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14136
Log:
* New upstream bugfix release; no API changes.
* libbonobo2-common.preinst: removed, it is useless.
* Fix the dependency loop; closes: #342901.
  + New package: libbonobo2-bin, contains the support binaries that
    are not necessary for the library to run.
  + Don't version the directories, as bonobo is being deprecated 
    anyway.
  + Move the moniker, the orbit module and the activation server to
    libbonobo2-0.
  + Move the documentation to libbonobo2-dev.
  + Make libbonobo2-common architecture-independent.
* Make symbolic links to the documentation in /usr/share/doc.
  Closes: #363139.

Added:
    desktop/unstable/libbonobo/debian/libbonobo2-bin.install
      - copied, changed from r14130, desktop/unstable/libbonobo/debian/libbonobo2-common.install
    desktop/unstable/libbonobo/debian/libbonobo2-bin.links
      - copied, changed from r14130, desktop/unstable/libbonobo/debian/libbonobo2-dev.links
Removed:
    desktop/unstable/libbonobo/debian/libbonobo2-common.preinst
Modified:
    desktop/unstable/libbonobo/debian/changelog
    desktop/unstable/libbonobo/debian/control
    desktop/unstable/libbonobo/debian/control.in
    desktop/unstable/libbonobo/debian/libbonobo2-0.install
    desktop/unstable/libbonobo/debian/libbonobo2-common.install
    desktop/unstable/libbonobo/debian/libbonobo2-dev.install
    desktop/unstable/libbonobo/debian/libbonobo2-dev.links
    desktop/unstable/libbonobo/debian/rules

Modified: desktop/unstable/libbonobo/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/changelog?rev=14136&op=diff
==============================================================================
--- desktop/unstable/libbonobo/debian/changelog (original)
+++ desktop/unstable/libbonobo/debian/changelog Sat Jan 12 01:12:16 2008
@@ -1,3 +1,21 @@
+libbonobo (2.20.3-1) unstable; urgency=low
+
+  * New upstream bugfix release; no API changes.
+  * libbonobo2-common.preinst: removed, it is useless.
+  * Fix the dependency loop; closes: #342901.
+    + New package: libbonobo2-bin, contains the support binaries that
+      are not necessary for the library to run.
+    + Don't version the directories, as bonobo is being deprecated 
+      anyway.
+    + Move the moniker, the orbit module and the activation server to
+      libbonobo2-0.
+    + Move the documentation to libbonobo2-dev.
+    + Make libbonobo2-common architecture-independent.
+  * Make symbolic links to the documentation in /usr/share/doc.
+    Closes: #363139.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 11 Jan 2008 18:07:02 +0100
+
 libbonobo (2.20.2-1) unstable; urgency=low
 
   * New upstream stable release; no API change; bug fixes.

Modified: desktop/unstable/libbonobo/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/control?rev=14136&op=diff
==============================================================================
--- desktop/unstable/libbonobo/debian/control (original)
+++ desktop/unstable/libbonobo/debian/control Sat Jan 12 01:12:16 2008
@@ -20,9 +20,8 @@
 Standards-Version: 3.7.2
 
 Package: libbonobo2-common
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Architecture: all
+Depends: ${misc:Depends}
 Conflicts: bonobo-activation (<< 1:2.4)
 Replaces: bonobo-activation (<< 1:2.4)
 Description: Bonobo CORBA interfaces library -- support files
@@ -47,7 +46,8 @@
          libglib2.0-dev (>= 2.8.0),
          liborbit2-dev (>= 1:2.12.4),
          libpopt-dev
-Replaces: libbonobo-activation-dev (<< 1:2.4)
+Replaces: libbonobo-activation-dev (<< 1:2.4),
+          libbonobo2-common (<< 2.20.3-1)
 Description: Bonobo CORBA interfaces library -- development files
  Bonobo is a set of language and system independent CORBA interfaces
  for creating reusable components, controls and creating compound
@@ -67,9 +67,11 @@
 Conflicts: libbonobo-activation4 (<< 1:2.4),
            nautilus (<< 2.2.4-5)
 Depends: ${misc:Depends},
-         libbonobo2-common (= ${binary:Version}),
+         libbonobo2-common (= ${source:Version}),
          ${shlibs:Depends}
-Replaces: libbonobo-activation4 (<< 1:2.4)
+Replaces: libbonobo-activation4 (<< 1:2.4),
+          libbonobo2-common (<< 2.20.3-1)
+Suggests: libbonobo2-bin
 Description: Bonobo CORBA interfaces library
  Bonobo is a set of language and system independent CORBA interfaces
  for creating reusable components, controls and creating compound
@@ -81,3 +83,22 @@
  documents.
  .
  This package contains the shared libraries.
+
+Package: libbonobo2-bin
+Architecture: any
+Replaces: libbonobo2-common (<< 2.20.3-1)
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libbonobo2-common (= ${source:Version})
+Description: Bonobo CORBA interfaces library -- support binaries
+ 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 component using bonobo and some utility 
+ binaries.

Modified: desktop/unstable/libbonobo/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/control.in?rev=14136&op=diff
==============================================================================
--- desktop/unstable/libbonobo/debian/control.in (original)
+++ desktop/unstable/libbonobo/debian/control.in Sat Jan 12 01:12:16 2008
@@ -20,9 +20,8 @@
 Standards-Version: 3.7.2
 
 Package: libbonobo2-common
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Architecture: all
+Depends: ${misc:Depends}
 Conflicts: bonobo-activation (<< 1:2.4)
 Replaces: bonobo-activation (<< 1:2.4)
 Description: Bonobo CORBA interfaces library -- support files
@@ -47,7 +46,8 @@
          libglib2.0-dev (>= 2.8.0),
          liborbit2-dev (>= 1:2.12.4),
          libpopt-dev
-Replaces: libbonobo-activation-dev (<< 1:2.4)
+Replaces: libbonobo-activation-dev (<< 1:2.4),
+          libbonobo2-common (<< 2.20.3-1)
 Description: Bonobo CORBA interfaces library -- development files
  Bonobo is a set of language and system independent CORBA interfaces
  for creating reusable components, controls and creating compound
@@ -67,9 +67,11 @@
 Conflicts: libbonobo-activation4 (<< 1:2.4),
            nautilus (<< 2.2.4-5)
 Depends: ${misc:Depends},
-         libbonobo2-common (= ${binary:Version}),
+         libbonobo2-common (= ${source:Version}),
          ${shlibs:Depends}
-Replaces: libbonobo-activation4 (<< 1:2.4)
+Replaces: libbonobo-activation4 (<< 1:2.4),
+          libbonobo2-common (<< 2.20.3-1)
+Suggests: libbonobo2-bin
 Description: Bonobo CORBA interfaces library
  Bonobo is a set of language and system independent CORBA interfaces
  for creating reusable components, controls and creating compound
@@ -81,3 +83,22 @@
  documents.
  .
  This package contains the shared libraries.
+
+Package: libbonobo2-bin
+Architecture: any
+Replaces: libbonobo2-common (<< 2.20.3-1)
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libbonobo2-common (= ${source:Version})
+Description: Bonobo CORBA interfaces library -- support binaries
+ 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 component using bonobo and some utility 
+ binaries.

Modified: desktop/unstable/libbonobo/debian/libbonobo2-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/libbonobo2-0.install?rev=14136&op=diff
==============================================================================
--- desktop/unstable/libbonobo/debian/libbonobo2-0.install (original)
+++ desktop/unstable/libbonobo/debian/libbonobo2-0.install Sat Jan 12 01:12:16 2008
@@ -1,1 +1,4 @@
 debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/lib/bonobo-activation
+debian/tmp/usr/lib/bonobo/monikers/*.so
+debian/tmp/usr/lib/orbit-2.0/*.so

Copied: desktop/unstable/libbonobo/debian/libbonobo2-bin.install (from r14130, desktop/unstable/libbonobo/debian/libbonobo2-common.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/libbonobo2-bin.install?rev=14136&op=diff
==============================================================================
--- desktop/unstable/libbonobo/debian/libbonobo2-common.install (original)
+++ desktop/unstable/libbonobo/debian/libbonobo2-bin.install Sat Jan 12 01:12:16 2008
@@ -1,12 +1,3 @@
 debian/tmp/usr/bin
 debian/tmp/usr/sbin
-debian/tmp/usr/share/idl
-debian/tmp/usr/share/man
-debian/tmp/usr/share/gtk-doc
-debian/tmp/usr/share/locale
-debian/tmp/usr/lib/orbit-2.0/*.so
-debian/tmp/usr/lib/bonobo-activation
-debian/tmp/usr/lib/bonobo/servers/*.server
-debian/tmp/usr/lib/bonobo/monikers/*.so
 debian/tmp/usr/lib/bonobo-2.0
-debian/tmp/etc/bonobo-activation

Copied: desktop/unstable/libbonobo/debian/libbonobo2-bin.links (from r14130, desktop/unstable/libbonobo/debian/libbonobo2-dev.links)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/libbonobo2-bin.links?rev=14136&op=diff
==============================================================================
--- desktop/unstable/libbonobo/debian/libbonobo2-dev.links (original)
+++ desktop/unstable/libbonobo/debian/libbonobo2-bin.links Sat Jan 12 01:12:16 2008
@@ -1,1 +1,1 @@
-/usr/share/doc/libbonobo2-0 /usr/share/doc/libbonobo2-dev
+/usr/share/doc/libbonobo2-common /usr/share/doc/libbonobo2-bin

Modified: desktop/unstable/libbonobo/debian/libbonobo2-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/libbonobo2-common.install?rev=14136&op=diff
==============================================================================
--- desktop/unstable/libbonobo/debian/libbonobo2-common.install (original)
+++ desktop/unstable/libbonobo/debian/libbonobo2-common.install Sat Jan 12 01:12:16 2008
@@ -1,12 +1,5 @@
-debian/tmp/usr/bin
-debian/tmp/usr/sbin
 debian/tmp/usr/share/idl
 debian/tmp/usr/share/man
-debian/tmp/usr/share/gtk-doc
 debian/tmp/usr/share/locale
-debian/tmp/usr/lib/orbit-2.0/*.so
-debian/tmp/usr/lib/bonobo-activation
 debian/tmp/usr/lib/bonobo/servers/*.server
-debian/tmp/usr/lib/bonobo/monikers/*.so
-debian/tmp/usr/lib/bonobo-2.0
 debian/tmp/etc/bonobo-activation

Modified: desktop/unstable/libbonobo/debian/libbonobo2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/libbonobo2-dev.install?rev=14136&op=diff
==============================================================================
--- desktop/unstable/libbonobo/debian/libbonobo2-dev.install (original)
+++ desktop/unstable/libbonobo/debian/libbonobo2-dev.install Sat Jan 12 01:12:16 2008
@@ -3,3 +3,5 @@
 debian/tmp/usr/lib/*.so
 debian/tmp/usr/lib/*.la
 debian/tmp/usr/lib/*.a
+debian/tmp/usr/share/gtk-doc
+

Modified: desktop/unstable/libbonobo/debian/libbonobo2-dev.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/libbonobo2-dev.links?rev=14136&op=diff
==============================================================================
--- desktop/unstable/libbonobo/debian/libbonobo2-dev.links (original)
+++ desktop/unstable/libbonobo/debian/libbonobo2-dev.links Sat Jan 12 01:12:16 2008
@@ -1,1 +1,3 @@
 /usr/share/doc/libbonobo2-0 /usr/share/doc/libbonobo2-dev
+/usr/share/gtk-doc/html/libbonobo /usr/share/doc/libbonobo2-common/libbonobo
+/usr/share/gtk-doc/html/bonobo-activation /usr/share/doc/libbonobo2-common/bonobo-activation

Modified: desktop/unstable/libbonobo/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/rules?rev=14136&op=diff
==============================================================================
--- desktop/unstable/libbonobo/debian/rules (original)
+++ desktop/unstable/libbonobo/debian/rules Sat Jan 12 01:12:16 2008
@@ -14,8 +14,10 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
 DEB_INSTALL_DOCS_libbonobo2-0 += --no-act
 DEB_INSTALL_DOCS_libbonobo2-dev += --no-act
+DEB_INSTALL_DOCS_libbonobo2-bin += --no-act
 DEB_INSTALL_CHANGELOGS_libbonobo2-0 += --no-act
 DEB_INSTALL_CHANGELOGS_libbonobo2-dev += --no-act
+DEB_INSTALL_CHANGELOGS_libbonobo2-bin += --no-act
 
 install/libbonobo2-common::
 	rm -f $(CURDIR)/debian/tmp/usr/lib/bonobo/servers/broken.server

More information about the pkg-gnome-commits mailing list