r16340 - in /packages/unstable/update-manager/debian: changelog rules update-manager-core.docs update-manager-core.install update-manager.install

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Jun 25 14:28:46 2008
New Revision: 16340

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16340
Log:
* Remove the insane python2.4 shebangs set by distutils, grrrr.
  Closes: #485588.
  + update-manager-core.{install,docs}: don't use the installed 
    do-release-upgrade but the one from the sources.
  + update-manager.install: same for update-manager.
* Replace some manual changes in post-install by lines in *.install.

Added:
    packages/unstable/update-manager/debian/update-manager-core.docs
Modified:
    packages/unstable/update-manager/debian/changelog
    packages/unstable/update-manager/debian/rules
    packages/unstable/update-manager/debian/update-manager-core.install
    packages/unstable/update-manager/debian/update-manager.install

Modified: packages/unstable/update-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/changelog?rev=16340&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/changelog (original)
+++ packages/unstable/update-manager/debian/changelog Wed Jun 25 14:28:46 2008
@@ -1,8 +1,17 @@
 update-manager (0.68.debian-6) UNRELEASED; urgency=low
 
+  [ Thibaut Paumard ]
   * Bug fix: 'update-manager: trailing garbage of translated "Not all
     updates can be installed" message', thanks to Daiki Ueno (Closes:
     #477979).
+
+  [ Josselin Mouette ]
+  * Remove the insane python2.4 shebangs set by distutils, grrrr.
+    Closes: #485588.
+    + update-manager-core.{install,docs}: don't use the installed 
+      do-release-upgrade but the one from the sources.
+    + update-manager.install: same for update-manager.
+  * Replace some manual changes in post-install by lines in *.install.
 
  -- Thibaut Paumard <paumard at users.sourceforge.net>  Mon, 23 Jun 2008 17:06:38 +0200
 

Modified: packages/unstable/update-manager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/rules?rev=16340&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/rules (original)
+++ packages/unstable/update-manager/debian/rules Wed Jun 25 14:28:46 2008
@@ -34,17 +34,7 @@
 		cp -af $${pofile} po/; \
 	done
 
-binary-post-install/update-manager::
-	# 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/
-
+# binary-post-install/update-manager::
 	# FIXME - should actually be integrated upstream for lenny
 	#rm -rf debian/update-manager/usr/share/gnome/help/update-manager/C
 	#uudecode < debian/manual.tar.uu && \

Added: packages/unstable/update-manager/debian/update-manager-core.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/update-manager-core.docs?rev=16340&op=file
==============================================================================
--- packages/unstable/update-manager/debian/update-manager-core.docs (added)
+++ packages/unstable/update-manager/debian/update-manager-core.docs Wed Jun 25 14:28:46 2008
@@ -1,0 +1,1 @@
+do-release-upgrade

Modified: packages/unstable/update-manager/debian/update-manager-core.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/update-manager-core.install?rev=16340&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/update-manager-core.install (original)
+++ packages/unstable/update-manager/debian/update-manager-core.install Wed Jun 25 14:28:46 2008
@@ -1,4 +1,3 @@
-debian/tmp/usr/bin/do-release-upgrade usr/share/doc/update-manager-core/
 debian/tmp/usr/share/locale
 debian/tmp/usr/lib/python*/site-packages/UpdateManager/Core
 debian/tmp/usr/lib/python*/site-packages/UpdateManager/fdsend.so

Modified: packages/unstable/update-manager/debian/update-manager.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/update-manager.install?rev=16340&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/update-manager.install (original)
+++ packages/unstable/update-manager/debian/update-manager.install Wed Jun 25 14:28:46 2008
@@ -1,4 +1,5 @@
-debian/tmp/usr/bin/update-manager
+update-manager /usr/sbin/
+debian/10periodic /etc/apt/apt.conf.d/
 debian/tmp/usr/share/update-manager
 debian/tmp/usr/share/gnome
 debian/tmp/usr/share/omf