[med-svn] r12489 - in trunk/packages/freemedforms-project/trunk/debian: . patches

Eric Maeker ericmaeker-guest at alioth.debian.org
Thu Nov 1 16:47:11 UTC 2012 

Author: ericmaeker-guest
Date: 2012-11-01 16:47:11 +0000 (Thu, 01 Nov 2012)
New Revision: 12489

Added:
   trunk/packages/freemedforms-project/trunk/debian/patches/076_freeaccount-quit-segfaulting
   trunk/packages/freemedforms-project/trunk/debian/patches/076_hurd_glibc_install
   trunk/packages/freemedforms-project/trunk/debian/patches/076_rpath_hurd_glibc
Removed:
   trunk/packages/freemedforms-project/trunk/debian/patches/freeaccount-quit-segfaulting
   trunk/packages/freemedforms-project/trunk/debian/patches/hurd_glibc_install
   trunk/packages/freemedforms-project/trunk/debian/patches/rpath_hurd_glibc
Modified:
   trunk/packages/freemedforms-project/trunk/debian/changelog
   trunk/packages/freemedforms-project/trunk/debian/control
   trunk/packages/freemedforms-project/trunk/debian/patches/series
   trunk/packages/freemedforms-project/trunk/debian/rules
Log:
freemedforms: preparing new upstream == 0.8.0

Modified: trunk/packages/freemedforms-project/trunk/debian/changelog
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/changelog	2012-10-28 10:04:19 UTC (rev 12488)
+++ trunk/packages/freemedforms-project/trunk/debian/changelog	2012-11-01 16:47:11 UTC (rev 12489)
@@ -1,3 +1,18 @@
+freemedforms-project (0.7.9-1) unstable; urgency=low
+
+  [ Eric Maeker ]
+  * New upstream
+  * debian/control
+    * adding opencv dependencies
+  * debian/patches
+    * renaming patches
+    * removing upstream integrated patches 
+  * debian/rules: 
+    * adding extra-plugins for the FreeMedForms EMR
+    * removing used params for the qmake
+
+ -- Andreas Tille <tille at debian.org>  Tue, 01 Nov 2012 18:00:00 +0200
+
 freemedforms-project (0.7.6-2) unstable; urgency=low
 
   [ Eric Maeker ]

Modified: trunk/packages/freemedforms-project/trunk/debian/control
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/control	2012-10-28 10:04:19 UTC (rev 12488)
+++ trunk/packages/freemedforms-project/trunk/debian/control	2012-11-01 16:47:11 UTC (rev 12489)
@@ -5,7 +5,13 @@
 Uploaders: Eric Maeker <eric.maeker at gmail.com>,
  Andreas Tille <tille at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 9), libqt4-dev (>= 4:4.7.0), libxext-dev, zlib1g-dev
+Build-Depends: debhelper (>= 9), 
+ libqt4-dev (>= 4:4.7.0), 
+ libxext-dev, 
+ zlib1g-dev, 
+ libopencv-core-dev (>= 2.3),
+ libopencv-highgui-dev (>= 2.3),
+ libopencv-objdetect-dev (>= 2.3)
 Standards-Version: 3.9.3
 Homepage: http://www.freemedforms.com/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/freemedforms-project/
@@ -160,7 +166,10 @@
   freemedforms-libs (= ${binary:Version}),
   freemedforms-freedata (= ${source:Version}),
   freemedforms-common-resources (= ${source:Version}),
-  freemedforms-emr-resources (= ${source:Version})
+  freemedforms-emr-resources (= ${source:Version}),
+  libopencv-core (>= 2.3),
+  libopencv-highgui (>= 2.3),
+  libopencv-objdetect (>= 2.3)
 Suggests: freemedforms-emr-doc-en, freemedforms-emr-doc-fr
 Replaces: freemedforms
 Breaks: freemedforms

Copied: trunk/packages/freemedforms-project/trunk/debian/patches/076_freeaccount-quit-segfaulting (from rev 11834, trunk/packages/freemedforms-project/trunk/debian/patches/freeaccount-quit-segfaulting)
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/patches/076_freeaccount-quit-segfaulting	                        (rev 0)
+++ trunk/packages/freemedforms-project/trunk/debian/patches/076_freeaccount-quit-segfaulting	2012-11-01 16:47:11 UTC (rev 12489)
@@ -0,0 +1,13 @@
+Index: freemedforms/plugins/usermanagerplugin/usermanagerplugin.cpp
+===================================================================
+--- freemedforms.orig/plugins/usermanagerplugin/usermanagerplugin.cpp	2012-06-30 23:55:16.107393756 +0200
++++ freemedforms/plugins/usermanagerplugin/usermanagerplugin.cpp	2012-06-30 23:56:14.104378179 +0200
+@@ -95,7 +95,7 @@
+     // Add Translator to the Application
+     Core::ICore::instance()->translators()->addNewTranslator("usermanagerplugin");
+ 
+-    new UserBase(this);
++    new UserBase;
+ 
+     addObject(m_FirstCreation);
+ }

Copied: trunk/packages/freemedforms-project/trunk/debian/patches/076_hurd_glibc_install (from rev 11834, trunk/packages/freemedforms-project/trunk/debian/patches/hurd_glibc_install)
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/patches/076_hurd_glibc_install	                        (rev 0)
+++ trunk/packages/freemedforms-project/trunk/debian/patches/076_hurd_glibc_install	2012-11-01 16:47:11 UTC (rev 12489)
@@ -0,0 +1,13 @@
+Index: freemedforms/buildspecs/install.pri
+===================================================================
+--- freemedforms.orig/buildspecs/install.pri	2012-06-30 23:47:48.383643186 +0200
++++ freemedforms/buildspecs/install.pri	2012-06-30 23:57:08.891750971 +0200
+@@ -26,7 +26,7 @@
+ 
+ # These inclusions modify the default path for the installation process
+ macx:include(install_mac.pri)
+-else:linux*:include(install_linux.pri)
++else:linux*|hurd*|glibc*:include(install_linux.pri)
+ else:win32:include(install_win.pri)
+ else:freebsd*:include(install_freebsd.pri)
+ 

Copied: trunk/packages/freemedforms-project/trunk/debian/patches/076_rpath_hurd_glibc (from rev 11834, trunk/packages/freemedforms-project/trunk/debian/patches/rpath_hurd_glibc)
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/patches/076_rpath_hurd_glibc	                        (rev 0)
+++ trunk/packages/freemedforms-project/trunk/debian/patches/076_rpath_hurd_glibc	2012-11-01 16:47:11 UTC (rev 12489)
@@ -0,0 +1,13 @@
+Index: freemedforms/libs/rpath.pri
+===================================================================
+--- freemedforms.orig/libs/rpath.pri	2012-07-06 19:20:04.383905290 +0200
++++ freemedforms/libs/rpath.pri	2012-07-06 19:20:48.509841262 +0200
+@@ -1,7 +1,7 @@
+ !CONFIG(norpath) {
+     macx {
+         QMAKE_LFLAGS_SONAME = -Wl,-install_name, at executable_path/$${RPATH_LIBS_BIN}/
+-    } else:linux*|freebsd* {
++    } else:linux*|freebsd*|hurd*|glibc* {
+         #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
+         # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
+ 

Deleted: trunk/packages/freemedforms-project/trunk/debian/patches/freeaccount-quit-segfaulting
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/patches/freeaccount-quit-segfaulting	2012-10-28 10:04:19 UTC (rev 12488)
+++ trunk/packages/freemedforms-project/trunk/debian/patches/freeaccount-quit-segfaulting	2012-11-01 16:47:11 UTC (rev 12489)
@@ -1,13 +0,0 @@
-Index: freemedforms/plugins/usermanagerplugin/usermanagerplugin.cpp
-===================================================================
---- freemedforms.orig/plugins/usermanagerplugin/usermanagerplugin.cpp	2012-06-30 23:55:16.107393756 +0200
-+++ freemedforms/plugins/usermanagerplugin/usermanagerplugin.cpp	2012-06-30 23:56:14.104378179 +0200
-@@ -95,7 +95,7 @@
-     // Add Translator to the Application
-     Core::ICore::instance()->translators()->addNewTranslator("usermanagerplugin");
- 
--    new UserBase(this);
-+    new UserBase;
- 
-     addObject(m_FirstCreation);
- }

Deleted: trunk/packages/freemedforms-project/trunk/debian/patches/hurd_glibc_install
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/patches/hurd_glibc_install	2012-10-28 10:04:19 UTC (rev 12488)
+++ trunk/packages/freemedforms-project/trunk/debian/patches/hurd_glibc_install	2012-11-01 16:47:11 UTC (rev 12489)
@@ -1,13 +0,0 @@
-Index: freemedforms/buildspecs/install.pri
-===================================================================
---- freemedforms.orig/buildspecs/install.pri	2012-06-30 23:47:48.383643186 +0200
-+++ freemedforms/buildspecs/install.pri	2012-06-30 23:57:08.891750971 +0200
-@@ -26,7 +26,7 @@
- 
- # These inclusions modify the default path for the installation process
- macx:include(install_mac.pri)
--else:linux*:include(install_linux.pri)
-+else:linux*|hurd*|glibc*:include(install_linux.pri)
- else:win32:include(install_win.pri)
- else:freebsd*:include(install_freebsd.pri)
- 

Deleted: trunk/packages/freemedforms-project/trunk/debian/patches/rpath_hurd_glibc
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/patches/rpath_hurd_glibc	2012-10-28 10:04:19 UTC (rev 12488)
+++ trunk/packages/freemedforms-project/trunk/debian/patches/rpath_hurd_glibc	2012-11-01 16:47:11 UTC (rev 12489)
@@ -1,13 +0,0 @@
-Index: freemedforms/libs/rpath.pri
-===================================================================
---- freemedforms.orig/libs/rpath.pri	2012-07-06 19:20:04.383905290 +0200
-+++ freemedforms/libs/rpath.pri	2012-07-06 19:20:48.509841262 +0200
-@@ -1,7 +1,7 @@
- !CONFIG(norpath) {
-     macx {
-         QMAKE_LFLAGS_SONAME = -Wl,-install_name, at executable_path/$${RPATH_LIBS_BIN}/
--    } else:linux*|freebsd* {
-+    } else:linux*|freebsd*|hurd*|glibc* {
-         #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
-         # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
- 

Modified: trunk/packages/freemedforms-project/trunk/debian/patches/series
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/patches/series	2012-10-28 10:04:19 UTC (rev 12488)
+++ trunk/packages/freemedforms-project/trunk/debian/patches/series	2012-11-01 16:47:11 UTC (rev 12489)
@@ -1,4 +1 @@
-freeaccount-quit-segfaulting
-hurd_glibc_install
-rpath_hurd_glibc
 

Modified: trunk/packages/freemedforms-project/trunk/debian/rules
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/rules	2012-10-28 10:04:19 UTC (rev 12488)
+++ trunk/packages/freemedforms-project/trunk/debian/rules	2012-11-01 16:47:11 UTC (rev 12489)
@@ -2,18 +2,19 @@
 # (c) 2012, Eric Maeker, MD (fr), The FreeMedForms project, BSD revised license
 # The @ in front of a command prevents make from displaying
 
-# var: keep the project order (should begin with freemedforms) 
+# vars
 FREEMEDFORMS_EMR := freemedforms
 FREEDIAMS := freediams
 FREEACCOUNT := freeaccount
 
 QMAKE_CONFIG := "CONFIG+=LINUX_INTEGRATED" -r
+QMAKE_FREEMEDFORMS_CONFIG := "CONFIG+=with-alerts" "CONFIG+=with-webcam"
 QMAKE_SUBPROJECT_CONFIG := "CONFIG+=dontbuildlibs" "CONFIG+=dontinstallresources" "CONFIG+=dontinstalllibs"
 QMAKE_IPATH := "INSTALL_ROOT_PATH=/usr/"
 
 # func
-AUTOCONF_MAIN =  -D$(1) -- $(QMAKE_CONFIG) $(QMAKE_IPATH) LOWERED_APPNAME="$(1)" $(1).pro
-AUTOCONF_SUB =  -D$(1) -- $(QMAKE_CONFIG) $(QMAKE_IPATH) $(QMAKE_SUBPROJECT_CONFIG) LOWERED_APPNAME="$(1)" $(1).pro
+AUTOCONF_MAIN =  -D$(1) -- $(QMAKE_CONFIG) $(QMAKE_IPATH) $(QMAKE_FREEMEDFORMS_CONFIG) $(1).pro
+AUTOCONF_SUB =  -D$(1) -- $(QMAKE_CONFIG) $(QMAKE_IPATH) $(QMAKE_SUBPROJECT_CONFIG) $(1).pro
 
 %:
 	dh $@ --parallel --buildsystem=qmake_qt4 # --dbg-package=freemedforms-project-dbg

More information about the debian-med-commit mailing list