[Pkg-octave-commit] [SCM] octave-audio branch, master, updated. 37845b4fdec18d0b894712c8e5bb15d0f4f651f1

Rafael Laboissiere rafael at debian.org
Sat May 16 07:55:32 UTC 2009


The following commit has been merged in the master branch:
commit 37845b4fdec18d0b894712c8e5bb15d0f4f651f1
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri May 15 23:28:36 2009 +0200

    Add patch to avoid const string conversion warning

diff --git a/debian/changelog b/debian/changelog
index 1abe041..54f9118 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 octave-audio (1.1.3-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/no-writable-string.diff: Add patch to avoid warning
+    "deprecated conversion from string constant to 'char *'"
   * debian/control:
     + (Standards-Version): Bump to 3.8.1 (no changes needed)
     + (Depends): Add ${misc:Depends}
     + (Vcs-Git, Vcs-Browser): Adjust to new Git repository
+    + (Build-Depends): Add quilt
+  * debian/rules: Include patchsys-quilt.mk
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:46:49 +0200
 
diff --git a/debian/control b/debian/control
index 04645de..85bb8a5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Ólafur Jens Sigurðsson <ojsbug at gmail.com>,
  Thomas Weber <thomas.weber.mail at gmail.com>,
  Rafael Laboissiere <rafael at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.0), cdbs, octave-pkg-dev (>= 0.6.4)
+Build-Depends: debhelper (>= 7.0.0), cdbs, octave-pkg-dev (>= 0.6.4), quilt
 Standards-Version: 3.8.1
 Homepage: http://octave.sourceforge.net/audio
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave-audio.git
diff --git a/debian/patches/no-writable-string.diff b/debian/patches/no-writable-string.diff
new file mode 100644
index 0000000..a29f2a5
--- /dev/null
+++ b/debian/patches/no-writable-string.diff
@@ -0,0 +1,15 @@
+Avoid warning "deprecated conversion from string constant to 'char *'"
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 15 May 2009 23:24:02 +0200
+
+--- a/src/aurecord.cc
++++ b/src/aurecord.cc
+@@ -283,7 +283,7 @@
+ }
+ #endif
+ 
+-void inform(char *str)
++void inform(const char *str)
+ {
+   if (str != NULL) {
+ #if 0
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8e940be
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no-writable-string.diff
diff --git a/debian/rules b/debian/rules
index cc1bd1b..038c30c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,4 +2,4 @@
 # -*- makefile -*-
 
 include /usr/share/cdbs/1/class/octave-pkg.mk
-
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk

-- 
octave-audio



More information about the Pkg-octave-commit mailing list