[SCM] mate-file-manager Debian package branch, master, updated. 7fdbde7946f75b289872cd0462aef2dd691de9d8

Stefano Karapetsas stefanokarapetsas-guest at alioth.debian.org
Wed Oct 16 12:59:37 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-file-manager.git;a=commitdiff;h=1cb14a1

The following commit has been merged in the master branch:
commit 1cb14a1f9059f12d04d10151e8fdf6a3352ca853
Author: Stefano Karapetsas <stefano at karapetsas.com>
Date:   Wed Oct 16 14:58:45 2013 +0200

    Update to use debhelper instead of cdbs
    Rename lib package to respect soname
    Add symbols file
---
 debian/caja.install                  |    2 +-
 debian/control                       |   24 +++++++-------
 debian/libcaja-extension-dev.install |    4 +--
 debian/libcaja-extension.install     |    2 --
 debian/libcaja-extension1.install    |    2 ++
 debian/libcaja-extension1.symbols    |   57 ++++++++++++++++++++++++++++++++++
 debian/rules                         |   31 +++++++++---------
 7 files changed, 92 insertions(+), 30 deletions(-)

diff --git a/debian/caja.install b/debian/caja.install
index 8d4d811..831cfa0 100644
--- a/debian/caja.install
+++ b/debian/caja.install
@@ -1,4 +1,4 @@
 usr/bin/
 usr/share/applications/
-usr/share/caja/
 usr/share/man/
+usr/share/mate-file-manager/
diff --git a/debian/control b/debian/control
index 359eca7..92e2522 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,9 @@ Section: utils
 Priority: optional
 Maintainer: Stefano Karapetsas <stefano at karapetsas.com>
 Uploaders: Steve Zesch <stevezesch2 at gmail.com>
-Build-Depends: debhelper (>= 8),
-               cdbs,
-               quilt,
+Build-Depends: debhelper (>= 9),
                libglib2.0-dev,
-               libmatedesktop-dev,
+               libmate-desktop-dev | libmatedesktop-dev,
                libpango1.0-dev,
                libgtk2.0-dev,
                libxml2-dev,
@@ -34,9 +32,8 @@ Build-Depends: debhelper (>= 8),
                gir1.2-glib-2.0, 
                gir1.2-gtk-2.0, 
                gir1.2-pango-1.0,
-               libgirepository1.0-dev,
-               automake1.11
-Standards-Version: 3.9.3
+               libgirepository1.0-dev
+Standards-Version: 3.9.4
 Homepage: http://www.mate-desktop.org/
 
 Package: caja
@@ -48,7 +45,7 @@ Depends: ${shlibs:Depends},
          libglib2.0-data,
          mate-desktop,
          gvfs,
-         libcaja-extension (= ${binary:Version}),
+         libcaja-extension1 (= ${binary:Version}),
          caja-common (= ${source:Version})
 Suggests: gstreamer0.10-tools,
           meld,
@@ -78,18 +75,23 @@ Priority: extra
 Architecture: any
 Depends: ${misc:Depends},
          caja (= ${binary:Version}),
-         libcaja-extension (= ${binary:Version})
+         libcaja-extension1 (= ${binary:Version})
 Description: file manager for the MATE desktop (debugging symbols)
  This package contains debugging symbols for caja and the
  libcaja-extension library. It is provided to help debugging problems.
  The debugging symbols are installed in /usr/lib/debug and will
  automatically be used by gdb.
 
-Package: libcaja-extension
+Package: libcaja-extension1
 Section: libs
 Architecture: any
+Pre-Depends: multiarch-support
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Replaces: libcaja-extension
+Breaks: libcaja-extension
+Conflicts: libcaja-extension
+Provides: libcaja-extension
 Description: libraries for caja components
  Caja is the official file manager for the MATE desktop.
  .
@@ -101,7 +103,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libcaja-extension (= ${binary:Version}),
+         libcaja-extension1 (= ${binary:Version}),
          libgtk2.0-dev
 Description: libraries for caja components (development files)
  Caja is the official file manager for the MATE desktop.
diff --git a/debian/libcaja-extension-dev.install b/debian/libcaja-extension-dev.install
index 6d1c52f..3173706 100644
--- a/debian/libcaja-extension-dev.install
+++ b/debian/libcaja-extension-dev.install
@@ -1,4 +1,4 @@
 usr/include/
-usr/lib/*.so
-usr/lib/pkgconfig/
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/
 usr/share/gtk-doc/
diff --git a/debian/libcaja-extension.install b/debian/libcaja-extension.install
deleted file mode 100644
index 149d1d0..0000000
--- a/debian/libcaja-extension.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*.so.*
-usr/lib/caja/
\ No newline at end of file
diff --git a/debian/libcaja-extension1.install b/debian/libcaja-extension1.install
new file mode 100644
index 0000000..38d054a
--- /dev/null
+++ b/debian/libcaja-extension1.install
@@ -0,0 +1,2 @@
+usr/lib/*/*.so.*
+usr/lib/*/caja/
\ No newline at end of file
diff --git a/debian/libcaja-extension1.symbols b/debian/libcaja-extension1.symbols
new file mode 100644
index 0000000..3d61eb2
--- /dev/null
+++ b/debian/libcaja-extension1.symbols
@@ -0,0 +1,57 @@
+libcaja-extension.so.1.4.0 libcaja-extension1 #MINVER#
+ caja_file_info_lookup at Base 1.6.2
+ caja_property_page_get_type at Base 1.6.2
+ caja_menu_item_activate at Base 1.6.2
+ caja_file_info_add_string_attribute at Base 1.6.2
+ caja_file_info_get_uri_scheme at Base 1.6.2
+ caja_location_widget_provider_get_widget at Base 1.6.2
+ caja_menu_get_items at Base 1.6.2
+ caja_file_info_invalidate_extension_info at Base 1.6.2
+ caja_info_provider_cancel_update at Base 1.6.2
+ caja_file_info_get_mount at Base 1.6.2
+ caja_file_info_get_activation_uri at Base 1.6.2
+ caja_file_info_get_string_attribute at Base 1.6.2
+ caja_file_info_list_copy at Base 1.6.2
+ caja_property_page_provider_get_pages at Base 1.6.2
+ caja_menu_item_list_free at Base 1.6.2
+ caja_file_info_get_mime_type at Base 1.6.2
+ caja_file_info_getter at Base 1.6.2
+ caja_property_page_new at Base 1.6.2
+ caja_file_info_get_location at Base 1.6.2
+ caja_file_info_get_type at Base 1.6.2
+ caja_column_provider_get_columns at Base 1.6.2
+ caja_menu_item_get_type at Base 1.6.2
+ caja_file_info_is_mime_type at Base 1.6.2
+ caja_property_page_provider_get_type at Base 1.6.2
+ caja_column_new at Base 1.6.2
+ caja_menu_provider_get_file_items at Base 1.6.2
+ caja_file_info_get_parent_info at Base 1.6.2
+ caja_location_widget_provider_get_type at Base 1.6.2
+ caja_info_provider_update_file_info at Base 1.6.2
+ caja_menu_item_new at Base 1.6.2
+ caja_file_info_get_file_type at Base 1.6.2
+ caja_file_info_get_uri at Base 1.6.2
+ caja_info_provider_get_type at Base 1.6.2
+ caja_info_provider_update_complete_invoke at Base 1.6.2
+ caja_file_info_create_for_uri at Base 1.6.2
+ caja_file_info_can_write at Base 1.6.2
+ caja_column_get_type at Base 1.6.2
+ caja_file_info_create at Base 1.6.2
+ caja_file_info_get_name at Base 1.6.2
+ caja_file_info_get_parent_uri at Base 1.6.2
+ caja_column_provider_get_type at Base 1.6.2
+ caja_menu_provider_get_background_items at Base 1.6.2
+ caja_file_info_is_directory at Base 1.6.2
+ caja_file_info_get_parent_location at Base 1.6.2
+ caja_file_info_add_emblem at Base 1.6.2
+ caja_file_info_is_gone at Base 1.6.2
+ caja_menu_item_set_submenu at Base 1.6.2
+ caja_menu_new at Base 1.6.2
+ caja_menu_provider_get_toolbar_items at Base 1.6.2
+ caja_operation_result_get_type at Base 1.6.2
+ caja_file_info_lookup_for_uri at Base 1.6.2
+ caja_file_info_list_free at Base 1.6.2
+ caja_menu_provider_emit_items_updated_signal at Base 1.6.2
+ caja_menu_get_type at Base 1.6.2
+ caja_menu_provider_get_type at Base 1.6.2
+ caja_menu_append_item at Base 1.6.2
diff --git a/debian/rules b/debian/rules
index 3e922c6..5ff6f27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,25 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+	dh $@
 
-DEB_DH_INSTALL_ARGS += --list-missing
+override_dh_install:
+	rm -fv debian/tmp/usr/lib/*/*.la
+	rm -rfv debian/tmp/usr/share/omf/
+	rm -rfv debian/tmp/usr/share/help/
+	dh_install --list-missing
 
-DEB_CONFIGURE_SCRIPT := ./autogen.sh
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libexecdir=/usr/lib/caja \
+		--disable-update-mimedb \
+		--disable-static \
+		--localstatedir=/var \
+		--enable-unique \
+		--enable-introspection
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/caja \
-                             --disable-update-mimedb \
-                             --disable-static \
-                             --localstatedir=/var \
-                             --enable-unique \
-                             --enable-introspection
-
-binary-post-install/caja::
-	dh_installmime -p$(cdbs_curpkg)
+override_dh_strip:
+	dh_strip --dbg-package=caja-dbg
 
 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version --destdir=..

-- 
mate-file-manager Debian package



More information about the pkg-mate-commits mailing list