From a8ff974c599e29980f49de31c2fd160c9f9828e1 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 26 May 2008 10:03:55 +0000
Subject: Drop patch 1001.  Unfuzz patch 1005.

* Drop patch 1001 against no longer included doc file.
* Unfuzz patch 1005.
---
diff --git a/debian/changelog b/debian/changelog
index 08972ea..b110761 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ sugar-datastore (0.8.1-1) unstable; urgency=low
 
   * New upstream release (only version number bumped, compared to prior
     Git snapshot release).
+  * Drop patch 1001 against no longer included doc file.
+  * Unfuzz patch 1005.
   * Update copyright-check (only files dropped or replaced with
     auto-generated ones).
   * Update local cdbs snippets:
diff --git a/debian/patches/1001_unversioned_hashbang_in_scripts.patch b/debian/patches/1001_unversioned_hashbang_in_scripts.patch
deleted file mode 100644
index 648e608..0000000
--- a/debian/patches/1001_unversioned_hashbang_in_scripts.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- sugar-datastore-0.8.0~git.13d354b.orig/docs/getbuildpath.py
-+++ sugar-datastore-0.8.0~git.13d354b/docs/getbuildpath.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.4
-+#!/usr/bin/python
- import os, sys
- 
- # IF YOU ARE NOT GETTING THE RESULTS YOU EXPECT WHILE TESTING
diff --git a/debian/patches/1005_avoid_check_call.patch b/debian/patches/1005_avoid_check_call.patch
index a4d107a..25547dc 100644
--- a/debian/patches/1005_avoid_check_call.patch
+++ b/debian/patches/1005_avoid_check_call.patch
@@ -1,8 +1,9 @@
 diff --git a/src/olpc/datastore/bin_copy.py b/src/olpc/datastore/bin_copy.py
-index 6cf7036..a38b395 100644
+index 6cf7036..3440b1b 100644
 --- a/src/olpc/datastore/bin_copy.py
 +++ b/src/olpc/datastore/bin_copy.py
-@@ -3,14 +3,12 @@ import os, subprocess
+@@ -2,15 +2,13 @@ import os, subprocess
+ 
  
  def bin_copy(src, dest):
 -    try:
diff --git a/debian/patches/series b/debian/patches/series
index 3025962..64e4de0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-1001_unversioned_hashbang_in_scripts.patch
 1002_avoid_try-except-finally.patch
 1003_avoid_with_statement.patch
 1004_avoid_queue_hints.patch
--
cgit v0.9.1