[Pkg-voip-commits] [dahdi-firmware] 01/01: [svn-buildpackage] Tagging dahdi-firmware 2.6.1-2

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to annotated tag debian/2.6.1-2
in repository dahdi-firmware.

commit 754b1306d5475caf27a16d953875095569d08d0d
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Wed Jan 30 21:56:47 2013 +0000

    [svn-buildpackage] Tagging dahdi-firmware 2.6.1-2
    
    git-svn-id: svn://anonscm.alioth.debian.org/svn/pkg-voip/dahdi-firmware/tags/2.6.1-2@10093 5e74be4b-f5d6-0310-a852-e9e23c5afa6a
---
 debian/changelog                    |  6 +--
 debian/patches/make-binary-bitfiles | 73 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a90c350..8c6cc39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-dahdi-firmware (2.6.1-2) UNRELEASED; urgency=low
+dahdi-firmware (2.6.1-2) unstable; urgency=low
 
-  * NOT RELEASED YET
   * Move old Zapata bitfiles (*.rbt) to this package (Closes: #699104).
+    (Ben Hutchings).
 
- -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 10 Jun 2012 13:38:32 +0300
+ -- Tzafrir Cohen <tzafrir at debian.org>  Wed, 30 Jan 2013 00:04:32 +0200
 
 dahdi-firmware (2.6.1-1) unstable; urgency=low
 
diff --git a/debian/patches/make-binary-bitfiles b/debian/patches/make-binary-bitfiles
new file mode 100644
index 0000000..cc116b4
--- /dev/null
+++ b/debian/patches/make-binary-bitfiles
@@ -0,0 +1,73 @@
+Author: Ben Hutchings <ben at decadent.org.uk>
+Description: Add makefw -b option to enable binary output
+Bug-Debian: http://bugs.debian.org/699104
+
+We can't compile these bitfiles into the drivers in the free
+dahdi-source package.  Add the -b option to write a binary
+instead of a C array.
+
+---
+--- a/drivers/dahdi/makefw.c
++++ b/drivers/dahdi/makefw.c
+@@ -1,6 +1,7 @@
+ /* Xilinx firmware convertor program.
+  *
+  * Written by Jim Dixon <jim at lambdatel.com>.
++ * Binary output adde by Ben Hutchings <ben at decadent.org.uk>.
+  *
+  * Copyright (C) 2001 Jim Dixon / Zapata Telephony.
+  * Copyright (C) 2001-2008 Digium, Inc.
+@@ -34,10 +35,12 @@ FILE *fp;
+ int i,j,nbytes;
+ unsigned char c;
+ char	buf[300];
++int bin;
+ 
+ 	if (argc < 3)
+ 	   {
+ 		puts("Usage... makefw  filename.rbt  array_name");
++		puts("         makefw  filename.rbt  -b");
+ 		exit(1);
+ 	   }	
+ 
+@@ -47,8 +50,10 @@ char	buf[300];
+ 		perror("bit file open");
+ 		exit(1);
+ 	   }
++	bin = !strcmp(argv[2], "-b");
+ 	nbytes = 0;
+-	printf("static unsigned char %s[] = {\n",argv[2]);
++	if (!bin)
++		printf("static unsigned char %s[] = {\n",argv[2]);
+ 	i = 0;
+ 	while(fgets(buf,sizeof(buf) - 1,fp))
+ 	   {
+@@ -66,17 +71,22 @@ char	buf[300];
+ 			if ((j & 7) == 7)
+ 			   {
+ 				nbytes++;
+-				if (i) printf(",");				
+-				printf("0x%02x",c);
+-				if (i++ == SWATH) {
+-					printf(",\n");
+-					i = 0;
++				if (bin) {
++					putchar(c);
++				} else {
++					if (i) printf(",");
++					printf("0x%02x",c);
++					if (i++ == SWATH) {
++						printf(",\n");
++						i = 0;
++					}
+ 				}
+ 				c = 0;
+ 			   }
+ 		   }
+ 	   }
+-	printf("\n};\n\n");
++	if (!bin)
++		printf("\n};\n\n");
+ 	fprintf(stderr,"Loaded %d bytes from file\n",nbytes);
+ 	fclose(fp);
+ 	exit(0);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8398284
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+make-binary-bitfiles

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-firmware.git