[med-svn] [SCM] aghermann tag, 0.7.5.1, created. 724c77b0538369ec38e134ce9dc8b5285fc65de4

2012-12-04 Thread Andrei Zavada
The tag, 0.7.5.1 has been created
at  724c77b0538369ec38e134ce9dc8b5285fc65de4 (commit)

- Shortlog 
commit 724c77b0538369ec38e134ce9dc8b5285fc65de4
Author: Andrei Zavada johnhom...@gmail.com
Date:   Tue Dec 4 12:05:20 2012 +0200

fix arraystring initialization to fix ubuntu build, release 0.7.5.1
---

-- 
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


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

2012-12-04 Thread Andrei Zavada
The following commit has been merged in the master branch:
commit 724c77b0538369ec38e134ce9dc8b5285fc65de4
Author: Andrei Zavada johnhom...@gmail.com
Date:   Tue Dec 4 12:05:20 2012 +0200

fix arraystring initialization to fix ubuntu build, release 0.7.5.1

diff --git a/ChangeLog b/ChangeLog
index e650ffd..c26a846 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+v.0.7.5.1 (2012-12-04)
+   * Fix Ububtu build.
 v.0.7.5 (2012-12-04)
* Experimental SWU profile; general overhaul of profiles.
* Fix SF Find dialog wrt search in a changed field channel.
diff --git a/configure.ac b/configure.ac
index 2a77b30..f1ca8cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_COPYRIGHT([Copyright (c) 2008-12 Andrei Zavada johnhom...@gmail.com])
 
-AC_INIT([Aghermann], [0.7.5], [johnhom...@gmail.com])
+AC_INIT([Aghermann], [0.7.5.1], [johnhom...@gmail.com])
 AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.61)
diff --git a/data/dialogs.glade b/data/dialogs.glade
index 335a669..f01e4e8 100644
--- a/data/dialogs.glade
+++ b/data/dialogs.glade
@@ -328,7 +328,7 @@
 property name=xalign0/property
 property name=xpad5/property
 property name=ypad15/property
-property name=label 
translatable=yeslt;bgt;lt;biggt;lt;biggt;Aghermann 
0.7.5lt;/biggt;lt;/biggt;lt;/bgt; Bye-bye StrikeAd
+property name=label 
translatable=yeslt;bgt;lt;biggt;lt;biggt;Aghermann 
0.7.5.1lt;/biggt;lt;/biggt;lt;/bgt; Bye-bye StrikeAd
 lt;a 
href=http://johnhommer.com/academic/code/aghermanngt;johnhommer.com/academic/code/aghermannlt;/agt;/property
 property name=use_markupTrue/property
   /object
@@ -424,7 +424,11 @@ With bug reports, either send yours to lt;a 
href=mailto:aghermann-users@lists.
 property name=yalign0/property
 property name=xpad10/property
 property name=ypad10/property
-property name=labellt;biggt;lt;bgt;v. 
0.7.5lt;/bgt;lt;/biggt; (2012-12-03)
+property name=labellt;biggt;lt;bgt;v. 
0.7.5.1lt;/bgt;lt;/biggt; (2012-12-04)
+lt;span font=monospacegt;
+   * Fix Ubuntu build.
+lt;/spangt;
+lt;biggt;lt;bgt;v. 0.7.5lt;/bgt;lt;/biggt; (2012-12-03)
 lt;span font=monospacegt;
* Experimental SWU profile.
* General overhaul of profiles.
diff --git a/debian/changelog b/debian/changelog
index 9bf1136..045b6ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-aghermann (0.7.5-1) experimental; urgency=low
+aghermann (0.7.5.1-1) experimental; urgency=low
 
   * New upstream version.
 
- -- Andrei Zavada johnhom...@gmail.com  Mon, 03 Dec 2012 22:55:22 +0200
+ -- Andrei Zavada johnhom...@gmail.com  Tue, 04 Dec 2012 11:49:22 +0200
 
 aghermann (0.7.2-1) experimental; urgency=low
 
diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index 2890352..460c2f0 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -148,9 +148,9 @@ SExpDesignUI (aghui::SSessionChooser *parent,
uc_accuracy_factor (1.),
pagesize_item (2),
binsize_item (1),
-   ext_score_codes {
-   { -0, 1, 2, 3, 4, 6Rr8, Ww5}
-   },
+   ext_score_codes ({
+   {{ -0}, {1}, {2}, {3}, {4}, {6Rr8}, {Ww5}}
+   }),
freq_bands {
{  1.5,  4.0 },
{  4.0,  8.0 },

-- 
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


[med-svn] r12584 - in trunk/packages/biojava3/trunk/debian: . patches

2012-12-04 Thread olivier sallou
Author: osallou-guest
Date: 2012-12-04 12:56:48 + (Tue, 04 Dec 2012)
New Revision: 12584

Removed:
   trunk/packages/biojava3/trunk/debian/patches/fix_ascii_character_issue
Modified:
   trunk/packages/biojava3/trunk/debian/build.xml
   trunk/packages/biojava3/trunk/debian/control
   trunk/packages/biojava3/trunk/debian/get-orig-source
   trunk/packages/biojava3/trunk/debian/patches/series
Log:
update forester source location and dependencies

Modified: trunk/packages/biojava3/trunk/debian/build.xml
===
--- trunk/packages/biojava3/trunk/debian/build.xml  2012-12-03 21:09:36 UTC 
(rev 12583)
+++ trunk/packages/biojava3/trunk/debian/build.xml  2012-12-04 12:56:48 UTC 
(rev 12584)
@@ -21,7 +21,7 @@
property environment=env/
property name=project.jarfile.name value=BJLIB.jar/   

-   property name=class.path value=${lib.dir}/commons-cli.jar 
${lib.dir}/commons-collections.jar ${lib.dir}/commons-dbcp.jar 
${lib.dir}/junit4.jar ${lib.dir}/commons-pool.jar ${lib.dir}/guava.jar 
${lib.dir}/jgrapht0.8.jar ${lib.dir}/Jmol.jar /usr/share/icedtea-web/netx.jar 
${lib.dir}/hamcrest.jar ${lib.dir}/json_simple.jar/
+   property name=class.path value=${lib.dir}/commons-cli.jar 
${lib.dir}/commons-collections.jar ${lib.dir}/commons-dbcp.jar 
${lib.dir}/junit4.jar ${lib.dir}/commons-pool.jar ${lib.dir}/guava.jar 
${lib.dir}/jgrapht0.8.jar ${lib.dir}/Jmol.jar /usr/share/icedtea-web/netx.jar 
${lib.dir}/hamcrest.jar ${lib.dir}/json_simple.jar ${lib.dir}/commons-codec.jar 
${lib.dir}/itext5.jar ${lib.dir}/Jmol.jar/

path id=compile.classpath
 fileset dir=${lib.dir}
@@ -29,10 +29,13 @@
include name=commons-collections.jar/
include name=commons-dbcp.jar/
include name=commons-pool.jar/
+   include name=commons-codec.jar/
+   include name=itext5.jar/
+   include name=Jmol.jar/
include name=junit4.jar/
include name=guava.jar/
include name=jgrapht0.8.jar/
-   include name=Jmol.jar/
+   include name=JmolApplet.jar/
include name=hamcrest.jar/
include name=json_simple.jar/
/fileset

Modified: trunk/packages/biojava3/trunk/debian/control
===
--- trunk/packages/biojava3/trunk/debian/control2012-12-03 21:09:36 UTC 
(rev 12583)
+++ trunk/packages/biojava3/trunk/debian/control2012-12-04 12:56:48 UTC 
(rev 12584)
@@ -7,8 +7,9 @@
 Build-Depends-Indep: libcommons-dbcp-java (= 1.1), libhsqldb-java,
  libcommons-collections-java (= 2.1), libcommons-pool-java (= 1.1),
  libcommons-cli-java, libguava-java (= 11.0.1),
+ libcommons-codec-java, libitext5-java, libjmol-java, jmol-applet,
  default-jdk (= 1:1.6), junit4,javahelper (=0.25), libjgrapht-java,
- ant-optional, jmol-applet, icedtea-netx, libhamcrest-java, libjson-simple-java
+ ant-optional, icedtea-netx, libhamcrest-java, libjson-simple-java
 Build-Depends: debhelper (= 9), ant
 Standards-Version: 3.9.3
 Vcs-Browser: 
http://svn.debian.org/wsvn/debian-med/trunk/packages/biojava3/trunk/
@@ -24,7 +25,10 @@
  libhsqldb-java,
  libbytecode-java,
  jmol-applet, icedtea-netx,
- libjson-simple-java
+ libjson-simple-java,
+ libcommons-codec-java,
+ libitext5-java,
+ libjmol-java
 Suggests: java-virtual-machine, libjgrapht-java, libbiojava3-java, 
libbiojava3-java-doc
 Description: Java API to biological data and applications (version 3)
  This package presents the Open Source Java API to biological databases

Modified: trunk/packages/biojava3/trunk/debian/get-orig-source
===
--- trunk/packages/biojava3/trunk/debian/get-orig-source2012-12-03 
21:09:36 UTC (rev 12583)
+++ trunk/packages/biojava3/trunk/debian/get-orig-source2012-12-04 
12:56:48 UTC (rev 12584)
@@ -24,8 +24,8 @@
 
 mkdir -p biojava3-forester/src/main/java
 cd biojava3-forester/src/main/java
- wget 
http://www.biojava.org/download/maven/org/forester/1.005/forester-1.005-sources.jar
- jar xf forester-1.005-sources.jar
+ wget 
http://www.biojava.org/download/maven/org/forester/forester-1.005-sources/1.005/forester-1.005-sources-1.005.jar
+ jar xf forester-1.005-sources-1.005.jar
  find . -name *.class | xargs rm -f
 cd ../../../..
 cd ..

Deleted: trunk/packages/biojava3/trunk/debian/patches/fix_ascii_character_issue
===
--- trunk/packages/biojava3/trunk/debian/patches/fix_ascii_character_issue  

[med-svn] r12585 - trunk/packages/biojava3/trunk/debian

2012-12-04 Thread olivier sallou
Author: osallou-guest
Date: 2012-12-04 13:09:35 + (Tue, 04 Dec 2012)
New Revision: 12585

Modified:
   trunk/packages/biojava3/trunk/debian/control
Log:
remove unnecessary deps

Modified: trunk/packages/biojava3/trunk/debian/control
===
--- trunk/packages/biojava3/trunk/debian/control2012-12-04 12:56:48 UTC 
(rev 12584)
+++ trunk/packages/biojava3/trunk/debian/control2012-12-04 13:09:35 UTC 
(rev 12585)
@@ -7,8 +7,8 @@
 Build-Depends-Indep: libcommons-dbcp-java (= 1.1), libhsqldb-java,
  libcommons-collections-java (= 2.1), libcommons-pool-java (= 1.1),
  libcommons-cli-java, libguava-java (= 11.0.1),
- libcommons-codec-java, libitext5-java, libjmol-java, jmol-applet,
- default-jdk (= 1:1.6), junit4,javahelper (=0.25), libjgrapht-java,
+ libcommons-codec-java, libitext5-java, libjmol-java,
+ default-jdk (= 1:1.6), junit4,javahelper (=0.25),
  ant-optional, icedtea-netx, libhamcrest-java, libjson-simple-java
 Build-Depends: debhelper (= 9), ant
 Standards-Version: 3.9.3
@@ -24,7 +24,7 @@
  libcommons-dbcp-java (= 1.1),
  libhsqldb-java,
  libbytecode-java,
- jmol-applet, icedtea-netx,
+ icedtea-netx,
  libjson-simple-java,
  libcommons-codec-java,
  libitext5-java,


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


[med-svn] r12586 - trunk/packages/freemedforms-project/trunk/debian

2012-12-04 Thread Thorsten Alteholz
Author: alteholz
Date: 2012-12-04 19:02:34 + (Tue, 04 Dec 2012)
New Revision: 12586

Modified:
   trunk/packages/freemedforms-project/trunk/debian/changelog
   trunk/packages/freemedforms-project/trunk/debian/control
Log:
fix typo

Modified: trunk/packages/freemedforms-project/trunk/debian/changelog
===
--- trunk/packages/freemedforms-project/trunk/debian/changelog  2012-12-04 
13:09:35 UTC (rev 12585)
+++ trunk/packages/freemedforms-project/trunk/debian/changelog  2012-12-04 
19:02:34 UTC (rev 12586)
@@ -1,3 +1,9 @@
+freemedforms-project (0.8.0-3) experimental; urgency=low
+
+  * debian/control: fix typo in dependency of freemedforms-libs
+
+ -- Thorsten Alteholz deb...@alteholz.de  Tue, 04 Dec 2012 20:00:00 +0100
+
 freemedforms-project (0.8.0-2) experimental; urgency=low
 
   [ Eric Maeker ]

Modified: trunk/packages/freemedforms-project/trunk/debian/control
===
--- trunk/packages/freemedforms-project/trunk/debian/control2012-12-04 
13:09:35 UTC (rev 12585)
+++ trunk/packages/freemedforms-project/trunk/debian/control2012-12-04 
19:02:34 UTC (rev 12586)
@@ -151,7 +151,7 @@
 Package: freemedforms-libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libqt4-sql (= 4:4.7.0),
+ libqt4-sql-mysql (= 4:4.7.0),
  libqt4-sql-sqlite (= 4:4.7.0)
 Description: common libs for the FreeMedForms project
  The FreeMedForms project provides a set of medical applications to help


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