From: Joey Hess <joey@kitenet.net>
Date: Sun, 31 Aug 2014 21:21:29 +0000 (-0700)
Subject: Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'
X-Git-Tag: debian/2.50^0
X-Git-Url: http://git.ieval.ro/?p=filters.git;a=commitdiff_plain;h=9ecbb9f2dcc7a38238988360f0010676e2d733e0;hp=39fd545817f740efd9eb6792d12d3b06429aaa4c

Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'
---

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..5d42584
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs
diff --git a/cockney.l b/cockney.l
index f6d0ad2..4cc1555 100644
--- a/cockney.l
+++ b/cockney.l
@@ -15,19 +15,13 @@ EW [ \t.,;!\?$]
 
 %Start junk
 
+%option noyywrap
+
 %%
 
 %{
-	void eos() {
-	    if (yytext[yyleng-1] == '.')
-		dintI();
-	    else
-		unput(yytext[yyleng-1]);
-	}
-
-	void plastc() {
-	    unput(yytext[yyleng-1]);
-	}
+void eos();
+void plastc();
 %}
 
 <junk>.			{	srandom(time(0L)); unput(yytext[0]); BEGIN 0; }
@@ -103,6 +97,19 @@ ime{EW}			{	printf("oime"); eos(); }
 
 %%
 
+void eos()
+{
+    if (yytext[yyleng-1] == '.')
+    dintI();
+    else
+    unput(yytext[yyleng-1]);
+}
+
+void plastc()
+{
+    unput(yytext[yyleng-1]);
+}
+
 caseify(c)
 char c;
 {
diff --git a/debian/changelog b/debian/changelog
index 1af2543..25e7497 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+filters (2.50) unstable; urgency=medium
+
+  * Reorganize some code to support building with clang.
+    Closes: #758450 Thanks, Alexander.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 31 Aug 2014 14:16:58 -0700
+
 filters (2.49) unstable; urgency=low
 
   * scottish: Fix typo. Closes: #688905
diff --git a/debian/control b/debian/control
index 3865468..4ba0514 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Build-Depends: debhelper (>= 7), flex, bison | byacc | btyacc, dpkg-dev (>= 1.9.0)
 Maintainer: Joey Hess <joeyh@debian.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.5
 Vcs-Git: git://git.kitenet.net/filters
 Homepage: http://kitenet.net/~joey/code/filters/
 
diff --git a/jive.l b/jive.l
index 1171975..f8a1386 100644
--- a/jive.l
+++ b/jive.l
@@ -17,13 +17,13 @@
 %o 1500
 BW [ \t\(]
 EW [ \t.,;!\?$\)]
+%option noyywrap
 %%
+
 %{
-	void plastc()
-	{
-		unput(yytext[yyleng-1]);
-	}
+    void plastc();
 %}
+
 @[Bb]egin(.*)		|
 ".so ".*$			printf("%s", yytext);
 {BW}send			printf("%ct'row",yytext[0]);
@@ -202,6 +202,11 @@ meta				printf("meta-fuckin'");
 cally				printf("c'l");
 %%
 
+void plastc()
+{
+    unput(yytext[yyleng-1]);
+}
+
 caseify(c)
 char c;
 {
diff --git a/nyc.l b/nyc.l
index b00f2b0..509979e 100644
--- a/nyc.l
+++ b/nyc.l
@@ -11,11 +11,10 @@
 BW [ \t]
 SP [ \t]
 EW [ \t.,;!\?$]
+
 %%
 %{
-	void plastc() {
-		yyunput(yytext[yyleng-1], yytext);
-	}
+    void plastc();
 %}
 ".so ".*$			printf("%s", yytext);
 [ao]ther			printf("%cdder", yytext[0]=='a'?'a':'u');
@@ -72,6 +71,11 @@ negro				printf("spade");
 [a-z]"."		{	printf("%s", yytext);expletive();}
 %%
 
+void plastc()
+{
+    yyunput(yytext[yyleng-1], yytext);
+}
+
 caseify(c)
 char c;
 {
@@ -97,11 +101,6 @@ expletive()
 		}
 }
 
-main()
-{
-	yylex();
-}
-
 int yywrap()
 {
 	return 1;