[Pkg-xfce-commits] r2284 - in desktop/branches/svn-snapshots/xfdesktop4/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-09-09 05:59:25 +0000 (Tue, 09 Sep 2008)
New Revision: 2284

Removed:
   desktop/branches/svn-snapshots/xfdesktop4/debian/patches/01_provide-missing-desktop.patch
Modified:
   desktop/branches/svn-snapshots/xfdesktop4/debian/changelog
   desktop/branches/svn-snapshots/xfdesktop4/debian/control
   desktop/branches/svn-snapshots/xfdesktop4/debian/patches/series
   desktop/branches/svn-snapshots/xfdesktop4/debian/rules
   desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4-data.install
Log:
update for 4.5.90


Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/changelog	2008-09-09 05:58:48 UTC (rev 2283)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/changelog	2008-09-09 05:59:25 UTC (rev 2284)
@@ -1,30 +1,28 @@
 xfdesktop4 (4.5.90-1) UNRELEASED; urgency=low
 
   * new upstream alpha release.
-  * debian/patches:
-    - 07_fix-italian-typos added, thanks David Paleino.         closes: #483709
   * debian/control:
     - update standards version to 3.8.0. No change needed.
     - update build-deps for Xfce 4.6 Alpha.
     - remove useless conflicts.
+    - add build-dep on intltool.
   * debian/rules: 
     - don't install useless lintian override file
     - fail if dh_install misses files.
     - stop messing with config.{guess,sub}.
-    - fix perms on xfdesktop-xfconf-migration.pl
   * debian/lintian: dropped, now useless
   * debian/patches:
     - 01_show-backdrop-by-default dropped due to upstream changes.
     - 03_fix-memory-leak dropped, included upstream.
     - 04_fix-CRITICAL-register-message-startup too.
     - 05_simplify-free-code as well. 
-    - 07_fix-italian-typos too. 
-    - 01_fix-size-warning-amd64 added.
+    - 07_fix-italian-typos merged too.                          closes: #483709 
+    - 06_fix-size-warning-amd64 added.
   * debian/xfdesktop-data.install:
     - add /usr/share/desktop-directories files.
     - add /usr/share/applications files.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 24 Aug 2008 16:30:12 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 09 Sep 2008 07:23:57 +0200
 
 xfdesktop4 (4.4.2-7) unstable; urgency=low
 

Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/control
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/control	2008-09-09 05:58:48 UTC (rev 2283)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/control	2008-09-09 05:59:25 UTC (rev 2284)
@@ -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 (>= 5.0.0), libgtk2.0-dev (>= 2.10.1), libxft-dev, libxml2-dev, xfce4-panel-dev (>= 4.5.80), libexo-0.3-dev (>= 0.3.80), libthunar-vfs-1-dev (>= 0.9.80), chrpath, quilt, libwnck-dev, libxfconf-0-dev, libglade2-dev, libxfce4menu-0.1-dev
+Build-Depends: debhelper (>= 5.0.0), libgtk2.0-dev (>= 2.10.1), libxft-dev, libxml2-dev, xfce4-panel-dev (>= 4.5.80), libexo-0.3-dev (>= 0.3.80), libthunar-vfs-1-dev (>= 0.9.80), chrpath, quilt, libwnck-dev, libxfconf-0-dev, libglade2-dev, libxfce4menu-0.1-dev, intltool
 Standards-Version: 3.8.0
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfdesktop4/

Deleted: desktop/branches/svn-snapshots/xfdesktop4/debian/patches/01_provide-missing-desktop.patch
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/patches/01_provide-missing-desktop.patch	2008-09-09 05:58:48 UTC (rev 2283)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/patches/01_provide-missing-desktop.patch	2008-09-09 05:59:25 UTC (rev 2284)
@@ -1,13 +0,0 @@
-diff -urN xfdesktop1/scripts/xfconf-xfdesktop-migration-4.6.desktop.in xfdesktop2/scripts/xfconf-xfdesktop-migration-4.6.desktop.in
---- xfdesktop1/scripts/xfconf-xfdesktop-migration-4.6.desktop.in	1970-01-01 01:00:00.000000000 +0100
-+++ xfdesktop2/scripts/xfconf-xfdesktop-migration-4.6.desktop.in	2008-08-24 00:12:27.000000000 +0200
-@@ -0,0 +1,9 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Version=1.0
-+Name=Xfconf Xfdesktop Migration Script
-+Exec=@datadir@/xfce4/xfconf-migration/xfdesktop-xfconf-migration.pl
-+Terminal=false
-+Type=Application
-+StartupNotify=false
-+Terminal=false

Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/patches/series
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/patches/series	2008-09-09 05:58:48 UTC (rev 2283)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/patches/series	2008-09-09 05:59:25 UTC (rev 2284)
@@ -1,3 +1,2 @@
-01_provide-missing-desktop.patch
 02_use_eject_where_needed.patch
 06_fix-size-warning-amd64.patch

Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/rules
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/rules	2008-09-09 05:58:48 UTC (rev 2283)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/rules	2008-09-09 05:59:25 UTC (rev 2284)
@@ -72,9 +72,6 @@
 	dh_testdir
 	dh_testroot
 
-	# fix perms on perl migration script
-	chmod 755 $(CURDIR)/debian/tmp/usr/share/xfce4/xfconf-migration/xfdesktop-xfconf-migration.pl
-
 	# use correct Debian defaults
 	for f in $(CURDIR)/debian/tmp/etc/xdg/xfce4/desktop/menu.xml*; do \
 	   	perl -0777 -i -pe 's/cmd="xfterm4"/cmd="exo-open --launch TerminalEmulator"/; s/cmd="mozilla"/cmd="sensible-browser"/; s/(<include type="system" style="simple" unique="true"\/>)/$$1\n<separator\/>\n<menu name="Debian"><include type="file" src="menudefs.hook" \/><\/menu>\n/; s/xffm/thunar/g' $$f; \

Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4-data.install
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4-data.install	2008-09-09 05:58:48 UTC (rev 2283)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4-data.install	2008-09-09 05:59:25 UTC (rev 2284)
@@ -2,7 +2,6 @@
 usr/share/locale
 usr/share/man
 usr/share/pixmaps
-usr/share/xfce4-menueditor
 usr/share/xfce4
 usr/share/desktop-directories
 usr/share/applications