summaryrefslogtreecommitdiffstats
path: root/emacs-bzr/pkgver.patch
blob: 31946a704cc35e39466e4253a3dac0901b56d400 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
--- 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