# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tom@ryuslash.org-20140220224957-aaup04ijncvyccgn
# target_branch: bzr://bzr.sv.gnu.org/emacs/trunk/
# testament_sha1: aec87ee7f2e339fadc41ed24fff80aebd511513f
# timestamp: 2014-02-20 23:52:58 +0100
# base_revision_id: michael.albinus@gmx.de-20140220182640-\
#   jsvhe3qwzk6yylu5
# 
# Begin patch
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2014-02-20 14:24:13 +0000
+++ lisp/ChangeLog	2014-02-20 22:49:57 +0000
@@ -1,3 +1,11 @@
+2014-02-20  Tom Willemse  <tom@ryuslash.org>
+
+	* emacs-lisp/package.el (package--prepare-dependencies): Default
+	to version "0" when no version has been specified, but a list is
+	still used.
+	(package-buffer-info): If no version header has been specified or
+	no value has been specified, default to version "0".
+
 2014-02-20  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (ls-lisp-use-insert-directory-program): Declare.

=== modified file 'lisp/emacs-lisp/package.el'
--- 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

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW3peRYAAl7fgAA3UHf/914k
BIC////wUAV48dSlU9gBpdgoOYACYAAmAAAAAAlECGTE0Kn6p6ajyh6ag2oAGQHqBKCnqaappp7U
CND0gAANAeiNANNSg9T1AAAYENGQGQNAwEkhAE0YCA0TZBCRo00yeoMiiqFMLX6tfFGet7RS+ZeX
MsMtj500XRXtIQqJJ3iUaOFsMmpKlMwJCec6Fqk5fNukrc3zTNRVQWfulk6mUMi4md8mQaRXUzvi
pzg15gMonIGXUvKTNX7UWkBjbOfUxIH2IiSCICYIzccxDzyXEPvuhjMNSwOYwWjHyCDCHd/Ll5ZH
nRtAz4lqe7IvI+m4OB7/4Ym/cUG8dIDARmgDyVjOrbyyOKgfHsHyK9suVDXsVZN0DqFyGkxDgZzF
JwJ7QEYqHc2gsFCBANqZe73JBbWSIT0EbBqAnfYRkR37jg9uASRpsPm10utQYs1MoHHcS928LkkC
g59ryItFv8WUT6KhK8neImgQGbGhcm1ak+cwmXfCSOOewJd0mMxWQVOF9Fko7XSUQZoqmiYVLu70
KgFCAQSZNgI5QH664tAyxSlNomaob6n7vjK1yQ3Mwe5rFCgtedmmUtstHujbRJvXRGIBCAMSSm5g
ON5tMTUPhKAwWBSnLUYjuGEDPUgoIqaSFBUEjCx2EQKNpn78yEk5J/Q9gYXvF7TMdOc/GNMzGBxc
pHZfknKQhhiDykvU9xWBUOqHGGEo58IqJIOL5GAc88eMBZY8KDU1U8jTHlV+T6uLRgFgWVYF+igO
UyytMjaJLoCsweNVaRbaKwqoMRzQK7iqyMQLYRsS6HWaUOFFHUDrzdwqIDgiBdoFCT7kpIMM3Zh2
oalkTe0AiKni7lxsgbzl1zAzw4eqRgFYTVBoIs9UaB6/kxMYvnMp9lSB4u4jWrgiA2mh426GWUp5
PC7egqCvTkVhto5ko8NAJ7dnUzK4Uv79SHCuK4Cch7xAc+iPG55QKiJhF9/R4RoIo0HYv01kURGE
QQdeXEaOLxjE0DeSDLWVBaZpp/l77ArMjacysGMBhQLNWUOy7+Y8xx4KpSNnSzjImDeXCuuFYTEw
duLwzr9nSWC+DAkONvJGIPq6MfZjA5nXPebyMVRuOS8pgemGRWNlZfGgk4LImRGh39k21M3uexq5
A63YJ3eJdTwDg57FQaEbxf0ZnA5pio7rBBSxf6JEjIYf8B4AVfKIKoih+lJCcE6MJ9CNROJvmVB+
B1QWwtRLknCwAgKB+BjXUfujXOfPgG62LAStnL0dwL4h3AClY3HZMIxRHAYZIkQ5wOEcAlE49bsD
OYt3G8yUY6IwI/JLjzDe5ghANEeaxNmBllDpIsEqCSg4DjKqiuKm4VwfwDQg5Eb1BYV/eycN4Til
YJrXpcuhyBgcUBb+Lz8kgjjMJcpDWRI/ZIoX6PWHh1iyKGMgONFyPqdGaUyiGCNSigU6p8CS3EP4
UhLl4cOZD0ek0EFBPlrUiQ+XO+CZ0kBEA9RGBOKBsVYTWQtIEVMgjW5ajegoQ4oCyYRNEGwVLk3p
ZQiFLs11OhZXqGHM9sMawjvbBjxBOzezTLTHjsLi5FI6ySFEUWbBfcDqlaxxH9KwUzwqPAiMcTfq
ESeBskW9HnhxApP5+kxxKgiLA6/C6hqRUYrlzKwMFAR9E8p7cFuVH/i7kinChINvS8iw