r20953 - in /packages/unstable/update-manager/debian: changelog control.in patches/ patches/00_reportbug_bashisms_r1538.patch rules

[speijnik-guest at users.alioth.debian.org]

Author: speijnik-guest
Date: Sun Aug 16 22:46:43 2009
New Revision: 20953

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20953
Log:
debian/rules:
 - Removed dh_desktop call (deprecated).

debian/patches/00_reportbug_bashisms_r1538.patch:
 - Added patch from upstream repository to fix bashisms in debian_reportbug.sh.

Added:
    packages/unstable/update-manager/debian/patches/
    packages/unstable/update-manager/debian/patches/00_reportbug_bashisms_r1538.patch
Modified:
    packages/unstable/update-manager/debian/changelog
    packages/unstable/update-manager/debian/control.in
    packages/unstable/update-manager/debian/rules

Modified: packages/unstable/update-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/changelog?rev=20953&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/changelog [utf-8] (original)
+++ packages/unstable/update-manager/debian/changelog [utf-8] Sun Aug 16 22:46:43 2009
@@ -1,4 +1,4 @@
-update-manager (1:0.200.0~rc1) unstable; urgency=low
+update-manager (1:0.200.0~rc1-1) unstable; urgency=low
 
   * New upstream release. 
   * meta-release functionality is now disabled for Debian. Closes: #515965
@@ -12,10 +12,12 @@
   * Distribution-specific code. Closes: #415376  
   * Complete rework of update-manager. Closes: #480504, #454686, #519320
   * Automatic bug reporting via reportbug.
+  * Added patch from upstream revision 1538 to fix bashisms in
+    data/bug_script/debian_bugreport.sh.
   * Synaptic not needed anymore, replaced with python-apt.
   * Somewhat experimental, please report all problems.
 
- -- Stephan Peijnik <debian at sp.or.at>  Sun, 16 Aug 2009 22:40:07 +0200
+ -- Stephan Peijnik <debian at sp.or.at>  Mon, 17 Aug 2009 00:45:44 +0200
 
 update-manager (0.68.debian-7) unstable; urgency=low
 

Modified: packages/unstable/update-manager/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/control.in?rev=20953&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/control.in [utf-8] (original)
+++ packages/unstable/update-manager/debian/control.in [utf-8] Sun Aug 16 22:46:43 2009
@@ -32,7 +32,8 @@
 	 ${misc:Depends}, 
 	 lsb-release,
 	 python-apt (>= 0.7.11.1), 
-	 gksu
+	 gksu,
+	 sudo
 Recommends: update-manager-gnome (= ${source:Version})
 Replaces: update-manager (<< 1:0.93.7)
 Conflicts: update-manager (<< 1:0.93.7)
@@ -66,7 +67,7 @@
 	 python-gtk2, 
 	 gksu, 
 	 python-gobject (>= 2.16.1),
-	 python-vte
+	 python-vte	 
 Replaces: update-manager (<< 0.200.0~pre0)
 Conflicts: update-manager (<< 0.200.0~pre0)
 Suggests: update-notifier, software-properties-gtk

Added: packages/unstable/update-manager/debian/patches/00_reportbug_bashisms_r1538.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/patches/00_reportbug_bashisms_r1538.patch?rev=20953&op=file
==============================================================================
--- packages/unstable/update-manager/debian/patches/00_reportbug_bashisms_r1538.patch (added)
+++ packages/unstable/update-manager/debian/patches/00_reportbug_bashisms_r1538.patch [utf-8] Sun Aug 16 22:46:43 2009
@@ -1,0 +1,29 @@
+=== modified file 'data/bug_script/debian_reportbug.sh'
+--- data/bug_script/debian_reportbug.sh	2009-08-16 09:50:11 +0000
++++ data/bug_script/debian_reportbug.sh	2009-08-16 21:59:57 +0000
+@@ -27,7 +27,7 @@
+     exit 1
+ fi
+ 
+-function invoke_as_user()
++invoke_as_user()
+ {
+     user=$1
+     command=$2
+@@ -41,7 +41,7 @@
+     fi
+ }
+ 
+-if [ "$UID" == "0" ]
++if [ "$(id -ru)" = "0" ]
+ then
+     chmod a+r $1
+     chmod a+r $3
+@@ -68,4 +68,4 @@
+     ui="urwid"
+ fi
+ subject="$(cat $3)"
+-reportbug --ui "$ui" -i "$1" -s "$subject" "$2"
+\ No newline at end of file
++reportbug --ui "$ui" -i "$1" -s "$subject" "$2"
+

Modified: packages/unstable/update-manager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/rules?rev=20953&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/rules [utf-8] (original)
+++ packages/unstable/update-manager/debian/rules [utf-8] Sun Aug 16 22:46:43 2009
@@ -24,4 +24,3 @@
 # although this package does not use autotools; the build, thus, fails.
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 	$(if $(wildcard /usr/bin/dh_gconf),dh_gconf -p$(cdbs_curpkg) $(DEB_DH_GCONF_ARGS))
-	$(if $(wildcard /usr/bin/dh_desktop),dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS))