Dear Brendan,
I am uploading an NMU. Please feel free to criticize my changes, and
use them as appropriate for the next upload.
Thanks!
Kumar
diff -u template-new-1.3.8/src/new_proj.c template-new-1.3.8/src/new_proj.c
--- template-new-1.3.8/src/new_proj.c
+++ template-new-1.3.8/src/new_proj.c
@@ -186,7 +186,7 @@
int write_file(const settings_t settings, char *conf_line)
{
fmt_ptrn_t x;
- char *argv[ARG_MAX];
+ char *argv[sysconf(_SC_ARG_MAX)];
int status, argc = 0, i;
char *str;
fmt_ptrn_init(&x);
diff -u template-new-1.3.8/debian/changelog template-new-1.3.8/debian/changelog
--- template-new-1.3.8/debian/changelog
+++ template-new-1.3.8/debian/changelog
@@ -1,3 +1,12 @@
+template-new (1.3.8-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS due to conflicting stack_t. (Closes: #527516)
+ + Add autoconf to Build-Depends for autoheader to run.
+ + Use sysconf(_SC_ARG_MAX) in new_proj.c instead of ARG_MAX.
+
+ -- Kumar Appaiah <[email protected]> Wed, 23 Sep 2009 22:16:03 -0500
+
template-new (1.3.8-1) unstable; urgency=low
* New upstream version
diff -u template-new-1.3.8/debian/control template-new-1.3.8/debian/control
--- template-new-1.3.8/debian/control
+++ template-new-1.3.8/debian/control
@@ -2,7 +2,7 @@
Section: misc
Priority: optional
Maintainer: Baruch Even <[email protected]>
-Build-Depends: debhelper (>> 4.0.0), zlib1g-dev, libglib2.0-dev
+Build-Depends: debhelper (>> 4.0.0), zlib1g-dev, libglib2.0-dev, autoconf
Standards-Version: 3.7.2
Package: template-new
only in patch2:
unchanged:
--- template-new-1.3.8.orig/src/fmt_ptrn.c
+++ template-new-1.3.8/src/fmt_ptrn.c
@@ -121,7 +121,7 @@
typedef struct stack_t {
modifier_t data[STACK_MAX_ITEMS];
int size;
-} stack_t;
+} stack_t_;
/* ============================ _modifier_t_valid () ======================= */
static gboolean _modifier_t_valid(const modifier_t * m)
@@ -131,7 +131,7 @@
}
/* ============================ _stack_t_valid () ========================== */
-static gboolean _stack_t_valid(const stack_t * s)
+static gboolean _stack_t_valid(const stack_t_ * s)
{
if (s == NULL && s->size != 0)
return FALSE;
@@ -139,14 +139,14 @@
}
/* ============================ _stack_init () ============================= */
-static void _stack_init(stack_t * s)
+static void _stack_init(stack_t_ * s)
{
s->size = 0;
assert(_stack_t_valid(s));
}
/* ============================ _stack_push () ============================= */
-static gboolean _stack_push(fmt_ptrn_t * x, stack_t * s,
+static gboolean _stack_push(fmt_ptrn_t * x, stack_t_ * s,
const modifier_t data)
{
gboolean fnval = FALSE;
@@ -170,7 +170,7 @@
}
/* ============================ _stack_pop () ============================== */
-static gboolean _stack_pop(stack_t * s, modifier_t * data)
+static gboolean _stack_pop(stack_t_ * s, modifier_t * data)
{
gboolean fnval = FALSE;
assert(_stack_t_valid(s));
@@ -188,7 +188,7 @@
}
/* ============================ _stack_contains () ========================= */
-static int _stack_contains(const stack_t s, const char *n)
+static int _stack_contains(const stack_t_ s, const char *n)
{
int i;
assert(_stack_t_valid(&s));
@@ -379,7 +379,7 @@
/* ============================ _read_modifier () ========================== */
static gboolean _read_modifier(fmt_ptrn_t * x, char **ptrn,
- stack_t * modifier)
+ stack_t_ * modifier)
{
int i = 0;
modifier_t m;
@@ -417,7 +417,7 @@
/* ============================ _read_modifiers () ========================= */
static void _read_modifiers(fmt_ptrn_t * x,
- char **ptrn, stack_t * modifier)
+ char **ptrn, stack_t_ * modifier)
{
assert(_fmt_ptrn_t_valid(x));
assert(ptrn != NULL);
@@ -467,7 +467,7 @@
/* ============================ _apply_modifiers () ======================== */
static void _apply_modifiers(fmt_ptrn_t * x,
- buffer_t * str, stack_t * modifier)
+ buffer_t * str, stack_t_ * modifier)
{
modifier_t m;
@@ -563,7 +563,7 @@
static void _handle_fmt_str(fmt_ptrn_t * x, char **p)
{
/* format string -> %(<modifier_0> ... <modifier_n> <key>:<alt>) */
- stack_t modifier;
+ stack_t_ modifier;
char key[KEY_LEN + 1];
assert(_fmt_ptrn_t_valid(x));
@@ -640,7 +640,7 @@
while (*pattern != 0x00) {
if (*pattern == '%' && *(pattern + 1) == '(') {
/* format string -> %(<modifier_0> ... <modifier_n> <key>:<alt>) */
- stack_t modifier;
+ stack_t_ modifier;
char key[KEY_LEN + 1];
assert(*pattern != 0x00);
