Commit a7fd3c12 authored by Kamal Mostafa's avatar Kamal Mostafa Committed by Christoph Berg

Import Debian changes 3.0-5

unixcw (3.0-5) unstable; urgency=high

  * Remove dangling symlinks /usr/share/doc/{cw,cwcp,xcwcp}
    (Thanks Bob Proulx). Closes: #653411.
  * Cherry-pick from upstream: {0008,0009}- patches for mawk
parent ebb0da5c
unixcw (3.0-5) unstable; urgency=high
* Remove dangling symlinks /usr/share/doc/{cw,cwcp,xcwcp}
(Thanks Bob Proulx). Closes: #653411.
* Cherry-pick from upstream: {0008,0009}- patches for mawk
-- Kamal Mostafa <kamal@whence.com> Mon, 02 Jan 2012 11:33:19 -0800
unixcw (3.0-4) unstable; urgency=high
* Fix FTBFS in Debian kfreebsd (missing snd_pcm test routines)
......
#!/bin/sh
#DEBHELPER#
DOCLINK=/usr/share/doc/cw
# Previously in version 2.3-13 $DOCLINK was a symlink to /usr/share/doc/unixcw.
# Removing this symlink must be handled explicitly so that
# the new version of the package can be placed into a real directory
# there otherwise the symlink will be preserved and the doc files
# will be missing after the install. This is required to upgrade
# from Squeeze to Wheezy. This may be removed after Wheezy.
if [ -h $DOCLINK ]; then
rm -f $DOCLINK
fi
#!/bin/sh
#DEBHELPER#
DOCLINK=/usr/share/doc/cwcp
# Previously in version 2.3-13 $DOCLINK was a symlink to /usr/share/doc/unixcw.
# Removing this symlink must be handled explicitly so that
# the new version of the package can be placed into a real directory
# there otherwise the symlink will be preserved and the doc files
# will be missing after the install. This is required to upgrade
# from Squeeze to Wheezy. This may be removed after Wheezy.
if [ -h $DOCLINK ]; then
rm -f $DOCLINK
fi
From 412cbcffc6994dfe2bdd1b3dffc5bd5dc66e24b8 Mon Sep 17 00:00:00 2001
From: Kamil Ignacak <acerion@users.sourceforge.net>
Date: Mon, 2 Jan 2012 00:00:05 +0100
Subject: [PATCH 1/3] Fixing few lines so that mawk can execute the file
properly. Also adding some comments and improving few
other lines of code.
---
src/libcw/libdoc.awk | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/src/libcw/libdoc.awk b/src/libcw/libdoc.awk
index db047f0..2611bee 100644
--- a/src/libcw/libdoc.awk
+++ b/src/libcw/libdoc.awk
@@ -55,11 +55,12 @@ function handle_global_space()
do {
if ($0 ~ /^static /) {
# potentially a static function declaration
- # function_name
- match($0, /[a-zA-Z0-9_\* ]+ \**([a-zA-Z0-9_]+)\(/, matches);
- if (matches[1] != "") {
- # print matches[1] > "/dev/stderr"
- static_functions[matches[1]] = matches[1];
+ start = match($0, /[a-zA-Z0-9_\* ]+ \**([a-zA-Z0-9_]+)\(/);
+ if (RSTART > 0) {
+ len = RLENGTH
+ name = substr($0, start, len);
+ static_functions[name] = name;
+ # print name > "/dev/stderr"
}
}
} while ($0 !~ /^\/\*\*/ && getline)
@@ -87,9 +88,16 @@ function delete_documentation(line)
function handle_function_specification()
{
- # function_name
- match($0, /[a-zA-Z0-9_\* ]+ \**([a-zA-Z0-9_]+)\(/, matches);
- if (static_functions[matches[1]]) {
+ # catch function's name
+ start = match($0, /[a-zA-Z0-9_\* ]+ \**([a-zA-Z0-9_]+)\(/);
+ if (RSTART > 0) {
+ len = RLENGTH
+ name = substr($0, start, len);
+ # print name > "/dev/stderr"
+ }
+
+
+ if (static_functions[name]) {
# specification of static function;
# no point in processing it
@@ -119,17 +127,26 @@ function handle_function_documentation()
# beginning sub (/^ \* /," *")
sub(/^ \* */,"")
- # Handle Doxygen tags
+ # Handle Doxygen tags:
+ # \brief at the very beginning of top-level function comment,
+ # \param in function's parameters specification,
+ # \return in function's return values specification.
sub(/^ *\\brief /, "Brief: ")
sub(/^ *\\param /, "Parameter: ")
+ sub(/^ *\\return /, " Returns: ")
- if (match($0, /\\param ([0-9a-zA-Z_]+)/, matches)) {
- replacement = "\\fB"matches[1]"\\fP"
- gsub(/(\\param [0-9a-zA-Z_]+)/, replacement, $0)
+ # Handle Doxygen tag:
+ # \param in the body of top-level function comment
+ start = match($0, /\\param ([0-9a-zA-Z_]+)/);
+ if (RSTART > 0) {
+ len = RLENGTH
+ # 7 - strlen(\\param )
+ param_name = substr($0, start + 7, len - 7);
+ param_name = "\\fB"param_name"\\fP"
+ gsub(/(\\param [0-9a-zA-Z_]+)/, param_name, $0)
+ # print param_name > "/dev/stderr"
}
- sub(/^ *\\return /, " Returns: ")
-
output[output_line++] = DOCUMENTATION_TAG" "$0
getline
}
--
1.7.5.4
From e7783b54ef33affcf87f84939d440dfc0634fbf6 Mon Sep 17 00:00:00 2001
From: Kamil Ignacak <acerion@users.sourceforge.net>
Date: Mon, 2 Jan 2012 00:01:34 +0100
Subject: [PATCH 2/3] Fixing few lines of code so that mawk can execute them.
---
src/libcw/include.awk | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/libcw/include.awk b/src/libcw/include.awk
index f43fb36..f70865d 100644
--- a/src/libcw/include.awk
+++ b/src/libcw/include.awk
@@ -22,13 +22,15 @@
# the need for a full m4 binary; overkill for what we really need.
#
-# Catch 'include(...)' special lines
-/^[[:space:]]*include\([^\)]*\)[[:space:]]*$/ {
+# Catch 'include(...)' special lines; watch out, mawk doesn't support
+# POSIX character classes (http://ubuntuforums.org/archive/index.php/t-619985.html)
+/^include\([^\)]*\)$/ {
+
# Find the name of the file being included.
file = $0
- sub(/^[[:space:]]*include\(/, "", file)
- sub(/\)[[:space:]]*$/, "", file)
+ sub(/^include\(/, "", file)
+ sub(/\)$/, "", file)
# Read in each line of the file, and print it out.
while ((status=getline line <file) > 0)
--
1.7.5.4
......@@ -3,3 +3,5 @@
0005-cwcp-should-not-link-with-AC_LIBS.patch
0006-Adding-Makefile.inc-to-clean-target.patch
0007-Fix-FTBFS-in-Debian-kfreebsd-missing-snd_pcm-test-ro.patch
0008-Fixing-few-lines-so-that-mawk-can-execute-the-file-p.patch
0009-Fixing-few-lines-of-code-so-that-mawk-can-execute-th.patch
#!/bin/sh
#DEBHELPER#
DOCLINK=/usr/share/doc/xcwcp
# Previously in version 2.3-13 $DOCLINK was a symlink to /usr/share/doc/unixcw.
# Removing this symlink must be handled explicitly so that
# the new version of the package can be placed into a real directory
# there otherwise the symlink will be preserved and the doc files
# will be missing after the install. This is required to upgrade
# from Squeeze to Wheezy. This may be removed after Wheezy.
if [ -h $DOCLINK ]; then
rm -f $DOCLINK
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment