[med-svn] r8539 - in trunk/packages/freemedforms/trunk: . debian

[Andreas Tille]

Author: tille
Date: 2011-11-12 07:12:27 +0000 (Sat, 12 Nov 2011)
New Revision: 8539

Removed:
   trunk/packages/freemedforms/trunk/debian/freemedforms-doc-en.install
   trunk/packages/freemedforms/trunk/debian/freemedforms-doc-fr.install
   trunk/packages/freemedforms/trunk/tarballs/
Modified:
   trunk/packages/freemedforms/trunk/debian/changelog
   trunk/packages/freemedforms/trunk/debian/compat
   trunk/packages/freemedforms/trunk/debian/control
   trunk/packages/freemedforms/trunk/debian/rules
Log:
Polishing existing packaging status a bit


Modified: trunk/packages/freemedforms/trunk/debian/changelog
===================================================================
--- trunk/packages/freemedforms/trunk/debian/changelog	2011-11-12 05:17:01 UTC (rev 8538)
+++ trunk/packages/freemedforms/trunk/debian/changelog	2011-11-12 07:12:27 UTC (rev 8539)
@@ -1,11 +1,5 @@
-freemedforms (0.6.0-1) SPONSOR; urgency=low
+freemedforms (0.6.0-1) UNRELEASED; urgency=low
 
-  * New upstream : First stable release of FreeMedForms
+  * Initial release
 
- -- Eric Maeker <eric.maeker at gmail.com>  Mon, 07 Nov 2011 00:49:48 +0100
-
-freemedforms (0.5.9~alpha2-1) UNRELEASED; urgency=low
-
-  * New upstream : third alpha release
-
- -- Eric Maeker <eric.maeker at gmail.com>  Tue, 15 Jun 2011 12:00:00 +0100
+ -- Andreas Tille <tille at debian.org>  Fri, 11 Nov 2011 14:32:14 +0100

Modified: trunk/packages/freemedforms/trunk/debian/compat
===================================================================
--- trunk/packages/freemedforms/trunk/debian/compat	2011-11-12 05:17:01 UTC (rev 8538)
+++ trunk/packages/freemedforms/trunk/debian/compat	2011-11-12 07:12:27 UTC (rev 8539)
@@ -1 +1 @@
-7
+8

Modified: trunk/packages/freemedforms/trunk/debian/control
===================================================================
--- trunk/packages/freemedforms/trunk/debian/control	2011-11-12 05:17:01 UTC (rev 8538)
+++ trunk/packages/freemedforms/trunk/debian/control	2011-11-12 07:12:27 UTC (rev 8539)
@@ -5,15 +5,17 @@
 Uploaders: Eric Maeker <eric.maeker at gmail.com>,
  Andreas Tille <tille at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.1), quilt (>= 0.47), zlib1g-dev, libqt4-dev (>= 4.6.2), libxext-dev
+Build-Depends: debhelper (>= 8), zlib1g-dev, libqt4-dev (>= 4.6.2), libxext-dev
 Standards-Version: 3.9.2
 Homepage: http://www.freemedforms.com/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/freemedforms/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/freemedforms/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/freemedforms/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/freemedforms/trunk/
 
 Package: freemedforms
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, freemedforms-data (= ${source:Version}), libqtcore4 (>= 4.6.2), libqtgui4 (>= 4.6.2), libqt4-sql-sqlite, libqt4-sql-mysql, libqt4-xml, libqt4-network, libqt4-svg, libqt4-script, zlib1g
+Depends: ${shlibs:Depends}, ${misc:Depends}, freemedforms-data (= ${source:Version}),
+ libqtcore4 (>= 4.6.2), libqtgui4 (>= 4.6.2), libqt4-sql-sqlite, libqt4-sql-mysql,
+ libqt4-xml, libqt4-network, libqt4-svg, libqt4-script, zlib1g
 Description: Electronic Medical Record Manager
  FreeMedForms is developed by a international community of
  medical doctors and computer workers and is
@@ -49,22 +51,3 @@
  research groups.
  .
  This package contains the architecture independent data.
-
-Package: freemedforms-doc
-Architecture: all
-Section: doc
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: freemedforms
-Description: Documentation for FreeMedForms EMR
- FreeMedForms is developed by a international community of
- medical doctors and computer workers and is
- mainly intended for health professionals.
- .
- Currently, the suite is under development. It is
- available only for testing purposes.
- The main objective of FreeMedForms is to manage the
- electronic medical records based on your
- medical practice or the practice of clinical
- research groups.
- .
- This package contains the documentation of FreeMedForms.

Deleted: trunk/packages/freemedforms/trunk/debian/freemedforms-doc-en.install
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freemedforms-doc-en.install	2011-11-12 05:17:01 UTC (rev 8538)
+++ trunk/packages/freemedforms/trunk/debian/freemedforms-doc-en.install	2011-11-12 07:12:27 UTC (rev 8539)
@@ -1 +0,0 @@
-usr/share/doc/freemedforms/en

Deleted: trunk/packages/freemedforms/trunk/debian/freemedforms-doc-fr.install
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freemedforms-doc-fr.install	2011-11-12 05:17:01 UTC (rev 8538)
+++ trunk/packages/freemedforms/trunk/debian/freemedforms-doc-fr.install	2011-11-12 07:12:27 UTC (rev 8539)
@@ -1 +0,0 @@
-usr/share/doc/freemedforms/fr

Modified: trunk/packages/freemedforms/trunk/debian/rules
===================================================================
--- trunk/packages/freemedforms/trunk/debian/rules	2011-11-12 05:17:01 UTC (rev 8538)
+++ trunk/packages/freemedforms/trunk/debian/rules	2011-11-12 07:12:27 UTC (rev 8539)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with quilt
+	dh $@
 
 override_dh_auto_configure:
 	lrelease global_resources/translations/*.ts
@@ -18,12 +18,6 @@
 	make install
 
 override_dh_install:
-	# Install documentation
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/freemedforms/en
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/freemedforms/fr
-	cp -a global_resources/doc/freemedforms/en/html/* $(CURDIR)/debian/tmp/usr/share/doc/freemedforms/en
-	cp -a global_resources/doc/freemedforms/fr/html/* $(CURDIR)/debian/tmp/usr/share/doc/freemedforms/fr
-
 	# Remove those Links to dynamic libraries which have no version number (this should only
 	# be provided in -dev packages.  But some *.so files are real files without version number
 	# FIXME
@@ -32,12 +26,12 @@
 	# remove doc files from /usr/bin
 	rm -f debian/tmp/usr/bin/[CR]*
 
-	dh_install --autodest
+	dh_install
 
 #override_dh_shlibdeps:
 #	LD_LIBRARY_PATH=debian/tmp/usr/lib/freemedforms dh_shlibdeps -l/usr/lib/freemedforms
 
-override_dh_installdeb:
-	# remove extra license file
-	rm -f $(CURDIR)/debian/freemedforms-data/usr/share/freemedforms/textfiles/COPYING.txt
-	dh_installdeb
+#override_dh_installdeb:
+#	# remove extra license file
+#	rm -f $(CURDIR)/debian/freemedforms-data/usr/share/freemedforms/textfiles/COPYING.txt
+#	dh_installdeb