[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 8d7e0937340735ac65cd7fdf00f30e9b569ba936
Author: Jorge Soares <j.s.soares at gmail.com>
Date:   Thu Oct 16 17:10:41 2014 +0100

    preparing to revert
---
 debian/control | 7 +++++++
 debian/rules   | 7 +++++++
 debian/watch   | 4 ++++
 3 files changed, 18 insertions(+)

diff --git a/debian/control b/debian/control
index 9bae6e3..8a7d4f1 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 9),
 	       python3-numpy,
 	       python3-nose,
 <<<<<<< HEAD
+<<<<<<< HEAD
 	       samtools,
 	       help2man
 Standards-Version: 3.9.5
@@ -20,6 +21,12 @@ 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 4650aca..2c9076e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,14 @@ 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
 
@@ -20,6 +23,7 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
 <<<<<<< HEAD
+<<<<<<< HEAD
 	rm -rf build .pybuild
 	rm -rf $(mandir)
 
@@ -30,3 +34,6 @@ override_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.
diff --git a/debian/watch b/debian/watch
index 8e80e3d..5c395a9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,11 @@
 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