rpms/fortune-firefly/devel firefly, 1.6, 1.7 fortune-firefly.spec, 1.8, 1.9

[Karen Rei Pease (meme)]

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9018/devel

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Latest bugfixes.




Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/devel/firefly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- firefly	8 Jan 2006 21:11:28 -0000	1.6
+++ firefly	8 Apr 2006 04:04:31 -0000	1.7
@@ -36,6 +36,8 @@
 Mal: "I don't believe there's a power in the 'verse that can stop Kaylee
 from being cheerful." (he smiles at her, never stopping working) "Sometimes
 you just wanna duct tape her mouth and dump her in the hold for a month."
+
+Kaylee: (kisses Mal) "I love my captain."
 				--Episode #1, "Serenity"
 %
 Zoe: "Something ain't right."
@@ -95,7 +97,7 @@
 Zoe: "Oh yeah, this is going to go great."
 				--Episode #1, "Serenity"
 %
-Mal: "If anyone gets nosy, just...you know... shoot 'em. "
+Mal: "If anyone gets nosy, just...you know... shoot 'em."
 
 Zoe: "Shoot 'em?"
 
@@ -185,7 +187,7 @@
 
 Jayne: "You're coming through good and loud."
 
-Mal: " 'Cause I'm standing right here."
+Mal: "'Cause I'm standing right here."
 				--Episode #1, "Serenity"
 %
 Zoe: "Don't think its a good spot sir, she still has the advantage over us."
@@ -259,8 +261,7 @@
 Jayne: "Hey, I didn't fight in no war. Best of luck, though."
 				--Episode #2, "The Train Job"
 %
-Mal: 
-(into com) "Wash, we've got some local color happening. Your grand
+Mal: (into com) "Wash, we've got some local color happening. Your grand
 entrance would not go amiss right now."
 				--Episode #2, "The Train Job"
 %
@@ -452,7 +453,7 @@
 Zoe: "I... I was weak."
 				--Episode #2, "The Train Job"
 %
-Sherrif: "His story had kind of an odor to it."
+Sheriff: "His story had kind of an odor to it."
 
 Inara: "Yes. It's not the only thing about him that does."
 				--Episode #2, "The Train Job"
@@ -462,7 +463,7 @@
 Jayne: "I was aiming for his head."
 				--Episode #2, "The Train Job"
 %
-Sherrif: "You were truthful back in town -- these are tough times. A man can get
+Sheriff: "You were truthful back in town -- these are tough times. A man can get
 a job, he might not look too close at what that job is. But a man learns all
 the details of a situation like ours.... well, then he has a choice. "
 
@@ -573,7 +574,7 @@
 				--Episode #3, "Bushwacked"
 %
 Jayne: "You saved his gorram life, he still takes the cargo. Hwoon dahn."
-[Hwoon dahn = "jerk"] 
+[jerk] 
 
 Mal: "He had to.... Couldn't let us profit. Wouldn't be civilized." 
 				--Episode #3, "Bushwacked"
@@ -713,6 +714,26 @@
 Kaylee: "Well, how can we be sure, unless we question it?"
 				--Episode #4, "Shindig"
 %
+Kaylee: "I'm not saying the 80-04's hard to repair, it just ain't worth it."
+
+Older Farmer: "It's a fine machine, you just keep it tuned."
+
+Kaylee: "Tsai boo shr." [That's not it.] "The extenders ain't braced."
+
+Murphy: "I've been telling him to buy the 80-10 for years."
+
+Kaylee: "Those 'tenders snap off, don't matter how good the engine's
+cycling."
+
+Younger Farmer: "Miss Kaylee, I wonder if I could request the honor of...."
+
+Murphy: (interrupting) "Wait a minute. Let her talk. She's talking. Dance
+later."
+
+Kaylee: "By the way, the 80-10's the same machine, they just changed the
+plating and hope no one noticed."
+				--Episode #4, "Shindig"
+%
 Zoe: (sighs) "I thought you wanted to spend more time off ship this visit."
 
 Wash: "I don't know.  Out there it seems like all fancy parties. I like our 
@@ -868,9 +889,9 @@
 Mal: "See how I'm not punching him? I think I've grown."
 				--Episode #4, "Shindig"
 %
-Atherton: "Well, get ready to starve! I'll see to it you never work again.
+Atherton: "Well, get ready to starve! I'll see to it you never work again."
 
-Inara: Actually, that's not how it works. You see, you've earned yourself a
+Inara: "Actually, that's not how it works. You see, you've earned yourself a
 black mark in the client registry. No Companion is going to contact with you
 ever again."
 
@@ -1168,15 +1189,15 @@
 Bandit #1: "And I think maybe you're gonna give me a little one-on-one
 time with the missus." 
 
-(Husband) Jayne: "Oh, I think you might wanna reconsider that last part.
+Jayne/Husband: "Oh, I think you might wanna reconsider that last part.
 See, I married me a powerful ugly creature." 
 
-(Wife) Mal: "How can you say that? How can you shame me in front of new
+Mal/Wife: "How can you say that? How can you shame me in front of new
 people?" 
 
-(Husband) Jayne: "If I could make you purtier, I would." 
+Jayne/Husband: "If I could make you purtier, I would." 
 
-(Wife) Mal: "You are not the man I met a year ago." 
+Mal/Wife: "You are not the man I met a year ago." 
 				--Episode #6, "Our Mrs Reynolds"
 %
 Mal: "Now think real hard. You been bird-dogging this township a while now.
@@ -1588,8 +1609,7 @@
 Wash: (gags)
 
 Jayne: "All the protien, vitamins and carbs of you grandma's best 
-turkey dinner... plus 15				--Episode #7, "Jaynestown"
-% alcohol." 
+turkey dinner... plus 15 percent alcohol.
 				--Episode #7, "Jaynestown"
 %
 Contact: "Last week, the factory foreman and his prod crew heard he was
@@ -1764,7 +1784,7 @@
 
 Mal: "Freedom, that's what."
 
-Zoe: "I meant, what's that?"
+Zoe: (pointing) "I meant, what's that?"
 
 Mal: "Oh. Yeah, just step around that. I think something must have been living
 in here."
@@ -1994,9 +2014,9 @@
 %
 Mal: "Pupils were fixed and dilapidated-"
 
-Simon: "Dialated-"
+Simon: "Dilated-"
 
-Mal: "Dialated! Dialated! Ching-wao tsao duh liou mahng!" [Frog-humping sonofabitch]
+Mal: "Dilated! Dilated! Ching-wao tsao duh liou mahng!" [Frog-humping sonofabitch]
 				--Episode #9, "Ariel"
 %
 Jayne: "Hell, I don't know.  If I'd wanted schooling, I'd have gone to school."
@@ -2115,7 +2135,7 @@
 
 Jayne: "What?  I got pinched!"
 
-Mal: "What is what happens when you call the Feds."
+Mal: "Which is what happens when you call the Feds."
 				--Episode #9, "Ariel"
 %
 Mal: "You know, I hear tell they used to keelhaul traitors back in the day. 
@@ -2204,9 +2224,9 @@
 Wash: "I am a large, semi-muscular man. I can take it. Don't hide behind Mal
 because you know he'll shoot it down!"
 
-Zoe: "Right. Becaue what this marriage needs is one more shouting match.
+Zoe: "Right. Becaue what this marriage needs is one more shouting match."
 
-Wash: No, what this marriage needs is one less husband. Right now it's kind of
+Wash: "No, what this marriage needs is one less husband. Right now it's kind of
 crowded."
 				--Episode #10, "War Stories"
 %
@@ -2588,7 +2608,7 @@
 Zoe: "Well, at least they covered 'Dropping your weapon so you can eat beans
 and get yourself shot'."
 
-Tracey: "Yea, I got a badge in that."
+Tracey: "Yeah, I got a badge in that."
 				--Episode #12, "The Message"
 %
 Mal: "Vitelli's out of it. That bumblebee laid down arms at the first sign
@@ -2708,9 +2728,11 @@
 
 Wash: "Were I unwed, I would take you in a manly fashion."
 
-Kaylee: " 'Cause I'm pretty?"
+Kaylee: "'Cause I'm pretty?"
+
+Wash: "'Cause you're pretty."
 
-Wash: " 'Cause you're pretty."
+Kaylee: "Thank you.  That was very restorative."
 				--Episode #13, "Heart of Gold"
 %
 Mal: "Inara, think you could stoop to being on my arm?"
@@ -3362,7 +3384,7 @@
 Mostly if i'm gettin' paid."
 				--"Serenity"
 %
-Kaylee (to Simon, as he leaves): "Don't ride in antyhing with a Capissen 38 
+Kaylee (to Simon, as he leaves): "Don't ride in kanything with a Capissen 38 
 engine, they fall right out of the sky!"
 				--"Serenity"
 %


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/devel/fortune-firefly.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fortune-firefly.spec	8 Jan 2006 21:11:28 -0000	1.8
+++ fortune-firefly.spec	8 Apr 2006 04:04:31 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.1.0
+Version:	2.1.1
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Apr 07 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.1
+- Manually merged in some fixes from Robert Mohr (mohr.42 at osu.edu)
+
 * Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
 - Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
 - Added quotes from unfilmed episode, "Dead or Alive"