[Python-apps-commits] r471 - in packages/startupmanager/trunk/debian (4 files)

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

    Date: Saturday, January 5, 2008 @ 12:08:18
  Author: kumanna-guest
Revision: 471

* debian/patches:
  + Add 01_menu_checklength.diff to fix failure if default
    entry to boot is bigger than total. Thanks to Andrea Colangelo
    for the patch. (Closes: #459203)
* debian/copyright:
  + Convert to UTF-8.
* debian/rules:
  + Remove /usr/lib directory, as it is empty.

Added:
  packages/startupmanager/trunk/debian/patches/01_menu_checklength.diff
Modified:
  packages/startupmanager/trunk/debian/changelog
  packages/startupmanager/trunk/debian/copyright
  packages/startupmanager/trunk/debian/rules

Modified: packages/startupmanager/trunk/debian/changelog
===================================================================
--- packages/startupmanager/trunk/debian/changelog	2007-12-31 02:50:01 UTC (rev 470)
+++ packages/startupmanager/trunk/debian/changelog	2008-01-05 12:08:18 UTC (rev 471)
@@ -1,11 +1,22 @@
-startupmanager (1.9.9-2) UNRELEASED; urgency=low
+startupmanager (1.9.9-2) unstable; urgency=low
 
+  [ Marco Rodrigues ]
   * Add version check to cdbs, debhelper and python-all-dev.
   * Update Standards-Version to 3.7.3.
   * Bump debhelper to version 0.5.38.
 
- -- Marco Rodrigues <gothicx at sapo.pt>  Mon, 12 Nov 2007 18:46:14 +0000
+  [ Kumar Appaiah ]
+  * debian/patches:
+    + Add 01_menu_checklength.diff to fix failure if default
+      entry to boot is bigger than total. Thanks to Andrea Colangelo
+      for the patch. (Closes: #459203)
+  * debian/copyright:
+    + Convert to UTF-8.
+  * debian/rules:
+    + Remove /usr/lib directory, as it is empty.
 
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Sat, 05 Jan 2008 17:45:06 +0530
+
 startupmanager (1.9.9-1) unstable; urgency=low
 
   * New upstream version

Modified: packages/startupmanager/trunk/debian/copyright
===================================================================
--- packages/startupmanager/trunk/debian/copyright	2007-12-31 02:50:01 UTC (rev 470)
+++ packages/startupmanager/trunk/debian/copyright	2008-01-05 12:08:18 UTC (rev 471)
@@ -1,12 +1,12 @@
-This package was debianized by Jimmy Rönnholm <jimmy.ronnholm at telia.com> on
+This package was debianized by Jimmy Rönnholm <jimmy.ronnholm at telia.com> on
 Sun, 14 Jan 2007 19:27:51 +0100.
 
 It was downloaded from http://web.telia.com/~u88005282/sum/index.html
 
-Upstream Author: Jimmy Rönnholm <jimmy.ronnholm at telia.com>
+Upstream Author: Jimmy Rönnholm <jimmy.ronnholm at telia.com>
 
 Copyright:
-   Copyright (C) 2006-2007  Jimmy Rönnholm <jimmy.ronnholm at telia.com>
+   Copyright (C) 2006-2007  Jimmy Rönnholm <jimmy.ronnholm at telia.com>
 
 po/*
    Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
@@ -30,7 +30,7 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-The Debian packaging is (C) 2007, Jimmy Rönnholm <jimmy.ronnholm at telia.com> and
+The Debian packaging is (C) 2007, Jimmy Rönnholm <jimmy.ronnholm at telia.com> and
 is licensed under the GPL, see above.
 
 On Debian systems, the complete text of the GNU General

Added: packages/startupmanager/trunk/debian/patches/01_menu_checklength.diff
===================================================================
--- packages/startupmanager/trunk/debian/patches/01_menu_checklength.diff	                        (rev 0)
+++ packages/startupmanager/trunk/debian/patches/01_menu_checklength.diff	2008-01-05 12:08:18 UTC (rev 471)
@@ -0,0 +1,14 @@
+diff -Nur startupmanager-1.9.9/bootconfig/grub_legacy.py startupmanager-1.9.9.new/bootconfig/grub_legacy.py
+--- startupmanager-1.9.9/bootconfig/grub_legacy.py	2007-10-06 21:37:52.000000000 +0530
++++ startupmanager-1.9.9.new/bootconfig/grub_legacy.py	2008-01-05 17:31:15.000000000 +0530
+@@ -426,7 +426,9 @@
+         default_boot = self.default_boot
+         titles = self.titles
+         if default_boot != -1:
+-            return titles[default_boot]
++            if default_boot < len(titles):
++                return titles[default_boot]
++            return titles[0]
+         return -1
+ 
+     def get_titles(self):

Modified: packages/startupmanager/trunk/debian/rules
===================================================================
--- packages/startupmanager/trunk/debian/rules	2007-12-31 02:50:01 UTC (rev 470)
+++ packages/startupmanager/trunk/debian/rules	2008-01-05 12:08:18 UTC (rev 471)
@@ -7,3 +7,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_INSTALL_MANPAGES_startupmanager := debian/startupmanager.1
+
+binary-predeb/startupmanager::
+	$(RM) -r debian/startupmanager/usr/lib
+