[med-svn] r19532 - in trunk/packages/hmmer/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-07-05 20:15:45 +0000 (Sun, 05 Jul 2015)
New Revision: 19532

Removed:
   trunk/packages/hmmer/trunk/debian/patches/fix_clean_target
Modified:
   trunk/packages/hmmer/trunk/debian/changelog
   trunk/packages/hmmer/trunk/debian/patches/debian-changes-3.0-1
   trunk/packages/hmmer/trunk/debian/patches/debian-changes-3.0-2.1
   trunk/packages/hmmer/trunk/debian/patches/series
Log:
New upstream version


Modified: trunk/packages/hmmer/trunk/debian/changelog
===================================================================
--- trunk/packages/hmmer/trunk/debian/changelog	2015-07-05 19:38:13 UTC (rev 19531)
+++ trunk/packages/hmmer/trunk/debian/changelog	2015-07-05 20:15:45 UTC (rev 19532)
@@ -1,3 +1,10 @@
+hmmer (3.1b2-1) UNRELEASED; urgency=medium
+
+  * New upstream version (adapted patches)
+  * Moved debian/upstream to debian/upstream/metadata
+
+ -- Andreas Tille <tille at debian.org>  Sun, 05 Jul 2015 21:57:21 +0200
+
 hmmer (3.1b1-3) unstable; urgency=low
 
   * Apply patch from Adam Conrad <adconrad at debian.org> to build on

Modified: trunk/packages/hmmer/trunk/debian/patches/debian-changes-3.0-1
===================================================================
--- trunk/packages/hmmer/trunk/debian/patches/debian-changes-3.0-1	2015-07-05 19:38:13 UTC (rev 19531)
+++ trunk/packages/hmmer/trunk/debian/patches/debian-changes-3.0-1	2015-07-05 20:15:45 UTC (rev 19532)
@@ -4,7 +4,7 @@
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,7 @@ docdir      = @docdir@
  pdfdir      = @pdfdir@
  mandir      = @mandir@
  man1dir     = ${mandir}/man1

Modified: trunk/packages/hmmer/trunk/debian/patches/debian-changes-3.0-2.1
===================================================================
--- trunk/packages/hmmer/trunk/debian/patches/debian-changes-3.0-2.1	2015-07-05 19:38:13 UTC (rev 19531)
+++ trunk/packages/hmmer/trunk/debian/patches/debian-changes-3.0-2.1	2015-07-05 20:15:45 UTC (rev 19532)
@@ -8,7 +8,7 @@
 
 --- a/configure
 +++ b/configure
-@@ -3849,7 +3849,6 @@
+@@ -3914,7 +3914,6 @@ if test "$impl_choice" = "none"; then
      ia64-*-*)      impl_choice=sse;;
      i?86-*-*)      impl_choice=sse;;
      x86*-*-*)      impl_choice=sse;;
@@ -18,7 +18,7 @@
  fi
 --- a/configure.ac
 +++ b/configure.ac
-@@ -313,7 +313,6 @@
+@@ -313,7 +313,6 @@ if test "$impl_choice" = "none"; then
      ia64-*-*)      impl_choice=sse;;
      i?86-*-*)      impl_choice=sse;;
      x86*-*-*)      impl_choice=sse;;

Deleted: trunk/packages/hmmer/trunk/debian/patches/fix_clean_target
===================================================================
--- trunk/packages/hmmer/trunk/debian/patches/fix_clean_target	2015-07-05 19:38:13 UTC (rev 19531)
+++ trunk/packages/hmmer/trunk/debian/patches/fix_clean_target	2015-07-05 20:15:45 UTC (rev 19532)
@@ -1,48 +0,0 @@
-Author: Tim Booth <tbooth at ceh.ac.uk>
-Last-Update: Thu, 15 Aug 2013 16:34:31 +0100
-Description: Fix clean target by making sure it will always succeede
-
---- a/documentation/Makefile.in
-+++ b/documentation/Makefile.in
-@@ -24,12 +24,12 @@
- 
- clean:
- 	${QUIET_SUBDIR0}man       ${QUIET_SUBDIR1} clean
--	${QUIET_SUBDIR0}userguide ${QUIET_SUBDIR1} clean
-+	${QUIET_SUBDIR0}userguide ${QUIET_SUBDIR1} clean || true
- 	-rm -f *~
- 
- distclean:
- 	${QUIET_SUBDIR0}man       ${QUIET_SUBDIR1} distclean
--	${QUIET_SUBDIR0}userguide ${QUIET_SUBDIR1} distclean
-+	${QUIET_SUBDIR0}userguide ${QUIET_SUBDIR1} distclean || true
- 	-rm -f Makefile
- 
- ################################################################
-@@ -43,4 +43,4 @@
- # 
- # SVN $URL: https://svn.janelia.org/eddylab/eddys/src/hmmer/branches/3.1/documentation/Makefile.in $
- # SVN $Id: Makefile.in 3649 2011-08-11 15:12:30Z eddys $
--################################################################
-\ No newline at end of file
-+################################################################
---- a/easel/Makefile.in
-+++ b/easel/Makefile.in
-@@ -485,7 +485,7 @@
- # "make clean" removes almost everything except configuration files
- #
- clean:
--	${QUIET_SUBDIR0}documentation ${QUIET_SUBDIR1} clean
-+	${QUIET_SUBDIR0}documentation ${QUIET_SUBDIR1} clean || true
- 	${QUIET_SUBDIR0}testsuite     ${QUIET_SUBDIR1} clean
- 	${QUIET_SUBDIR0}miniapps      ${QUIET_SUBDIR1} clean
- 	-rm -f ${OBJS} libeasel.a
-@@ -502,7 +502,7 @@
- 
- 
- distclean: clean
--	${QUIET_SUBDIR0}documentation ${QUIET_SUBDIR1} distclean
-+	${QUIET_SUBDIR0}documentation ${QUIET_SUBDIR1} distclean || true
- 	${QUIET_SUBDIR0}testsuite     ${QUIET_SUBDIR1} distclean
- 	${QUIET_SUBDIR0}miniapps      ${QUIET_SUBDIR1} distclean
- 	-rm esl_config.h

Modified: trunk/packages/hmmer/trunk/debian/patches/series
===================================================================
--- trunk/packages/hmmer/trunk/debian/patches/series	2015-07-05 19:38:13 UTC (rev 19531)
+++ trunk/packages/hmmer/trunk/debian/patches/series	2015-07-05 20:15:45 UTC (rev 19532)
@@ -1,3 +1,2 @@
 debian-changes-3.0-1
 debian-changes-3.0-2.1
-fix_clean_target