[med-svn] r12461 - trunk/packages/gnumed-client/trunk/debian

Tue Oct 23 09:34:51 UTC 2012

Author: tille
Date: 2012-10-23 09:34:51 +0000 (Tue, 23 Oct 2012)
New Revision: 12461

Added:
   trunk/packages/gnumed-client/trunk/debian/README.source
Removed:
   trunk/packages/gnumed-client/trunk/debian/gnumed-doc.linktrees
Modified:
   trunk/packages/gnumed-client/trunk/debian/changelog
   trunk/packages/gnumed-client/trunk/debian/control
   trunk/packages/gnumed-client/trunk/debian/gnumed-doc.links
   trunk/packages/gnumed-client/trunk/debian/rules
   trunk/packages/gnumed-client/trunk/debian/watch
Log:
New upstream version; take over the fixes from wheezy branch to make sure the package does not ship JavaScript files without source


Added: trunk/packages/gnumed-client/trunk/debian/README.source
===================================================================

--- trunk/packages/gnumed-client/trunk/debian/README.source	                        (rev 0)
+++ trunk/packages/gnumed-client/trunk/debian/README.source	2012-10-23 09:34:51 UTC (rev 12461)
@@ -0,0 +1,22 @@
+JavaScript source files
+=======================
+
+Upstream source of GNUmed client is distributed with compressed
+JavaScript files that are not considered as source code.  These files
+are part of the GNUmed documentation which is using a FosWiki export.
+The requirement of providing the source code for those files is
+fullfilled in two different ways:
+
+  1. JQuery is used in its Debian packaged flavour anyway so these
+     files are simply removed from source tarball
+
+  2. Those JavaScript files which are not packaged for Debian are
+     downloaded from their original location (FosWiki SVN, see
+     debian/JS/get) and provided in the directory debian/JS in
+     uncompressed source.
+
+     GNUmed upstream confirmed that the results obtained from these
+     sources via yui-compressor could be perfectly used instead of
+     the compressed files JS files inside GNUmed upstream source.
+
+ -- Andreas Tille <tille at debian.org>  Mon, 15 Oct 2012 12:37:29 +0200

Modified: trunk/packages/gnumed-client/trunk/debian/changelog
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/changelog	2012-10-23 09:32:33 UTC (rev 12460)
+++ trunk/packages/gnumed-client/trunk/debian/changelog	2012-10-23 09:34:51 UTC (rev 12461)
@@ -1,7 +1,20 @@
-gnumed-client (1.2.3-2) UNRELEASED; urgency=low
+gnumed-client (1.2.5+dfsg-1) UNRELEASED; urgency=low
 
+  * New upstream version
   * Suggests: wakeonlan | etherwake | gwakeonlan, nvram-wakeup
     as suggested by upstream
+  * debian/rules: get-orig-source target that removes JavaScript
+    files without source that are not used anyway from source tarball
+  * debian/copyright: Document what JavaSource files are removed from
+    upstream tarball
+  * debian/README.source: Document that some JavaScript files were removed
+    and some were provided as source
+  * debian/JS: Provide source code of remaining JavaScript files
+    Closes: #685351
+  * debian/dh_linktrees: deleted because dh_linktrees tries to work on
+    files which are removed now - rather use dh_links instead
+  * debian/watch: mangle version with '+dfsg' suffix
+  * debian/control: Standards-Version: 3.9.4 (no changes needed)
 
  -- Andreas Tille <tille at debian.org>  Mon, 20 Aug 2012 13:03:42 +0200
 

Modified: trunk/packages/gnumed-client/trunk/debian/control
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/control	2012-10-23 09:32:33 UTC (rev 12460)
+++ trunk/packages/gnumed-client/trunk/debian/control	2012-10-23 09:34:51 UTC (rev 12461)
@@ -6,7 +6,7 @@
 Uploaders: Andreas Tille <tille at debian.org>, Sebastian Hilbert <sebastian.hilbert at gmx.net>
 Build-Depends: debhelper (>= 9), po-debconf, python (>= 2.6),
  dh-linktree, libjs-jquery, libjs-jquery-livequery
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gnumed-client/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/gnumed-client/trunk/
 Homepage: http://www.gnumed.de

Modified: trunk/packages/gnumed-client/trunk/debian/gnumed-doc.links
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/gnumed-doc.links	2012-10-23 09:32:33 UTC (rev 12460)
+++ trunk/packages/gnumed-client/trunk/debian/gnumed-doc.links	2012-10-23 09:34:51 UTC (rev 12461)
@@ -1 +1,3 @@
-usr/share/doc/gnumed/user-manual/Gnumed/GnumedManual.html usr/share/doc/gnumed/user-manual/Gnumed/index.html
+usr/share/doc/gnumed/user-manual/Gnumed/GnumedManual.html	usr/share/doc/gnumed/user-manual/Gnumed/index.html
+usr/share/javascript/jquery-livequery/jquery.livequery.js	usr/share/doc/gnumed/user-manual/rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js
+usr/share/javascript/jquery/jquery.js				usr/share/doc/gnumed/user-manual/rsrc/System/JQueryPlugin/jquery-1.4.3.js

Deleted: trunk/packages/gnumed-client/trunk/debian/gnumed-doc.linktrees
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/gnumed-doc.linktrees	2012-10-23 09:32:33 UTC (rev 12460)
+++ trunk/packages/gnumed-client/trunk/debian/gnumed-doc.linktrees	2012-10-23 09:34:51 UTC (rev 12461)
@@ -1,2 +0,0 @@
-replace usr/share/javascript/jquery-livequery/jquery.livequery.js usr/share/doc/gnumed/user-manual/rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js
-replace usr/share/javascript/jquery/jquery.js			usr/share/doc/gnumed/user-manual/rsrc/System/JQueryPlugin/jquery-1.4.3.js

Modified: trunk/packages/gnumed-client/trunk/debian/rules
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/rules	2012-10-23 09:32:33 UTC (rev 12460)
+++ trunk/packages/gnumed-client/trunk/debian/rules	2012-10-23 09:34:51 UTC (rev 12461)
@@ -38,5 +38,10 @@
 	# Remove appendix .py from gm_ctl_client
 	cp -a client/connectors/gm_ctl_client.py debian/$(client)/usr/bin/gm_ctl_client
 
-#override_dh_pysupport:
-#	dh_pysupport /usr/share/gnumed/Gnumed
+# Remark: The following uscan command requires devscripts > 2.12.4 which is not
+#         yet released at the time of this package release.  The code can be obtained
+#         via
+#   git clone git://tille@git.debian.org/git/users/tille/devscripts.git
+#         and then use scripts/uscan.pl
+get-orig-source:
+	uscan --verbose --repack-compression xz

Modified: trunk/packages/gnumed-client/trunk/debian/watch
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/watch	2012-10-23 09:32:33 UTC (rev 12460)
+++ trunk/packages/gnumed-client/trunk/debian/watch	2012-10-23 09:34:51 UTC (rev 12461)
@@ -1,9 +1,5 @@
 version=3
 
-# This will fail until upstream creates a dir 0.6 with only release candidates
-# http://www.gnumed.de/downloads/client/([\d\.]+)/GNUmed-client\.(.*)\.tgz
-
-# This might work as replacement in case the Wiki mighth contain proper links to the tarball
-# http://wiki.gnumed.de/bin/view/Gnumed/ReleaseStatus \
+opts="dversionmangle=s/\+dfsg//g" \
 http://wiki.gnumed.de/bin/view/Gnumed/InstallerGuideHomeShort \
   http://www.gnumed.de/downloads/client/[\d\.]+/gnumed-client\.([\d\.]+)\.tgz


