[med-svn] [fastaq] 01/01: preparing to revert

[Jorge Soares]

This is an automated email from the git hooks/post-receive script.

jssoares-guest pushed a commit to branch master
in repository fastaq.

commit bec93035b74b0442756b72c307d9e7df15b4d846
Author: Jorge Soares <j.s.soares at gmail.com>
Date:   Thu Oct 16 17:09:33 2014 +0100

    preparing to revert
---
 debian/control                                     |  7 ++++++
 ...ay-import-statements-for-manpage-creation.patch | 28 +++++++++++++++-------
 debian/rules                                       |  9 ++++++-
 debian/watch                                       |  4 ++++
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 9fdda39..9bae6e3 100644
--- a/debian/control
+++ b/debian/control
@@ -8,11 +8,18 @@ Build-Depends: debhelper (>= 9),
 	       python3-setuptools,
 	       python3-numpy,
 	       python3-nose,
+<<<<<<< HEAD
 	       samtools,
 	       help2man
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/fastaq.git
 Homepage: https://github.com/sanger-pathogens/Fastaq
+=======
+	       samtools
+Standards-Version: 3.9.5
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/fastaq.git
+Homepage: https://github.com/js21/fastaq
+>>>>>>> parent of c2545e1... Only errors form lintian are now ITP missing and missing manpages, but man page for fastaq_trim_Ns_at_end should be present.
 
 Package: fastaq
 Architecture: any
diff --git a/debian/patches/delay-import-statements-for-manpage-creation.patch b/debian/patches/delay-import-statements-for-manpage-creation.patch
index f7d6bc8..b3120ce 100644
--- a/debian/patches/delay-import-statements-for-manpage-creation.patch
+++ b/debian/patches/delay-import-statements-for-manpage-creation.patch
@@ -1,12 +1,22 @@
-From: Jorge Soares <j.s.soares at gmail.com>
-Subject: Delayed import of API modules to allow for automated manpage creation with help2man.
-
-Origin: upstream, https://github.com/sanger-pathogens/Fastaq.git
-
-Delayed import of API modules to allow for automated manpage creation with help2man.
-For help2man to work the modules provided by this package would need to be already installed.
-Delaying the import step of this package's modules was the most pragmatic approach to this problem.
-
+Description: Delay import of Fastaq modules by the python executables 
+ Man pages for this package are being automatically created with through the
+ help2man wrapper called usage_to_man. help2man calls the python executables
+ with the -h option and converts the usage into a man page.
+ .
+ The first step done by all the executables is the import of the modules deployed
+ by this package. Since the package is not installed in the system at build time,
+ the man pages would never be properly created.
+ .
+ This patch solves this problem by importing the modules in this package after
+ the argument parsing code.
+ .
+ Upstream prefered to keep the code as it is for styling reasons, which is
+ perfectly reasonable  
+ .
+ fastaq (1.5.0-1) UNRELEASED; urgency=low
+ .
+   * Initial release (Closes: #1234)
+Author: DMPT <debian-med-packaging at lists.alioth.debian.org>
 --- a/scripts/fastaq_capillary_to_pairs
 +++ b/scripts/fastaq_capillary_to_pairs
 @@ -1,7 +1,6 @@
diff --git a/debian/rules b/debian/rules
index 58f2a1b..4650aca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,12 @@
 export DH_VERBOSE := 1
 export PYBUILD_NAME=fastaq
 
+<<<<<<< HEAD
 mandir := $(CURDIR)/debian/man
 debfolder := $(CURDIR)/debian
 
+=======
+>>>>>>> parent of c2545e1... Only errors form lintian are now ITP missing and missing manpages, but man page for fastaq_trim_Ns_at_end should be present.
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
@@ -16,10 +19,14 @@ override_dh_auto_build:
 	cd $(CURDIR)/doc
 
 override_dh_auto_clean:
+<<<<<<< HEAD
 	rm -rf build .pybuild
 	rm -rf $(mandir)
 
 override_dh_installman:
 	mkdir -p $(mandir)
 	$(debfolder)/usage_to_man
-	dh_installman --
\ No newline at end of file
+	dh_installman --
+=======
+	rm -rf build .pybuild
+>>>>>>> parent of c2545e1... Only errors form lintian are now ITP missing and missing manpages, but man page for fastaq_trim_Ns_at_end should be present.
diff --git a/debian/watch b/debian/watch
index 46c1516..8e80e3d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,7 @@
 version=3
+<<<<<<< HEAD
 https://github.com/sanger-pathogens/fastaq/releases .*/archive/v(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
+=======
+https://github.com/sanger-pathogens/fastaq/releases .*/archive/(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
+>>>>>>> parent of c2545e1... Only errors form lintian are now ITP missing and missing manpages, but man page for fastaq_trim_Ns_at_end should be present.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fastaq.git