[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian, updated. debian/5.5.0-3-6-gd2cd22f

Simon McVittie smcv at debian.org
Wed Jun 16 13:02:19 UTC 2010 

The following commit has been merged in the debian branch:
commit 3ba1148d8cc2ad2481d2f38a7d34c0380e648691
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jun 16 13:19:57 2010 +0100

    Roll back to version 5.4.x for unstable.

diff --git a/debian/changelog b/debian/changelog
index a165d10..48c78c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+telepathy-mission-control-5 (1:5.4.3-1) UNRELEASED; urgency=low
+
+  * Roll back to version 5.4.x for unstable.
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 16 Jun 2010 13:14:59 +0100
+
 telepathy-mission-control-5 (5.5.0-3) unstable; urgency=low
 
   * Merge from experimental into unstable. We've decided to keep 5.5.x in
diff --git a/debian/control b/debian/control
index c0af02f..4b05d74 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,11 @@ Uploaders: Simon McVittie <smcv at debian.org>,
            Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 5),
-               gtk-doc-tools,
                libdbus-1-dev (>= 1.0),
-               libdbus-glib-1-dev (>= 0.82),
-               libglib2.0-dev (>= 2.24),
+               libdbus-glib-1-dev (>= 0.80),
+               libglib2.0-dev (>= 2.16),
                libgnome-keyring-dev,
-               libtelepathy-glib-dev (>= 0.11.6),
+               libtelepathy-glib-dev (>= 0.8),
                pkg-config (>= 0.21),
                python (>= 2.5),
                xsltproc
@@ -24,8 +23,7 @@ Homepage: http://telepathy.freedesktop.org/wiki/
 Package: telepathy-mission-control-5
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libmission-control-plugins0 (= ${binary:Version})
+         ${misc:Depends}
 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
@@ -56,35 +54,3 @@ 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
deleted file mode 100644
index 9426e4b..0000000
--- a/debian/libmission-control-plugins-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 777c6ec..0000000
--- a/debian/libmission-control-plugins-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 6ae8af3..0000000
--- a/debian/libmission-control-plugins-doc.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 1359ff3..0000000
--- a/debian/libmission-control-plugins-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 6f77dd4..0000000
--- a/debian/libmission-control-plugins-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index be66249..0000000
--- a/debian/libmission-control-plugins0.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libmission-control-plugins.so.0*
diff --git a/debian/libmission-control-plugins0.symbols b/debian/libmission-control-plugins0.symbols
deleted file mode 100644
index f3a2fff..0000000
--- a/debian/libmission-control-plugins0.symbols
+++ /dev/null
@@ -1,61 +0,0 @@
-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 a7b6f29..9b94aa0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,14 +5,20 @@ 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
 
-# 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.
+# 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.
 common-binary-post-install-arch:: list-missing
 list-missing: remove-cruft
 remove-cruft:
-	rm -f debian/tmp/usr/lib/libmission-control-plugins*.a
-	rm -f debian/tmp/usr/lib/libmission-control-plugins*.la
+	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
 
 DEB_DH_STRIP_ARGS := --dbg-package=telepathy-mission-control-5-dbg
 
@@ -23,18 +29,16 @@ DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/telepathy"
 # their headers
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--disable-Werror \
+	--disable-gtk-doc \
+	--disable-plugins \
 	--disable-mcd-plugins \
-	--enable-gtk-doc \
 	--enable-server \
-	--enable-gnome-keyring \
-	--with-html-dir=\$${prefix}/share/doc/libmission-control-plugins-doc
+	--disable-shared \
+	--enable-static \
+	--enable-gnome-keyring
 
 # 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