From 4e9a44029282c2e9c93d6d15e8daf39eb9b8b3cc Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sat, 1 Mar 2014 12:40:20 +0100
Subject: Update emacs-bzr and pkgver patch

---
 emacs-bzr/pkgver.patch | 51 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

(limited to 'emacs-bzr/pkgver.patch')

diff --git a/emacs-bzr/pkgver.patch b/emacs-bzr/pkgver.patch
index a5bd245..31946a7 100644
--- a/emacs-bzr/pkgver.patch
+++ b/emacs-bzr/pkgver.patch
@@ -1,26 +1,25 @@
-=== modified file 'lisp/emacs-lisp/package.el'
-*** lisp/emacs-lisp/package.el	2013-12-11 21:15:12 +0000
---- lisp/emacs-lisp/package.el	2013-12-12 20:01:41 +0000
-***************
-*** 1128,1138 ****
-  	   ;; probably wants us to use it.  Otherwise try Version.
-  	   (pkg-version
-  	    (or (package-strip-rcs-id (lm-header "package-version"))
-! 		(package-strip-rcs-id (lm-header "version"))))
-             (homepage (lm-homepage)))
--       (unless pkg-version
-- 	(error
-- 	 "Package lacks a \"Version\" or \"Package-Version\" header"))
-        (package-desc-from-define
-         file-name pkg-version desc
-         (if requires-str (package-read-from-string requires-str))
---- 1128,1136 ----
-  	   ;; probably wants us to use it.  Otherwise try Version.
-  	   (pkg-version
-  	    (or (package-strip-rcs-id (lm-header "package-version"))
-! 		(package-strip-rcs-id (lm-header "version"))
-!                 "0"))
-             (homepage (lm-homepage)))
-        (package-desc-from-define
-         file-name pkg-version desc
-         (if requires-str (package-read-from-string requires-str))
+--- lisp/emacs-lisp/package.el	2014-02-12 01:20:34 +0000
++++ lisp/emacs-lisp/package.el	2014-02-20 22:49:57 +0000
+@@ -1128,6 +1128,8 @@
+                  ((symbolp dep) `(,dep "0"))
+                  ((stringp dep)
+                   (error "Invalid requirement specifier: %S" dep))
++                 ((and (listp dep) (null (cdr dep)))
++                  (list (car dep) "0"))
+                  (t dep)))
+               deps))))
+
+@@ -1155,11 +1157,9 @@
+ 	   ;; probably wants us to use it.  Otherwise try Version.
+ 	   (pkg-version
+ 	    (or (package-strip-rcs-id (lm-header "package-version"))
+-		(package-strip-rcs-id (lm-header "version"))))
++		(package-strip-rcs-id (lm-header "version"))
++                "0"))
+            (homepage (lm-homepage)))
+-      (unless pkg-version
+-	(error
+-	 "Package lacks a \"Version\" or \"Package-Version\" header"))
+       (package-desc-from-define
+        file-name pkg-version desc
+        (if requires-str
-- 
cgit v1.2.3-54-g00ecf