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

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/caja.git;a=commitdiff;h=b63be82

The following commit has been merged in the master branch:
commit b63be824f1554c86a01a883cd605d88a38282f82
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Feb 9 17:39:17 2014 +0100

    source package rename to 'caja', split up dbg package into two packages to meet multi-arch requirements
---
 debian/changelog |  4 ++--
 debian/control   | 56 +++++++++++++++++++++++++++++++++++++++++---------------
 debian/rules     |  3 ++-
 3 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b2bed14..0022504 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-mate-file-manager (1.6.3-1) UNRELEASED; urgency=low
+caja (1.6.3-1) UNRELEASED; urgency=low
 
-  * Initial release.
+  * Initial release. (Closes: #727061).
 
  -- Stefano Karapetsas <stefano at karapetsas.com>  Wed, 16 Oct 2013 14:33:43 +0200
  
diff --git a/debian/control b/debian/control
index 25e77bc..a8826a6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: mate-file-manager
+Source: caja
 Section: utils
 Priority: optional
 Maintainer: MATE Packaging Team <pkg-mate-team at lists.alioth.debian.org>
@@ -75,19 +75,6 @@ Description: file manager for the MATE desktop (common files)
  .
  This package contains the architecture independent files.
 
-Package: caja-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends},
-         caja (= ${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-extension1
 Section: libs
 Architecture: any
@@ -109,7 +96,7 @@ Description: libraries for caja components
 Package: libcaja-extension-dev
 Section: libdevel
 Architecture: any
-Multi-Arch: foreign
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libcaja-extension1 (= ${binary:Version}),
@@ -131,3 +118,42 @@ Description: GObject introspection data for the caja library
  .
  It can be used by packages using the GIRepository format to generate 
  dynamic bindings.
+
+Package: caja-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends},
+         caja (= ${binary:Version}),
+         libcaja-extension1 (= ${binary:Version})
+Description: file manager for the MATE desktop (debugging symbols)
+ Caja is the official file manager for the MATE desktop. It allows
+ to browse directories, preview files and launch applications associated
+ with them. It is also responsible for handling the icons on the MATE
+ desktop. It works on local and remote filesystems.
+ .
+ This package contains debugging symbols for the Caja file manager.
+ .
+ The debugging symbols are installed in /usr/lib/debug and will
+ automatically be used by gdb.
+
+Package: libcaja-extension1-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc: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 (debugging symbols)
+ Caja is the official file manager for the MATE desktop.
+ .
+ This package contains debugging symbols for caja's extension libraries
+ .
+ The debugging symbols are installed in /usr/lib/debug and will
+ automatically be used by gdb.
diff --git a/debian/rules b/debian/rules
index 9c99ade..b0b11cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,8 @@ override_dh_auto_test:
 	DEB_BUILD_OPTIONS=nocheck dh_auto_test
 
 override_dh_strip:
-	dh_strip --dbg-package=caja-dbg
+	dh_strip -pcaja --dbg-package=caja-dbg
+	dh_strip -plibcaja-extensions1 --dbg-package=libcaja-extensions1-dbg
 
 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version --destdir=..

-- 
mate-file-manager Debian package