[med-svn] [fastaq] 01/01: Package builds, only lacking ITP and lintian W manpage-has-bad-whatis-entry even though the manpages are exactly the same as the ls man page

[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 ec1f91ef29ecc331fc4628533ae939352591a15d
Author: Jorge Soares <j.s.soares at gmail.com>
Date:   Mon Oct 20 08:51:28 2014 +0100

    Package builds, only lacking ITP and lintian W manpage-has-bad-whatis-entry even though the manpages are exactly the same as the ls man page
---
 debian/control      | 14 --------------
 debian/rules        | 16 +---------------
 debian/usage_to_man |  1 -
 debian/watch        |  8 --------
 4 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/debian/control b/debian/control
index 8a7d4f1..9fdda39 100644
--- a/debian/control
+++ b/debian/control
@@ -8,25 +8,11 @@ Build-Depends: debhelper (>= 9),
 	       python3-setuptools,
 	       python3-numpy,
 	       python3-nose,
-<<<<<<< HEAD
-<<<<<<< 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.
-=======
-	       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/rules b/debian/rules
index 2c9076e..58f2a1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,15 +3,9 @@
 export DH_VERBOSE := 1
 export PYBUILD_NAME=fastaq
 
-<<<<<<< HEAD
-<<<<<<< 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.
-=======
->>>>>>> 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
 
@@ -22,18 +16,10 @@ override_dh_auto_build:
 	cd $(CURDIR)/doc
 
 override_dh_auto_clean:
-<<<<<<< HEAD
-<<<<<<< HEAD
 	rm -rf build .pybuild
 	rm -rf $(mandir)
 
 override_dh_installman:
 	mkdir -p $(mandir)
 	$(debfolder)/usage_to_man
-	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.
-=======
-	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.
+	dh_installman --
\ No newline at end of file
diff --git a/debian/usage_to_man b/debian/usage_to_man
index 47b7f2d..32f28b8 100755
--- a/debian/usage_to_man
+++ b/debian/usage_to_man
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 use strict;
 use warnings;
-use Data::Dumper;
 
 #Converts Fastaq python scripts usage into man pages.
 #The man pages are placed in the man folder of the main Fastaq directory
diff --git a/debian/watch b/debian/watch
index 5c395a9..46c1516 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,11 +1,3 @@
 version=3
-<<<<<<< HEAD
-<<<<<<< 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.
-=======
-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