[med-svn] [SCM] aghermann branch, master, updated. a715b8668c5c346db9a0cce34faf6da0eef662c1

[Andrei Zavada]

The following commit has been merged in the master branch:
commit a715b8668c5c346db9a0cce34faf6da0eef662c1
Author: Andrei Zavada <johnhom...@gmail.com>
Date:   Sat May 18 01:56:45 2013 +0300

    remove stray mremap check from configure.ac; make it 0.9.0.4

diff --git a/ChangeLog b/ChangeLog
index 58d8f87..5f65962 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+v.0.9.0.4 (2013-05-18)
+       * Remove stray AC_CHECK_FUNC(mremap).
 v.0.9.0.3 (2013-05-16)
        * Check for mremap and use munmap+memmove+mmap if it is
          unavailable; and comment out CEDFFile::resize() as unused.
diff --git a/configure.ac b/configure.ac
index 5839d0c..77ca597 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_COPYRIGHT([Copyright (c) 2008-13 Andrei Zavada <johnhom...@gmail.com>])
 
-AC_INIT([Aghermann], [0.9.0.3], [johnhom...@gmail.com])
+AC_INIT([Aghermann], [0.9.0.4], [johnhom...@gmail.com])
 AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.61)
@@ -53,8 +53,6 @@ test $ac_cv_cxx_cpp11_features = no && \
 
 dnl AC_CXX_HAVE_STL # redundant: we check for STL implicitly in 
AC_CXX_STDCPP0X_FEATURES
 
-dnl Check for some functions
-AC_CHECK_FUNC( [mremap], [], AC_MSG_ERROR([Function mremap not available]))
 dnl Check for prerequisite lib dependencies
 PKG_CHECK_MODULES([LIBCONFIGXX], [libconfig++])
 PKG_CHECK_MODULES([SAMPLERATE], [samplerate >= 0.1.7])
diff --git a/data/mw-dialogs.glade b/data/mw-dialogs.glade
index 4ae175a..05342b2 100644
--- a/data/mw-dialogs.glade
+++ b/data/mw-dialogs.glade
@@ -328,7 +328,7 @@
                     <property name="xalign">0</property>
                     <property name="xpad">5</property>
                     <property name="ypad">15</property>
-                    <property 
name="label">&lt;b&gt;&lt;big&gt;&lt;big&gt;Aghermann 0.9.0.3 
&lt;/big&gt;&lt;/big&gt;&lt;/b&gt;Jibo 
+                    <property 
name="label">&lt;b&gt;&lt;big&gt;&lt;big&gt;Aghermann 0.9.0.4 
&lt;/big&gt;&lt;/big&gt;&lt;/b&gt;Jibo 
 &lt;a 
href="http://johnhommer.com/academic/code/aghermann"&gt;johnhommer.com/academic/code/aghermann&lt;/a&gt;</property>
                     <property name="use_markup">True</property>
                   </object>
@@ -424,7 +424,11 @@ With bug reports, either send yours to &lt;a 
href="mailto:aghermann-users@lists.
                             <property name="yalign">0</property>
                             <property name="xpad">10</property>
                             <property name="ypad">10</property>
-                            <property name="label">&lt;big&gt;&lt;b&gt;v. 
0.9.0.3&lt;/b&gt;&lt;/big&gt; (2013-05-16)
+                            <property name="label">&lt;big&gt;&lt;b&gt;v. 
0.9.0.4&lt;/b&gt;&lt;/big&gt; (2013-05-18)
+&lt;span font="monospace"&gt;
+       * Remove stray AC_CHECK_FUNC(mremap).
+&lt;/span&gt;
+&lt;big&gt;&lt;b&gt;v. 0.9.0.3&lt;/b&gt;&lt;/big&gt; (2013-05-16)
 &lt;span font="monospace"&gt;
        * Check for mremap and use munmap+memmove+mmap if it is
          unavailable; and comment out CEDFFile::resize() as unused.
diff --git a/debian/changelog b/debian/changelog
index d605174..638ba63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-aghermann (0.9.0.3-1) unstable; urgency=low
+aghermann (0.9.0.4-1) unstable; urgency=low
 
   * New upstream version.
     - fixed build on arches not providing mremap (Closes: #708557).
 
- -- Andrei Zavada <johnhom...@gmail.com>  Fri, 17 May 2013 00:04:35 +0200
+ -- Andrei Zavada <johnhom...@gmail.com>  Sat, 18 May 2013 00:53:03 +0200
 
 aghermann (0.9.0.2-1) unstable; urgency=low
 

-- 
Sleep experiment manager

_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit