[Pkg-xfce-commits] r2604 - desktop/branches/svn-snapshots/thunar/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2009-01-14 10:22:44 +0000 (Wed, 14 Jan 2009)
New Revision: 2604

Added:
   desktop/branches/svn-snapshots/thunar/debian/libthunar-vfs-1-2.lintian-overrides
Removed:
   desktop/branches/svn-snapshots/thunar/debian/lintian.libthunar-vfs-1-2
Modified:
   desktop/branches/svn-snapshots/thunar/debian/changelog
   desktop/branches/svn-snapshots/thunar/debian/control
   desktop/branches/svn-snapshots/thunar/debian/rules
Log:
  - add ${misc:Depends} to various Depends: line.
* rename lintian override file so it's taken by dh_lintian.
* debian/rules:
  - don't install lintian override, it's done by dh_lintian.
  - call dh_desktop in binary-install.

Modified: desktop/branches/svn-snapshots/thunar/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/thunar/debian/changelog	2009-01-14 09:07:08 UTC (rev 2603)
+++ desktop/branches/svn-snapshots/thunar/debian/changelog	2009-01-14 10:22:44 UTC (rev 2604)
@@ -40,13 +40,18 @@
   * debian/control:
     - update build-deps for “Tuco-Tuco”.
     - add build-dep on intltool.
+    - add ${misc:Depends} to various Depends: line.
   * debian/libthunar-vfs-1-2.shlibs: bump shlibs.
   * debian/patches:
     - 02_fix-fam-closing-treeview dropped, merged upstream.
     - 03_eject-handling as well.
     - 04_fix-listview-focus-deleted finally.
+  * rename lintian override file so it's taken by dh_lintian.
+  * debian/rules:
+    - don't install lintian override, it's done by dh_lintian.
+    - call dh_desktop in binary-install.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 12 Jan 2009 23:18:23 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 14 Jan 2009 10:42:49 +0100
 
 thunar (0.9.0-10) unstable; urgency=low
 

Modified: desktop/branches/svn-snapshots/thunar/debian/control
===================================================================
--- desktop/branches/svn-snapshots/thunar/debian/control	2009-01-14 09:07:08 UTC (rev 2603)
+++ desktop/branches/svn-snapshots/thunar/debian/control	2009-01-14 10:22:44 UTC (rev 2604)
@@ -18,7 +18,8 @@
 Package: libthunar-vfs-1-dev
 Section: libdevel
 Architecture: any
-Depends: libthunar-vfs-1-2 (= ${binary:Version}), libexo-0.3-dev (>= 0.3.93), thunar-data (= ${source:Version})
+Depends: libthunar-vfs-1-2 (= ${binary:Version}), 
+ libexo-0.3-dev (>= 0.3.93), thunar-data (=${source:Version}), ${misc:Depends}
 Description: Development files for libthunar-vfs
  This package contains the headers and the static library for libthunar-vfs, 
  the virtual file system abstraction used by thunar
@@ -26,7 +27,7 @@
 Package: libthunar-vfs-1-2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, thunar-data (= ${source:Version})
+Depends: ${shlibs:Depends}, thunar-data (= ${source:Version}), ${misc:Depends}
 Replaces: libthunar-vfs-1
 Description: VFS abstraction used in thunar
  This package contains a library for virtual file system abstraction. It's 
@@ -48,6 +49,7 @@
 
 Package: thunar-data
 Architecture: all
+Depends: ${misc:Depends}
 Replaces: thunar (<= 0.8.0-3)
 Description: Provides thunar documentation, icons and translations
  This package contains architecture-independent files for thunar.
@@ -55,7 +57,7 @@
 Package: thunar-dbg
 Architecture: any
 Priority: extra
-Depends: ${shlibs:Depends}, thunar (= ${binary:Version})
+Depends: ${shlibs:Depends}, thunar (= ${binary:Version}), ${misc:Depends}
 Description: debugging informations for thunar
  This package contains debugging symbols for thunar, libthunar-vfs and 
  libthunar-x, the file manager and file management libraries for Xfce Desktop

Copied: desktop/branches/svn-snapshots/thunar/debian/libthunar-vfs-1-2.lintian-overrides (from rev 2578, desktop/branches/svn-snapshots/thunar/debian/lintian.libthunar-vfs-1-2)
===================================================================
--- desktop/branches/svn-snapshots/thunar/debian/libthunar-vfs-1-2.lintian-overrides	                        (rev 0)
+++ desktop/branches/svn-snapshots/thunar/debian/libthunar-vfs-1-2.lintian-overrides	2009-01-14 10:22:44 UTC (rev 2604)
@@ -0,0 +1,2 @@
+#private
+libthunar-vfs-1-2: package-name-doesnt-match-sonames libthunar-vfs-1-2 libthunarx-1-0


Property changes on: desktop/branches/svn-snapshots/thunar/debian/libthunar-vfs-1-2.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: desktop/branches/svn-snapshots/thunar/debian/lintian.libthunar-vfs-1-2
===================================================================
--- desktop/branches/svn-snapshots/thunar/debian/lintian.libthunar-vfs-1-2	2009-01-14 09:07:08 UTC (rev 2603)
+++ desktop/branches/svn-snapshots/thunar/debian/lintian.libthunar-vfs-1-2	2009-01-14 10:22:44 UTC (rev 2604)
@@ -1,2 +0,0 @@
-#private
-libthunar-vfs-1: package-name-doesnt-match-sonames libthunar-vfs-1-0 libthunarx-1-0

Modified: desktop/branches/svn-snapshots/thunar/debian/rules
===================================================================
--- desktop/branches/svn-snapshots/thunar/debian/rules	2009-01-14 09:07:08 UTC (rev 2603)
+++ desktop/branches/svn-snapshots/thunar/debian/rules	2009-01-14 10:22:44 UTC (rev 2604)
@@ -31,6 +31,9 @@
 	install -m 0644 $(CURDIR)/debian/gnome-obex-send.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
 	install -m 0644 $(CURDIR)/debian/xfprint.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
 
+binary-install/thunar::
+	dh_desktop
+
 binary-post-install/thunar-data::
 	rm -rf $(CURDIR)/debian/thunar-data/usr/share/applications
 	rm -rf $(CURDIR)/debian/thunar-data/usr/share/xfce4/
@@ -44,7 +47,6 @@
 		rm -rf thunar && ln  -sf thunar-data thunar
 
 binary-post-install/libthunar-vfs-1-2::
-	install -D -p -o root -g root -m 644 debian/lintian.libthunar-vfs-1-2 $(CURDIR)/debian/libthunar-vfs-1-2/usr/share/lintian/overrides/libthunar-vfs-1-2/lintian
 	cd $(CURDIR)/debian/libthunar-vfs-1-2/usr/share/doc/ && \
 		rm -rf libthunar-vfs-1-2 && \
 		ln  -sf thunar-data libthunar-vfs-1-2