r11569 - in /packages/experimental/update-manager/debian: changelog patches/01_fhs_script_location.diff rules

[kov at users.alioth.debian.org]

Author: kov
Date: Mon Jun 18 18:44:48 2007
New Revision: 11569

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11569
Log:
make sure update-manager is installed in /usr/sbin

Added:
    packages/experimental/update-manager/debian/patches/01_fhs_script_location.diff
Modified:
    packages/experimental/update-manager/debian/changelog
    packages/experimental/update-manager/debian/rules

Modified: packages/experimental/update-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-manager/debian/changelog?rev=11569&op=diff
==============================================================================
--- packages/experimental/update-manager/debian/changelog (original)
+++ packages/experimental/update-manager/debian/changelog Mon Jun 18 18:44:48 2007
@@ -7,8 +7,11 @@
     because it provides the aptsources module
   - make update-manager-core conflict with previous versions of
     update-manager, since they share files
-
- -- Gustavo Noronha Silva <kov at debian.org>  Sat, 09 Jun 2007 11:50:10 -0300
+  * debian/rules, debian/patches/01_fhs_script_location.diff:
+  - make sure the update-manager script is installed in /usr/sbin
+    (Closes: #411890)
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Mon, 18 Jun 2007 19:39:25 +0100
 
 update-manager (0.59.20-1) experimental; urgency=low
 

Added: packages/experimental/update-manager/debian/patches/01_fhs_script_location.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-manager/debian/patches/01_fhs_script_location.diff?rev=11569&op=file
==============================================================================
--- packages/experimental/update-manager/debian/patches/01_fhs_script_location.diff (added)
+++ packages/experimental/update-manager/debian/patches/01_fhs_script_location.diff Mon Jun 18 18:44:48 2007
@@ -1,0 +1,11 @@
+--- data/update-manager.desktop.in~	2007-01-29 12:18:06.000000000 +0000
++++ data/update-manager.desktop.in	2007-06-18 19:36:17.000000000 +0100
+@@ -2,7 +2,7 @@
+ _Name=Update Manager
+ _GenericName=System Update Tool
+ _Comment=Show and install available updates
+-Exec=/usr/bin/update-manager
++Exec=/usr/sbin/update-manager
+ Icon=update-manager
+ Terminal=false
+ Type=Application

Modified: packages/experimental/update-manager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-manager/debian/rules?rev=11569&op=diff
==============================================================================
--- packages/experimental/update-manager/debian/rules (original)
+++ packages/experimental/update-manager/debian/rules Mon Jun 18 18:44:48 2007
@@ -27,14 +27,15 @@
 	done
 
 binary-post-install/update-manager::
-	# replace Ubuntu logo with Debian one
-	# FIXME - no longer needed; may be needed in software-properties
-	#uudecode < debian/software-properties.png.uu && \
-	#	mv software-properties.png \
-	#		debian/update-manager/usr/share/icons/hicolor/48x48/apps/
 	# install default configuration for the APT::Periodic feature
 	install -D -m 644 -o root -g root debian/10periodic \
 		debian/update-manager/etc/apt/apt.conf.d/10periodic
+
+	# fix update-manager's location; it's a program that needs
+	# root privileges to run
+	mkdir debian/update-manager/usr/sbin/
+	mv debian/update-manager/usr/bin/update-manager \
+		debian/update-manager/usr/sbin/
 
 	# FIXME - should actually be integrated upstream for lenny
 	#rm -rf debian/update-manager/usr/share/gnome/help/update-manager/C