[Pkg-xfce-commits] r2436 - desktop/branches/svn-snapshots/xfce4-session/debian

Fri Oct 17 06:29:01 UTC 2008

Author: corsac
Date: 2008-10-17 06:29:01 +0000 (Fri, 17 Oct 2008)
New Revision: 2436

Added:
   desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.lintian-overrides
Removed:
   desktop/branches/svn-snapshots/xfce4-session/debian/lintian
Modified:
   desktop/branches/svn-snapshots/xfce4-session/debian/changelog
   desktop/branches/svn-snapshots/xfce4-session/debian/compat
   desktop/branches/svn-snapshots/xfce4-session/debian/control
   desktop/branches/svn-snapshots/xfce4-session/debian/rules
Log:
  - update build-dep on debhelper for a version with dh_lintian
* debian/rules:
  - don't manually install lintian overrides, use dh_lintian
* debian/lintian renamed to debian/xfce4-session.lintian-overrides.

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/changelog
===================================================================

--- desktop/branches/svn-snapshots/xfce4-session/debian/changelog	2008-10-17 06:21:16 UTC (rev 2435)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/changelog	2008-10-17 06:29:01 UTC (rev 2436)
@@ -18,6 +18,7 @@
   * debian/control:
     - update build-deps for Fuzzy.
     - add build dep on libxfconf-0-dev, libglade2-dev.
+    - update build-dep on debhelper for a version with dh_lintian
   * debian/patches:
     - 02_use-mice-as-default-engine dropped.
     - 07_parallel-startup removed, included upstream.
@@ -25,8 +26,11 @@
   * debian/xfce4-session.xml:
     - ship a xfconf config file for selecting the simple engine, put it in
       desktop-base dirs until we can ship it in desktop-base package.
+  * debian/rules:
+    - don't manually install lintian overrides, use dh_lintian
+  * debian/lintian renamed to debian/xfce4-session.lintian-overrides.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 17 Oct 2008 08:20:20 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 17 Oct 2008 08:22:22 +0200
 
 xfce4-session (4.4.2-6) unstable; urgency=low
 

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/compat
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/compat	2008-10-17 06:21:16 UTC (rev 2435)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/compat	2008-10-17 06:29:01 UTC (rev 2436)
@@ -1 +1 @@
-4
+6

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/control
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/control	2008-10-17 06:21:16 UTC (rev 2435)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/control	2008-10-17 06:29:01 UTC (rev 2436)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxml-parser-perl, chrpath,
+Build-Depends: debhelper (>= 6.0.7), libx11-dev, libxml-parser-perl, chrpath,
  quilt, fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, 
  libxfce4util-dev (>= 4.5.91), libxfcegui4-dev (>= 4.5.91), libwnck-dev, 
  x11-xserver-utils, libxfconf-0-dev (>= 4.5.91), libglade2-dev

Deleted: desktop/branches/svn-snapshots/xfce4-session/debian/lintian
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/lintian	2008-10-17 06:21:16 UTC (rev 2435)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/lintian	2008-10-17 06:29:01 UTC (rev 2436)
@@ -1,11 +0,0 @@
-xfce4-session: no-shlibs-control-file usr/lib/libxfsm-4.2.so.0.0.1
-xfce4-session: postinst-must-call-ldconfig usr/lib/libxfsm-4.2.so.0.0.1
-xfce4-session: non-dev-pkg-with-shlib-symlink usr/lib/libxfsm-4.2.so.0.0.1 usr/lib/libxfsm-4.2.so
-xfce4-session: package-name-doesnt-match-sonames libxfsm-4.2-0
-# These are all private
-xfce4-session: binary-without-manpage usr/sbin/balou-export-theme
-xfce4-session: binary-without-manpage usr/sbin/balou-install-theme
-xfce4-session: binary-without-manpage usr/sbin/xfsm-shutdown-helper
-# We depend on xfce-mcs-manager
-xfce4-session: desktop-command-not-in-package /usr/share/applications/xfce-session-settings.desktop xfce-setting-show
-xfce4-session: desktop-command-not-in-package /usr/share/applications/xfce-splash-settings.desktop xfce-setting-show

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/rules
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/rules	2008-10-17 06:21:16 UTC (rev 2435)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/rules	2008-10-17 06:29:01 UTC (rev 2436)
@@ -66,10 +66,10 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
+	dh_lintian
 
 	# Add here commands to install the package into debian/xfce4-session.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-session
-	install -p -o root -g root -m 644 debian/lintian $(CURDIR)/debian/xfce4-session/usr/share/lintian/overrides/xfce4-session
 	rm -f $(CURDIR)/debian/xfce4-session/usr/lib/xfce4/splash/engines/*.la
 	rm -f $(CURDIR)/debian/xfce4-session/usr/lib/*.la
 

Copied: desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.lintian-overrides (from rev 2428, desktop/branches/svn-snapshots/xfce4-session/debian/lintian)
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.lintian-overrides	                        (rev 0)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.lintian-overrides	2008-10-17 06:29:01 UTC (rev 2436)
@@ -0,0 +1,6 @@
+xfce4-session: non-dev-pkg-with-shlib-symlink usr/lib/libxfsm-4.6.so.0.0.1 usr/lib/libxfsm-4.6.so
+xfce4-session: package-name-doesnt-match-sonames libxfsm-4.6-0
+# These are all private
+xfce4-session: binary-without-manpage usr/sbin/balou-export-theme
+xfce4-session: binary-without-manpage usr/sbin/balou-install-theme
+xfce4-session: binary-without-manpage usr/sbin/xfsm-shutdown-helper


Property changes on: desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 


