Dropped no more needed patch

diff --git a/debian/changelog b/debian/changelog
index b5a9a6eba07e800eb272de3678de16b0a93737eb..0e42e7a86b41849ccbfb32f26eb9ad04dae927b5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+roundcube (0.1~rc1~dfsg-2) unstable; urgency=low
+
+  * Removed custom unix_timestamp for sqlite: solved upstream
+
+ -- Romain Beauxis <toots@rastageeks.org>  Tue, 05 Jun 2007 15:22:36 +0200
+
 roundcube (0.1~rc1~dfsg-1) unstable; urgency=low
 
   [ Vincent Bernat ]

diff --git a/debian/patches/series b/debian/patches/series
index 442222483c4f9783fce67573339f15203ed320dc..d9c2b5e56c3fba7d3deddf888f0649d7c59210c2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 dbconfig-common_support.patch
 correct_install_path.patch
 use_mcrypt.patch
-use_php_timestamp_implementation_for_sqlite.patch

diff --git a/debian/patches/use_php_timestamp_implementation_for_sqlite.patch b/debian/patches/use_php_timestamp_implementation_for_sqlite.patch
deleted file mode 100644 (file)
index 4e135ad..0000000
--- a/debian/patches/use_php_timestamp_implementation_for_sqlite.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urN roundcube-0.1~rc1~dfsg.old/program/include/rcube_db.inc roundcube-0.1~rc1~dfsg/program/include/rcube_db.inc
---- roundcube-0.1~rc1~dfsg.old/program/include/rcube_db.inc    2007-05-24 21:27:53.000000000 +0200
-+++ roundcube-0.1~rc1~dfsg/program/include/rcube_db.inc        2007-05-24 21:29:36.000000000 +0200
-@@ -27,6 +27,13 @@
-  */
- require_once('DB.php');
- 
-+/* User function for getting timestamps under sqlite */
-+function custom_date_to_timestamp($data) {
-+   $date = strptime($data,'%Y-%m-%d %H:%M:%S');
-+   return mktime($date['tm_hour'],$date['tm_min'],$date['tm_sec'],$date['tm_mon']+1,$date['tm_mday'],1900 + $date['tm_year']);
-+}
-+
-+
- 
- /**
-  * Database independent query interface
-@@ -152,6 +159,9 @@
-       $dsn = $this->db_dsnw;
- 
-     $this->db_handle = $this->dsn_connect($dsn);
-+    if ($this->db_provider == "sqlite") {
-+        sqlite_create_function($this->db_handle->connection,'custom_date_to_timestamp','custom_date_to_timestamp',1);    
-+    }
-     $this->db_connected = $this->db_handle ? TRUE : FALSE;
-     }
-     
-@@ -462,6 +472,9 @@
-       case 'mssql':
-         return "datediff(s, '1970-01-01 00:00:00', $field)";
- 
-+      case 'sqlite':
-+        return "custom_date_to_timestamp($field)";
-+
-       default:
-         return "UNIX_TIMESTAMP($field)";
-       }