r25467 - in /desktop/unstable/libbonoboui/debian: changelog control control.in libbonoboui2-common.install libbonoboui2-common.links libbonoboui2-dev.install libbonoboui2-dev.preinst

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Oct 31 13:43:37 UTC 2010


Author: joss
Date: Sun Oct 31 13:43:31 2010
New Revision: 25467

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25467
Log:
* Move documentation to libbonoboui2-dev. Closes: #583121.
  + Stop symlinking to /usr/share/doc.
  + Remove the sylink in libbonoboui2-dev.preinst.

Added:
    desktop/unstable/libbonoboui/debian/libbonoboui2-dev.preinst
Removed:
    desktop/unstable/libbonoboui/debian/libbonoboui2-common.links
Modified:
    desktop/unstable/libbonoboui/debian/changelog
    desktop/unstable/libbonoboui/debian/control
    desktop/unstable/libbonoboui/debian/control.in
    desktop/unstable/libbonoboui/debian/libbonoboui2-common.install
    desktop/unstable/libbonoboui/debian/libbonoboui2-dev.install

Modified: desktop/unstable/libbonoboui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonoboui/debian/changelog?rev=25467&op=diff
==============================================================================
--- desktop/unstable/libbonoboui/debian/changelog [utf-8] (original)
+++ desktop/unstable/libbonoboui/debian/changelog [utf-8] Sun Oct 31 13:43:31 2010
@@ -1,3 +1,11 @@
+libbonoboui (2.24.3-2) UNRELEASED; urgency=low
+
+  * Move documentation to libbonoboui2-dev. Closes: #583121.
+    + Stop symlinking to /usr/share/doc.
+    + Remove the sylink in libbonoboui2-dev.preinst.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 31 Oct 2010 14:42:06 +0100
+
 libbonoboui (2.24.3-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/unstable/libbonoboui/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonoboui/debian/control?rev=25467&op=diff
==============================================================================
--- desktop/unstable/libbonoboui/debian/control [utf-8] (original)
+++ desktop/unstable/libbonoboui/debian/control [utf-8] Sun Oct 31 13:43:31 2010
@@ -1,8 +1,13 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: libbonoboui
 Section: devel
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: 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>
+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,
                gnome-pkg-tools (>= 0.10),
@@ -54,7 +59,7 @@
          libsm-dev,
          libice-dev,
          libx11-dev
-Replaces: libbonoboui2-common (<< 1.112.1-1)
+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.

Modified: desktop/unstable/libbonoboui/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonoboui/debian/control.in?rev=25467&op=diff
==============================================================================
--- desktop/unstable/libbonoboui/debian/control.in [utf-8] (original)
+++ desktop/unstable/libbonoboui/debian/control.in [utf-8] Sun Oct 31 13:43:31 2010
@@ -54,7 +54,7 @@
          libsm-dev,
          libice-dev,
          libx11-dev
-Replaces: libbonoboui2-common (<< 1.112.1-1)
+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.

Modified: desktop/unstable/libbonoboui/debian/libbonoboui2-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonoboui/debian/libbonoboui2-common.install?rev=25467&op=diff
==============================================================================
--- desktop/unstable/libbonoboui/debian/libbonoboui2-common.install [utf-8] (original)
+++ desktop/unstable/libbonoboui/debian/libbonoboui2-common.install [utf-8] Sun Oct 31 13:43:31 2010
@@ -1,3 +1,2 @@
 debian/tmp/usr/share/gnome-2.0
-debian/tmp/usr/share/gtk-doc/html/libbonoboui/* usr/share/doc/libbonoboui2-common/html/
 debian/tmp/usr/share/locale

Modified: desktop/unstable/libbonoboui/debian/libbonoboui2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonoboui/debian/libbonoboui2-dev.install?rev=25467&op=diff
==============================================================================
--- desktop/unstable/libbonoboui/debian/libbonoboui2-dev.install [utf-8] (original)
+++ desktop/unstable/libbonoboui/debian/libbonoboui2-dev.install [utf-8] Sun Oct 31 13:43:31 2010
@@ -4,3 +4,4 @@
 debian/tmp/usr/lib/lib*.la
 debian/tmp/usr/lib/lib*.so
 debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/gtk-doc

Added: desktop/unstable/libbonoboui/debian/libbonoboui2-dev.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonoboui/debian/libbonoboui2-dev.preinst?rev=25467&op=file
==============================================================================
--- desktop/unstable/libbonoboui/debian/libbonoboui2-dev.preinst (added)
+++ desktop/unstable/libbonoboui/debian/libbonoboui2-dev.preinst [utf-8] Sun Oct 31 13:43:31 2010
@@ -1,0 +1,8 @@
+#! /bin/sh
+set -e
+
+if [ -L /usr/share/gtk-doc/html/libbonoboui ]; then
+    rm -f /usr/share/gtk-doc/html/libbonoboui
+fi
+
+#DEBHELPER#




More information about the pkg-gnome-commits mailing list