[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian, updated. debian/5.4.1-1-18-g85b71a7

Simon McVittie smcv at debian.org
Mon May 31 16:35:54 UTC 2010 

The following commit has been merged in the debian branch:
commit c6d29f7b5be18eb3e4e6316cd69c03d49eea846c
Author: Simon McVittie <smcv at debian.org>
Date:   Wed May 26 18:52:58 2010 +0100

    Package a release candidate

diff --git a/debian/changelog b/debian/changelog
index 99fa638..a4a01bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-telepathy-mission-control-5 (5.5.0-1) UNRELEASED; urgency=low
+telepathy-mission-control-5 (5.5.0~rc1-1) UNRELEASED; urgency=low
 
   * Start an experimental branch
 
diff --git a/debian/control b/debian/control
index a36addc..269bbe5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,10 @@ Uploaders: Simon McVittie <smcv at debian.org>,
 Build-Depends: cdbs,
                debhelper (>= 5),
                libdbus-1-dev (>= 1.0),
-               libdbus-glib-1-dev (>= 0.80),
-               libglib2.0-dev (>= 2.16),
+               libdbus-glib-1-dev (>= 0.82),
+               libglib2.0-dev (>= 2.24),
                libgnome-keyring-dev,
-               libtelepathy-glib-dev (>= 0.7.37),
+               libtelepathy-glib-dev (>= 0.11.6),
                pkg-config (>= 0.21),
                python (>= 2.5),
                xsltproc
@@ -22,7 +22,9 @@ Homepage: http://telepathy.freedesktop.org/wiki/
 
 Package: telepathy-mission-control-5
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libmission-control-plugins0 (= ${binary:Version})
 Conflicts: telepathy-mission-control
 Description: management daemon for Telepathy real-time communication framework
  Telepathy Mission Control 5 is an account manager and channel dispatcher for
@@ -53,3 +55,35 @@ Description: management daemon for Telepathy (debug symbols)
  Telepathy Mission Control 5 is an account manager and channel dispatcher for
  the Telepathy framework. This package contains debug symbols which can be
  used to debug Mission Control.
+
+Package: libmission-control-plugins0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: telepathy-mission-control-5 (= ${binary:Version})
+Description: management daemon for Telepathy (library for plugins)
+ Telepathy Mission Control 5 is an account manager and channel dispatcher for
+ the Telepathy framework. This package contains a library against which plugins
+ for Mission Control must be linked.
+
+Package: libmission-control-plugins-dev
+Architecture: any
+Section: libdevel
+Priority: extra
+Depends: libmission-control-plugins0 (= ${binary:Version}),
+         ${misc:Depends}
+Suggests: libmission-control-plugins-doc
+Description: management daemon for Telepathy (headers for plugins)
+ Telepathy Mission Control 5 is an account manager and channel dispatcher for
+ the Telepathy framework. This package contains development headers to build
+ plugins for Mission Control.
+
+Package: libmission-control-plugins-doc
+Architecture: all
+Section: doc
+Priority: extra
+Depends: ${misc:Depends}
+Description: management daemon for Telepathy (documentation for plugins)
+ Telepathy Mission Control 5 is an account manager and channel dispatcher for
+ the Telepathy framework. This package contains API documentation to build
+ plugins for Mission Control.
diff --git a/debian/libmission-control-plugins-dev.install b/debian/libmission-control-plugins-dev.install
new file mode 100644
index 0000000..9426e4b
--- /dev/null
+++ b/debian/libmission-control-plugins-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/include/mission-control-5.*/mission-control-plugins
+debian/tmp/usr/lib/pkgconfig/mission-control-plugins.pc
+debian/tmp/usr/lib/libmission-control-plugins.so
diff --git a/debian/libmission-control-plugins-dev.links b/debian/libmission-control-plugins-dev.links
new file mode 100644
index 0000000..777c6ec
--- /dev/null
+++ b/debian/libmission-control-plugins-dev.links
@@ -0,0 +1 @@
+usr/share/doc/libmission-control-plugins0 usr/share/doc/libmission-control-plugins-dev
diff --git a/debian/libmission-control-plugins-doc.doc-base b/debian/libmission-control-plugins-doc.doc-base
new file mode 100644
index 0000000..6ae8af3
--- /dev/null
+++ b/debian/libmission-control-plugins-doc.doc-base
@@ -0,0 +1,9 @@
+Document: mission-control-plugins
+Title: Mission Control Plugins Reference Manual
+Author: Simon McVittie et al
+Abstract: This manual provides API documentation for Mission Control plugins.
+Section: Programming/C
+
+Format: HTML
+Index: /usr/share/doc/libmission-control-plugins-doc/mission-control-plugins/index.html
+Files: /usr/share/doc/libmission-control-plugins-doc/mission-control-plugins/*.html
diff --git a/debian/libmission-control-plugins-doc.install b/debian/libmission-control-plugins-doc.install
new file mode 100644
index 0000000..1359ff3
--- /dev/null
+++ b/debian/libmission-control-plugins-doc.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/libmission-control-plugins-doc/mission-control-plugins
diff --git a/debian/libmission-control-plugins-doc.links b/debian/libmission-control-plugins-doc.links
new file mode 100644
index 0000000..6f77dd4
--- /dev/null
+++ b/debian/libmission-control-plugins-doc.links
@@ -0,0 +1 @@
+usr/share/doc/libmission-control-plugins-doc/mission-control-plugins usr/share/gtk-doc/html/mission-control-plugins
diff --git a/debian/libmission-control-plugins0.install b/debian/libmission-control-plugins0.install
new file mode 100644
index 0000000..be66249
--- /dev/null
+++ b/debian/libmission-control-plugins0.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libmission-control-plugins.so.0*
diff --git a/debian/libmission-control-plugins0.symbols b/debian/libmission-control-plugins0.symbols
new file mode 100644
index 0000000..f3a2fff
--- /dev/null
+++ b/debian/libmission-control-plugins0.symbols
@@ -0,0 +1,61 @@
+libmission-control-plugins.so.0 libmission-control-plugins0 #MINVER#
+ mcp_account_manager_get_type at Base 5.5.0~
+ mcp_account_manager_get_unique_name at Base 5.5.0~
+ mcp_account_manager_get_value at Base 5.5.0~
+ mcp_account_manager_parameter_is_secret at Base 5.5.0~
+ mcp_account_manager_parameter_make_secret at Base 5.5.0~
+ mcp_account_manager_set_value at Base 5.5.0~
+ mcp_account_storage_commit at Base 5.5.0~
+ mcp_account_storage_delete at Base 5.5.0~
+ mcp_account_storage_description at Base 5.5.0~
+ mcp_account_storage_get at Base 5.5.0~
+ mcp_account_storage_get_type at Base 5.5.0~
+ mcp_account_storage_iface_implement_commit at Base 5.5.0~
+ mcp_account_storage_iface_implement_delete at Base 5.5.0~
+ mcp_account_storage_iface_implement_get at Base 5.5.0~
+ mcp_account_storage_iface_implement_list at Base 5.5.0~
+ mcp_account_storage_iface_implement_ready at Base 5.5.0~
+ mcp_account_storage_iface_implement_set at Base 5.5.0~
+ mcp_account_storage_iface_set_desc at Base 5.5.0~
+ mcp_account_storage_iface_set_name at Base 5.5.0~
+ mcp_account_storage_iface_set_priority at Base 5.5.0~
+ mcp_account_storage_list at Base 5.5.0~
+ mcp_account_storage_name at Base 5.5.0~
+ mcp_account_storage_priority at Base 5.5.0~
+ mcp_account_storage_ready at Base 5.5.0~
+ mcp_account_storage_set at Base 5.5.0~
+ mcp_add_object at Base 5.5.0~
+ mcp_dispatch_operation_close_channels at Base 5.5.0~
+ mcp_dispatch_operation_destroy_channels at Base 5.5.0~
+ mcp_dispatch_operation_end_delay at Base 5.5.0~
+ mcp_dispatch_operation_find_channel_by_type at Base 5.5.0~
+ mcp_dispatch_operation_get_account_path at Base 5.5.0~
+ mcp_dispatch_operation_get_cm_name at Base 5.5.0~
+ mcp_dispatch_operation_get_connection_path at Base 5.5.0~
+ mcp_dispatch_operation_get_n_channels at Base 5.5.0~
+ mcp_dispatch_operation_get_nth_channel_path at Base 5.5.0~
+ mcp_dispatch_operation_get_protocol at Base 5.5.0~
+ mcp_dispatch_operation_get_type at Base 5.5.0~
+ mcp_dispatch_operation_leave_channels at Base 5.5.0~
+ mcp_dispatch_operation_policy_check at Base 5.5.0~
+ mcp_dispatch_operation_policy_get_type at Base 5.5.0~
+ mcp_dispatch_operation_policy_iface_implement_check at Base 5.5.0~
+ mcp_dispatch_operation_ref_connection at Base 5.5.0~
+ mcp_dispatch_operation_ref_nth_channel at Base 5.5.0~
+ mcp_dispatch_operation_ref_nth_channel_properties at Base 5.5.0~
+ mcp_dispatch_operation_start_delay at Base 5.5.0~
+ mcp_list_objects at Base 5.5.0~
+ mcp_read_dir at Base 5.5.0~
+ mcp_request_deny at Base 5.5.0~
+ mcp_request_find_request_by_type at Base 5.5.0~
+ mcp_request_get_account_path at Base 5.5.0~
+ mcp_request_get_cm_name at Base 5.5.0~
+ mcp_request_get_n_requests at Base 5.5.0~
+ mcp_request_get_protocol at Base 5.5.0~
+ mcp_request_get_type at Base 5.5.0~
+ mcp_request_get_user_action_time at Base 5.5.0~
+ mcp_request_policy_check at Base 5.5.0~
+ mcp_request_policy_get_type at Base 5.5.0~
+ mcp_request_policy_iface_implement_check at Base 5.5.0~
+ mcp_request_ref_nth_request at Base 5.5.0~
+ mcp_set_debug at Base 5.5.0~
diff --git a/debian/rules b/debian/rules
index 52425bc..a7b6f29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,38 +5,36 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-# The library isn't stable, and shouldn't be used on mainstream distributions.
-#
-# mc-account-convert requires GConf which we don't want to depend on here,
-# so if we were compiled on a non-minimal system, get rid of it.
+# Having a static library for a plugin loader is pretty useless, so get rid
+# of it. We don't want the libtool stuff either, but we do want to list any
+# other missing files.
 common-binary-post-install-arch:: list-missing
 list-missing: remove-cruft
 remove-cruft:
-	rm -rf debian/tmp/usr/include
-	rm -f debian/tmp/usr/lib/libmcclient.a
-	rm -f debian/tmp/usr/lib/libmcclient.la
-	rm -rf debian/tmp/usr/lib/pkgconfig
-	rm -rf debian/tmp/usr/share/gtk-doc
-	rm -f debian/tmp/usr/bin/mc-account-convert
-	rm -f debian/tmp/usr/share/man/man1/mc-account-convert.1
+	rm -f debian/tmp/usr/lib/libmission-control-plugins*.a
+	rm -f debian/tmp/usr/lib/libmission-control-plugins*.la
 
 DEB_DH_STRIP_ARGS := --dbg-package=telepathy-mission-control-5-dbg
 
 DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/telepathy"
 
-# link the libraries statically, since they shouldn't be used outside this
-# source package
+# Explicitly disable old-style plugins, which has the side-effect of disabling
+# their associated documentation, making their libraries static, and disabling
+# their headers
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--disable-Werror \
-	--disable-gtk-doc \
-	--disable-plugins \
+	--disable-mcd-plugins \
+	--enable-gtk-doc \
 	--enable-server \
-	--disable-shared \
-	--enable-static \
-	--enable-gnome-keyring
+	--enable-gnome-keyring \
+	--with-html-dir=\$${prefix}/share/doc/libmission-control-plugins-doc
 
 # we symlink some of the doc directories together
 DEB_INSTALL_DOCS_telepathy-mission-control-5-dbg := --no-act
 DEB_INSTALL_CHANGELOGS_telepathy-mission-control-5-dbg := --no-act
+DEB_INSTALL_DOCS_libmission-control-plugins-dev := --no-act
+DEB_INSTALL_CHANGELOGS_libmission-control-plugins-dev := --no-act
+
+export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
 include $(CURDIR)/debian/update-patches.mk

-- 
MC 5 packaging

More information about the Pkg-telepathy-commits mailing list