[med-svn] r12708 - trunk/packages/dcmtk/tags

2012-12-20 Thread Mathieu Malaterre
Author: malat
Date: 2012-12-20 13:06:21 + (Thu, 20 Dec 2012)
New Revision: 12708

Added:
   trunk/packages/dcmtk/tags/3.6.0-12/
Log:
[svn-buildpackage] Tagging dcmtk 3.6.0-12


___
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. 3b8a63cca9e297a548ea6094bd42a016ecec03b8

2012-12-20 Thread Andrei Zavada
The following commit has been merged in the master branch:
commit 3b8a63cca9e297a548ea6094bd42a016ecec03b8
Author: Andrei Zavada 
Date:   Thu Dec 20 15:01:26 2012 +0200

data/Makefile.am: include generated .resource file in CLEANFILES

diff --git a/data/Makefile.am b/data/Makefile.am
index 162009e..f12f632 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,8 @@
-applicationsdir = $(datadir)/applications
-applications_DATA = \
+applicationsdir := $(datadir)/applications
+applications_DATA := \
aghermann.desktop edfhed-gtk.desktop
 
-uidir = $(datadir)/${PACKAGE}
+uidir := $(datadir)/${PACKAGE}
 
 ui_DATA := \
aghermann.png \
@@ -11,9 +11,6 @@ ui_DATA := \
idle-bg.svg \
experiment-dl.sh
 
-CLEANFILES := \
-   aghermann.desktop edfhed-gtk.desktop
-
 EXTRA_DIST := \
aghermann.png \
aghermann.desktop.in edfhed-gtk.desktop.in \
@@ -24,6 +21,10 @@ EXTRA_DIST := \
idle-bg.svg equations1.png equation-uc.png \
experiment-dl.sh
 
+CLEANFILES := \
+   aghermann.desktop edfhed-gtk.desktop \
+   aghermann.gresource
+
 GRESOURCES := \
session-chooser.glade main.glade dialogs.glade \
sf.glade mf.glade edfhed.glade \

-- 
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. 3b8a63cca9e297a548ea6094bd42a016ecec03b8

2012-12-20 Thread Andrei Zavada
The following commit has been merged in the master branch:
commit eb00c558f52259d2167cd2267393dfd841564c1a
Author: Andrei Zavada 
Date:   Thu Dec 20 14:34:14 2012 +0200

release 0.7.6

diff --git a/configure.ac b/configure.ac
index 1556f60..bc327b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_COPYRIGHT([Copyright (c) 2008-12 Andrei Zavada ])
 
-AC_INIT([Aghermann], [0.7.6_rc], [johnhom...@gmail.com])
+AC_INIT([Aghermann], [0.7.6], [johnhom...@gmail.com])
 AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.61)

-- 
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 tag, 0.7.6, created. 3b8a63cca9e297a548ea6094bd42a016ecec03b8

2012-12-20 Thread Andrei Zavada
The tag, 0.7.6 has been created
at  3b8a63cca9e297a548ea6094bd42a016ecec03b8 (commit)

- Shortlog 
commit 3b8a63cca9e297a548ea6094bd42a016ecec03b8
Author: Andrei Zavada 
Date:   Thu Dec 20 15:01:26 2012 +0200

data/Makefile.am: include generated .resource file in CLEANFILES
---

-- 
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. 3b8a63cca9e297a548ea6094bd42a016ecec03b8

2012-12-20 Thread Andrei Zavada
The following commit has been merged in the master branch:
commit 72d1a3255ced25be0f485990217e6471417ffb30
Author: Andrei Zavada 
Date:   Thu Dec 20 14:34:06 2012 +0200

edfcat: determine from input data and set physical_min/max fields

diff --git a/ChangeLog b/ChangeLog
index daa4acd..fc3cd99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
-v.0.7.6 (2012-12-xx)
+v.0.7.6 (2012-12-20)
* Don't forget to save some .expdesign.conf settings.
* Purge cached profiles on version upgrade.
+   * Correctly set OMP max threads.
+   * edfcat conv: set physical_min/max.
 
 v.0.7.5.1 (2012-12-04)
* Fix Ububtu build.
diff --git a/data/dialogs.glade b/data/dialogs.glade
index f01e4e8..e330e51 100644
--- a/data/dialogs.glade
+++ b/data/dialogs.glade
@@ -328,7 +328,7 @@
 0
 5
 15
-Aghermann 
0.7.5.1 Bye-bye StrikeAd
+Aghermann 
0.7.6
 johnhommer.com/academic/code/aghermann;
 True
   
@@ -424,7 +424,14 @@ With bug reports, either send yours to 
+   * Don't forget to save some .expdesign.conf settings.
+   * Purge cached profiles on version upgrade.
+   * Correctly set OMP max threads.
+   * edfcat conv: set physical_min/max.
+
+v. 0.7.5.1 (2012-12-04)
 
* Fix Ubuntu build.
 
@@ -435,10 +442,7 @@ With bug reports, either send yours to 
-   * PSD: don't apply windowing function twice (deeply sorry about that!).
-
+
 (for older entries, see full 
changelog)
 True
 True
diff --git a/man/edfcat.1.in b/man/edfcat.1.in
index 2c28f37..097f978 100644
--- a/man/edfcat.1.in
+++ b/man/edfcat.1.in
@@ -14,7 +14,13 @@ samplerate), and (2) channel pruning.
 .TP
 conv \fBFILE.ascii\fR \fBSAMPLERATE\fR \fBRECORD_SIZE\fR
 Convert samples in \fBFILE.ascii\fR into \fBFILE.ascii.edf\fR.
-Multiple columns in the source file will be converted as individual channels.
+Multiple columns in the source file will be converted as individual
+channels.
+
+On success, physical_min/max in each channel will be set to the
+absolute min/max of all channel data, widened symmetrically to
+whichever boundary is farther from 0 (thus, a range of \-2:3 becomes
+\-3:3, as will \-3:2).
 .TP
 prune \fBFILE.edf\fR \fBN1[,N2,...]\fR
 Create a copy of source file (FILE-mod.edf) only keeping channels
diff --git a/src/common/alg.hh b/src/common/alg.hh
index d692698..692ce22 100644
--- a/src/common/alg.hh
+++ b/src/common/alg.hh
@@ -114,7 +114,12 @@ struct SSpan {
 
 
 
-
+template 
+int
+sign( T x)
+{
+   return (x > 0) ? 1 : (x == 0) ? 0 : -1;
+}
 
 
 template 
diff --git a/src/tools/edfcat.cc b/src/tools/edfcat.cc
index b687bd7..c3e14a0 100644
--- a/src/tools/edfcat.cc
+++ b/src/tools/edfcat.cc
@@ -261,16 +261,42 @@ out:
double length = (double)total_samples/obj.samplerate;
printf( "Read %zu samples (%g sec) in %zu channel(s)\n", total_samples, 
length, columns);
 
+  // determine physical min/max
+   vector> phys_ranges (columns);
+   double grand_min = INFINITY, grand_max = -INFINITY;
+   printf( "Physical min/max in channels:\n");
+   for ( i = 0; i < columns; ++i ) {
+   phys_ranges[i] = {data[i].min(), data[i].max()};
+   printf( "%zu\t%g\t%g\n",
+   i+1, phys_ranges[i].first, phys_ranges[i].second);
+   if ( grand_min > phys_ranges[i].first )
+   grand_min = phys_ranges[i].first;
+   if ( grand_max < phys_ranges[i].second )
+   grand_max = phys_ranges[i].second;
+   }
+   grand_min = (grand_min < 0.) ? floor(grand_min) : ceil(grand_min); // 
away from 0
+   grand_max = (grand_max < 0.) ? floor(grand_max) : ceil(grand_max);
+   if ( agh::alg::sign(grand_max) != agh::alg::sign(grand_min) ) {
+   if ( -grand_min > grand_max )
+   grand_max = -grand_min;
+   else
+   grand_min = -grand_max;
+   }
+   printf( "Setting physical_min/max to %g:%g\n",
+   grand_min, grand_max);
+
sigfile::CEDFFile F ((obj + ".edf").c_str(),
 sigfile

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

2012-12-20 Thread Andrei Zavada
The following commit has been merged in the master branch:
commit 9e2ecd108f993b78daefd9977396255cf96ec6da
Author: Andrei Zavada 
Date:   Sat Dec 15 21:15:46 2012 +0200

flush gtk both ways, depending on caller

This is gdk_window_process_all_updates() vs
while ( gtk_events_pending() )  gtk_main_iteration(); episode 34658.

diff --git a/src/ui/mw/mw-splash.cc b/src/ui/mw/mw-splash.cc
index 47f924c..01a38ef 100644
--- a/src/ui/mw/mw-splash.cc
+++ b/src/ui/mw/mw-splash.cc
@@ -46,7 +46,8 @@ download_process_child_exited_cb( VteTerminal *terminal, 
gpointer userdata)
"Exit status %d. Try again next time.", exit_status);
ED.dl_pid = -1;
ED.ED->scan_tree( bind 
(&aghui::SExpDesignUI::sb_main_progress_indicator, &ED,
-   placeholders::_1, placeholders::_2, 
placeholders::_3));
+   placeholders::_1, placeholders::_2, 
placeholders::_3,
+   aghui::TGtkRefreshMode::gdk));
ED.populate( false);
 }
 
diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index ca5dc8b..40b01bf 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -212,7 +212,8 @@ SExpDesignUI (aghui::SSessionChooser *parent,
sure_dir = dir;
ED = new agh::CExpDesign (sure_dir,
  bind( 
&SExpDesignUI::sb_main_progress_indicator, this,
-   placeholders::_1, placeholders::_2, 
placeholders::_3));
+   placeholders::_1, placeholders::_2, 
placeholders::_3,
+   aghui::TGtkRefreshMode::gtk));
load_artifact_detection_profiles();
if ( global_artifact_detection_profiles.empty() )
global_artifact_detection_profiles["default"] = 
metrics::mc::SArtifactDetectionPP ();
@@ -409,7 +410,8 @@ do_rescan_tree( bool with_update)
ED -> sync();
if ( with_update )
ED -> scan_tree( bind 
(&SExpDesignUI::sb_main_progress_indicator, this,
-  placeholders::_1, placeholders::_2, 
placeholders::_3));
+  placeholders::_1, placeholders::_2, 
placeholders::_3,
+  aghui::TGtkRefreshMode::gdk));
else
ED -> scan_tree();
populate( false);
@@ -538,11 +540,19 @@ buf_on_main_status_bar()
 
 void
 aghui::SExpDesignUI::
-sb_main_progress_indicator( const char* current, size_t n, size_t i)
+sb_main_progress_indicator( const char* current, size_t n, size_t i, 
aghui::TGtkRefreshMode mode)
 {
snprintf_buf( "(%zu of %zu) %s", i, n, current);
buf_on_main_status_bar();
-   gdk_window_process_all_updates();
+
+   switch ( mode ) {
+   case TGtkRefreshMode::gtk:
+   aghui::gtk_flush();  // this brings down the whole of GTK if 
called from a callback
+   break;
+   case TGtkRefreshMode::gdk:
+   gdk_window_process_all_updates(); // this, however, fails to do 
the update if called *not* from a callback
+   break;
+   }
 }
 
 
diff --git a/src/ui/mw/mw.hh b/src/ui/mw/mw.hh
index 9390cf5..fb23961 100644
--- a/src/ui/mw/mw.hh
+++ b/src/ui/mw/mw.hh
@@ -309,7 +309,8 @@ class SExpDesignUI
int ctl_params0_siman_params_t_initial_exponent;
 
   // status bar bits
-   void sb_main_progress_indicator( const char*, size_t n, size_t i);
+   void sb_main_progress_indicator( const char*, size_t n, size_t i,
+aghui::TGtkRefreshMode);
void buf_on_main_status_bar();
 
   // dnd
diff --git a/src/ui/ui.hh b/src/ui/ui.hh
index 0f8d10c..8aed21a 100644
--- a/src/ui/ui.hh
+++ b/src/ui/ui.hh
@@ -105,6 +105,9 @@ struct SManagedColor {
 };
 
 
+enum class TGtkRefreshMode {
+   gtk, gdk
+};
 
 inline void
 gtk_flush()

-- 
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. 3b8a63cca9e297a548ea6094bd42a016ecec03b8

2012-12-20 Thread Andrei Zavada
The following commit has been merged in the master branch:
commit 6ddc7b23126eae05e6d8a9c524ccdf157258adcc
Author: Andrei Zavada 
Date:   Thu Dec 20 14:32:35 2012 +0200

style touchups

diff --git a/src/tools/edfcat.cc b/src/tools/edfcat.cc
index aaa8ac6..b687bd7 100644
--- a/src/tools/edfcat.cc
+++ b/src/tools/edfcat.cc
@@ -20,9 +20,10 @@
 
 #include 
 #include 
-#include "../libsigfile/edf.hh"
-#include "../libsigfile/source.hh"
-#include "../common/fs.hh"
+#include "libsigfile/edf.hh"
+#include "libsigfile/source.hh"
+#include "common/alg.hh"
+#include "common/fs.hh"
 
 #if HAVE_CONFIG_H && !defined(VERSION)
 #  include "config.h"
diff --git a/src/tools/edfhed.cc b/src/tools/edfhed.cc
index 2837203..a4558f3 100644
--- a/src/tools/edfhed.cc
+++ b/src/tools/edfhed.cc
@@ -19,9 +19,9 @@
 #include 
 
 #include 
-#include "../libsigfile/edf.hh"
-#include "../libsigfile/source.hh"
-#include "../common/fs.hh"
+#include "libsigfile/edf.hh"
+#include "libsigfile/source.hh"
+#include "common/fs.hh"
 
 #include "config.h"
 

-- 
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. 3b8a63cca9e297a548ea6094bd42a016ecec03b8

2012-12-20 Thread Andrei Zavada
The following commit has been merged in the master branch:
commit bd8e84640e2ba981b390f627e7c8a2ba4b02
Author: Andrei Zavada 
Date:   Sun Dec 16 02:33:02 2012 +0200

style touchups

diff --git a/src/ica/ica.hh b/src/ica/ica.hh
index dc8687f..52ef4fc 100644
--- a/src/ica/ica.hh
+++ b/src/ica/ica.hh
@@ -21,7 +21,7 @@
 #include 
 
 #include 
-#include "itpp/signal/fastica.h"
+#include 
 
 
 #if HAVE_CONFIG_H && !defined(VERSION)
diff --git a/src/ui/sf/sf-ica.cc b/src/ui/sf/sf-ica.cc
index beff772..68530e9 100644
--- a/src/ui/sf/sf-ica.cc
+++ b/src/ui/sf/sf-ica.cc
@@ -155,7 +155,7 @@ int
 aghui::SScoringFacility::
 remix_ics()
 {
-   if ( ica == NULL )
+   if ( ica == nullptr )
return 1;
 
aghui::SBusyBlock bb (wScoringFacility);

-- 
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. 3b8a63cca9e297a548ea6094bd42a016ecec03b8

2012-12-20 Thread Andrei Zavada
The following commit has been merged in the master branch:
commit 70e7fd0ac126f1b8d4ea15778723ee031436c5f5
Author: Andrei Zavada 
Date:   Sat Dec 15 21:12:38 2012 +0200

better protect against random user input during noninteractive periods

diff --git a/data/main.glade b/data/main.glade
index bf6ed0c..b179040 100644
--- a/data/main.glade
+++ b/data/main.glade
@@ -821,8 +821,8 @@ rm */*/*/.*.{psd,mc,swu}
 
 
   
-True
 False
+True
 
   
 True
@@ -993,6 +993,7 @@ rm */*/*/.*.{psd,mc,swu}
 
 
   
+True
 False
 center
 
@@ -1081,6 +1082,7 @@ rm */*/*/.*.{psd,mc,swu}
 
 
   
+True
 False
 center
 
@@ -3181,6 +3183,9 @@ Read more 
   
 
 
+  
+
+
   
 100
 80
@@ -4882,9 +4887,6 @@ dragging individual signals with 
Alt.
 
 
-  
-
-
   
 100
 80
@@ -7110,6 +7112,12 @@ dragging individual signals with 
Alt.
   
 
+
+  
+
+
+  
+
   
 
 
diff --git a/src/ui/mw/mw-construct.cc b/src/ui/mw/mw-construct.cc
index 8babe26..6b5326d 100644
--- a/src/ui/mw/mw-construct.cc
+++ b/src/ui/mw/mw-construct.cc
@@ -178,7 +178,8 @@ SExpDesignUIWidgets ()
 !AGH_GBGETOBJ (GtkLabel,   lMsmtProfileSWUExtra) ||
 !AGH_GBGETOBJ (GtkLabel,   lMsmtProfileMCExtra) ||
 
-!AGH_GBGETOBJ (GtkBox, cMsmtMainToolbar) )
+!AGH_GBGETOBJ (GtkBox, cMsmtMainToolbar) ||
+!AGH_GBGETOBJ (GtkBox, cMsmtTopArea) )
throw runtime_error ("Failed to construct widgets");
 
gtk_cell_layout_set_renderer( eMsmtProfileType);
@@ -713,6 +714,8 @@ set_wMainWindow_interactive( bool indeed, bool flush)
gtk_widget_set_sensitive( (GtkWidget*)eMsmtSession, indeed);
gtk_widget_set_sensitive( (GtkWidget*)eMsmtChannel, indeed);
 
+   gtk_widget_set_visible( (GtkWidget*)cMsmtTopArea, indeed);
+
if ( flush )
gtk_flush();
 }
diff --git a/src/ui/mw/mw-widgets.hh b/src/ui/mw/mw-widgets.hh
index a1b3b70..86b02be 100644
--- a/src/ui/mw/mw-widgets.hh
+++ b/src/ui/mw/mw-widgets.hh
@@ -104,7 +104,8 @@ struct SExpDesignUIWidgets {
*iHelpUsage;
 
// profile mode & parameters
-   GtkBox  *cMsmtMainToolbar,
+   GtkBox  *cMsmtTopArea,
+   *cMsmtMainToolbar,
*cMsmtProfileParamsContainer;
GtkComboBox
*eMsmtProfileType;
diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index e3079de..ca5dc8b 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -195,7 +195,8 @@ SExpDesignUI (aghui::SSessionChooser *parent,
nodestroy_by_cb = true;
 
set_wMainWindow_interactive( false);
-   gtk_widget_show_all( (GtkWidget*)wMainWindow);
+   set_controls_for_empty_experiment( true, false);
+   gtk_widget_show( (GtkWidget*)wMainWindow);
 
if ( not dir.empty() and not agh::fs::exists_and_is_writable( dir) )
throw invalid_argument (string("Experiment directory ") + dir + 
" does not exist or is not writable");

-- 
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] r12707 - in trunk/packages/dcmtk/trunk/debian: . patches

2012-12-20 Thread Mathieu Malaterre
Author: malat
Date: 2012-12-20 12:22:26 + (Thu, 20 Dec 2012)
New Revision: 12707

Modified:
   trunk/packages/dcmtk/trunk/debian/changelog
   trunk/packages/dcmtk/trunk/debian/patches/underlink.patch
   trunk/packages/dcmtk/trunk/debian/rules
Log:
Import patch from Andrey Rahmatullin + dch -r it

Modified: trunk/packages/dcmtk/trunk/debian/changelog
===
--- trunk/packages/dcmtk/trunk/debian/changelog 2012-12-20 03:45:28 UTC (rev 
12706)
+++ trunk/packages/dcmtk/trunk/debian/changelog 2012-12-20 12:22:26 UTC (rev 
12707)
@@ -1,3 +1,11 @@
+dcmtk (3.6.0-12) unstable; urgency=low
+
+  [ Andrey Rahmatullin ]
+  * Fix underlinked libraries. Closes: #677721
+   - debian/patches/underlink.patch
+
+ -- Mathieu Malaterre   Thu, 20 Dec 2012 13:20:45 +0100
+
 dcmtk (3.6.0-11) unstable; urgency=low
 
   * Fix compilation with gcc 4.7. Closes: #674361

Modified: trunk/packages/dcmtk/trunk/debian/patches/underlink.patch
===
--- trunk/packages/dcmtk/trunk/debian/patches/underlink.patch   2012-12-20 
03:45:28 UTC (rev 12706)
+++ trunk/packages/dcmtk/trunk/debian/patches/underlink.patch   2012-12-20 
12:22:26 UTC (rev 12707)
@@ -3,27 +3,33 @@
  ar. We need to provide libraries only when dynamic library is built.
 Author: Ilya Barygin 
 Bug-Debian: http://bugs.debian.org/674586
+Bug-Debian: http://bugs.debian.org/677721
 
-Index: dcmtk-3.6.0/dcmsign/libsrc/Makefile.in
-===
 dcmtk-3.6.0.orig/dcmsign/libsrc/Makefile.in2012-05-31 
10:45:58.207193330 +0200
-+++ dcmtk-3.6.0/dcmsign/libsrc/Makefile.in 2012-05-31 10:45:59.843193307 
+0200
-@@ -34,7 +34,11 @@
+--- a/dcmsign/libsrc/Makefile.in
 b/dcmsign/libsrc/Makefile.in
+@@ -17,6 +17,8 @@
+ dcmdatadir = $(top_srcdir)/../dcmdata
  
+ LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include 
-I$(dcmdatadir)/include
++LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc
++LOCALLIBS = -lofstd -loflog -ldcmdata
+ LOCALDEFS =
  
+ objs = dcsignat.o sicert.o sidsa.o simd5.o siprivat.o sirsa.o sisprof.o \
+@@ -34,7 +36,11 @@
+ 
+ 
  $(library): $(objs)
 +ifeq ($(AR),ar)
$(AR) $(ARFLAGS) $@ $(objs)
 +else
-+  $(AR) $(ARFLAGS) $@ $(objs) $(OPENSSLLIBS)
++  $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(OPENSSLLIBS)
 +endif
$(RANLIB) $@
  
  
-Index: dcmtk-3.6.0/ofstd/libsrc/Makefile.in
-===
 dcmtk-3.6.0.orig/ofstd/libsrc/Makefile.in  2012-05-31 10:45:58.219193330 
+0200
-+++ dcmtk-3.6.0/ofstd/libsrc/Makefile.in   2012-05-31 10:45:59.843193307 
+0200
+--- a/ofstd/libsrc/Makefile.in
 b/ofstd/libsrc/Makefile.in
 @@ -29,7 +29,11 @@
  
  
@@ -36,3 +42,335 @@
$(RANLIB) $@
  
  
+--- a/Makefile
 b/Makefile
+@@ -7,27 +7,27 @@
+ 
+ include $(configdir)/Makefile.def
+ 
+-all:  config-all ofstd-all oflog-all dcmdata-all dcmtls-all dcmnet-all 
dcmqrdb-all dcmwlm-all dcmimgle-all dcmsr-all dcmsign-all dcmpstat-all 
dcmimage-all dcmjpeg-all dcmjpls-all
++all:  config-all ofstd-all oflog-all dcmdata-all dcmnet-all dcmtls-all 
dcmqrdb-all dcmwlm-all dcmimgle-all dcmsr-all dcmsign-all dcmpstat-all 
dcmimage-all dcmjpeg-all dcmjpls-all
+ 
+-libsrc-all:  ofstd-libsrc-all oflog-libsrc-all dcmdata-libsrc-all 
dcmtls-libsrc-all dcmnet-libsrc-all dcmqrdb-libsrc-all dcmwlm-libsrc-all 
dcmimgle-libsrc-all dcmsr-libsrc-all dcmsign-libsrc-all dcmpstat-libsrc-all 
dcmimage-libsrc-all dcmjpeg-libsrc-all dcmjpls-libsrc-all
++libsrc-all:  ofstd-libsrc-all oflog-libsrc-all dcmdata-libsrc-all 
dcmnet-libsrc-all dcmtls-libsrc-all dcmqrdb-libsrc-all dcmwlm-libsrc-all 
dcmimgle-libsrc-all dcmsr-libsrc-all dcmsign-libsrc-all dcmpstat-libsrc-all 
dcmimage-libsrc-all dcmjpeg-libsrc-all dcmjpls-libsrc-all
+ 
+-install:  config-install ofstd-install oflog-install dcmdata-install 
dcmtls-install dcmnet-install dcmqrdb-install dcmwlm-install dcmimgle-install 
dcmsr-install dcmsign-install dcmpstat-install dcmimage-install dcmjpeg-install 
dcmjpls-install dcmtk-install-doc install-man
++install:  config-install ofstd-install oflog-install dcmdata-install 
dcmnet-install dcmtls-install dcmqrdb-install dcmwlm-install dcmimgle-install 
dcmsr-install dcmsign-install dcmpstat-install dcmimage-install dcmjpeg-install 
dcmjpls-install dcmtk-install-doc install-man
+ 
+ install-all: install install-lib install-html
+ 
+-install-bin:  config-install-bin ofstd-install-bin oflog-install-bin 
dcmdata-install-bin dcmtls-install-bin dcmnet-install-bin dcmqrdb-install-bin 
dcmwlm-install-bin dcmimgle-install-bin dcmsr-install-bin dcmsign-install-bin 
dcmpstat-install-bin dcmimage-install-bin dcmjpeg-install-bin 
dcmjpls-install-bin
++install-bin:  config-install-bin ofstd-install-bin oflog-install-bin 
dcmdata-install-bin dcmnet-install-bin dcmtls-install-bin dcmqrdb-install-bin 
dcmwlm-install-

[med-svn] [SCM] python-csb annotated tag, upstream/1.1.0+dfsg, created. upstream/1.1.0+dfsg

2012-12-20 Thread Tomas Di Domenico
The annotated tag, upstream/1.1.0+dfsg has been created
at  fc293cd44fe038d337a9cc48e59e4ca66d6f7819 (tag)
   tagging  fe296a6ffa0c20776b7827915c14ddd92ce3cb1b (commit)
  replaces  upstream/1.1.0
 tagged by  Tomas Di Domenico
on  Sun Dec 9 16:00:11 2012 +0100

- Shortlog 
Upstream version 1.1.0+dfsg

Tomas Di Domenico (2):
  Imported Upstream version 1.1.0
  Imported Upstream version 1.1.0+dfsg

---

-- 
Packaging of python-csb

___
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] python-csb annotated tag, upstream/1.1.0+dfsg-1, created. upstream/1.1.0+dfsg-1

2012-12-20 Thread Tomas Di Domenico
The annotated tag, upstream/1.1.0+dfsg-1 has been created
at  8a40b0791fbca3083339b199c8e584370945ff5d (tag)
   tagging  55bda42ef78394477e30dab9f8ab792c39557f4a (commit)
  replaces  upstream/1.1.0+dfsg
 tagged by  Tomas Di Domenico
on  Sun Dec 16 18:04:20 2012 +0100

- Shortlog 
Upstream version 1.1.0+dfsg-1

Tomas Di Domenico (1):
  Imported Upstream version 1.1.0+dfsg-1

---

-- 
Packaging of python-csb

___
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] python-csb annotated tag, upstream/1.1.0, created. upstream/1.1.0

2012-12-20 Thread tdido
The annotated tag, upstream/1.1.0 has been created
at  60b31134a3a0fe3281d827ecee4728d41d2836ba (tag)
   tagging  cb6e68f3b00369fadb882115b96a7a2e7a567942 (commit)
 tagged by  tdido
on  Mon Nov 12 13:02:00 2012 +0100

- Shortlog 
Upstream version 1.1.0

tdido (1):
  Imported Upstream version 1.1.0

---

-- 
Packaging of python-csb

___
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] python-csb annotated tag, upstream/1.1.1+dfsg-1, created. upstream/1.1.1+dfsg-1

2012-12-20 Thread Tomas Di Domenico
The annotated tag, upstream/1.1.1+dfsg-1 has been created
at  18ec6f776e1a46db0ddc018adb35230df1329bf5 (tag)
   tagging  875ed6512b3753e307f35497ee8796102f03dd35 (commit)
  replaces  upstream/1.1.0+dfsg-1
 tagged by  Tomas Di Domenico
on  Thu Dec 20 11:51:12 2012 +0100

- Shortlog 
Upstream version 1.1.1+dfsg-1

Tomas Di Domenico (1):
  Imported Upstream version 1.1.1+dfsg-1

---

-- 
Packaging of python-csb

___
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] python-csb branch, master, updated. 7c3712b2b79b10a3caca1949842fd84e0691c6ee

2012-12-20 Thread Tomas Di Domenico
The following commit has been merged in the master branch:
commit 88368ae944b8c343ee8b2c5e0a702656e4c3dfba
Merge: f6f3d2a954bfa39de3ce77316af644ffaf143fbe 
875ed6512b3753e307f35497ee8796102f03dd35
Author: Tomas Di Domenico 
Date:   Thu Dec 20 11:51:13 2012 +0100

Merge tag 'upstream/1.1.1+dfsg-1'

Upstream version 1.1.1+dfsg-1


-- 
Packaging of python-csb

___
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] python-csb branch, pristine-tar, updated. 8a53def1a4c02d7520b0df3d8a79e4bcfdcb5647

2012-12-20 Thread Tomas Di Domenico
The following commit has been merged in the pristine-tar branch:
commit 8a53def1a4c02d7520b0df3d8a79e4bcfdcb5647
Author: Tomas Di Domenico 
Date:   Thu Dec 20 11:51:12 2012 +0100

pristine-tar data for python-csb_1.1.1+dfsg-1.orig.tar.gz

diff --git a/python-csb_1.1.1+dfsg-1.orig.tar.gz.delta 
b/python-csb_1.1.1+dfsg-1.orig.tar.gz.delta
new file mode 100644
index 000..8c09f0b
Binary files /dev/null and b/python-csb_1.1.1+dfsg-1.orig.tar.gz.delta differ
diff --git a/python-csb_1.1.1+dfsg-1.orig.tar.gz.id 
b/python-csb_1.1.1+dfsg-1.orig.tar.gz.id
new file mode 100644
index 000..35fd80a
--- /dev/null
+++ b/python-csb_1.1.1+dfsg-1.orig.tar.gz.id
@@ -0,0 +1 @@
+afe88d9ba74e95ca7e07ae556b3b391d5878bd0e

-- 
Packaging of python-csb

___
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] python-csb branch, master, updated. 7c3712b2b79b10a3caca1949842fd84e0691c6ee

2012-12-20 Thread Tomas Di Domenico
The following commit has been merged in the master branch:
commit 7c3712b2b79b10a3caca1949842fd84e0691c6ee
Author: Tomas Di Domenico 
Date:   Thu Dec 20 11:51:56 2012 +0100

Updated debian/changelog with new upstream version

diff --git a/debian/changelog b/debian/changelog
index 8d68c38..25689a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-csb (1.1.0+dfsg-1) UNRELEASED; urgency=low
+python-csb (1.1.1+dfsg-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #692032)
 

-- 
Packaging of python-csb

___
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] python-csb branch, pristine-tar, updated. 0642f41d862ec0f8191a7222abeb1c842ef7f127

2012-12-20 Thread Tomas Di Domenico
The following commit has been merged in the pristine-tar branch:
commit 0642f41d862ec0f8191a7222abeb1c842ef7f127
Author: Tomas Di Domenico 
Date:   Thu Dec 20 10:50:16 2012 +0100

pristine-tar data for python-csb_1.1.1+dfsg-1.orig.tar.gz

diff --git a/python-csb_1.1.1+dfsg-1.orig.tar.gz.delta 
b/python-csb_1.1.1+dfsg-1.orig.tar.gz.delta
new file mode 100644
index 000..a315315
Binary files /dev/null and b/python-csb_1.1.1+dfsg-1.orig.tar.gz.delta differ
diff --git a/python-csb_1.1.1+dfsg-1.orig.tar.gz.id 
b/python-csb_1.1.1+dfsg-1.orig.tar.gz.id
new file mode 100644
index 000..35fd80a
--- /dev/null
+++ b/python-csb_1.1.1+dfsg-1.orig.tar.gz.id
@@ -0,0 +1 @@
+afe88d9ba74e95ca7e07ae556b3b391d5878bd0e

-- 
Packaging of python-csb

___
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] python-csb branch, master, updated. 592e74cf75fcd35155ec8cc3327c436be0dad0c3

2012-12-20 Thread Tomas Di Domenico
The following commit has been merged in the master branch:
commit 592e74cf75fcd35155ec8cc3327c436be0dad0c3
Author: Tomas Di Domenico 
Date:   Thu Dec 20 10:52:14 2012 +0100

Updating changelog with new upstream version

diff --git a/debian/changelog b/debian/changelog
index 8d68c38..25689a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-csb (1.1.0+dfsg-1) UNRELEASED; urgency=low
+python-csb (1.1.1+dfsg-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #692032)
 

-- 
Packaging of python-csb

___
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] python-csb branch, master, updated. 592e74cf75fcd35155ec8cc3327c436be0dad0c3

2012-12-20 Thread Tomas Di Domenico
The following commit has been merged in the master branch:
commit 551f2a7233040e14843927bf35e5f5144f4f24a9
Merge: f6f3d2a954bfa39de3ce77316af644ffaf143fbe 
43f79a1deebe9feba726538bb90bd804f9bca555
Author: Tomas Di Domenico 
Date:   Thu Dec 20 10:50:17 2012 +0100

Merge tag 'upstream/1.1.1+dfsg-1'

Upstream version 1.1.1+dfsg-1


-- 
Packaging of python-csb

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