[med-svn] [Git][med-team/mecat2][master] More files to exclude

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / mecat2


Commits:
7d355cd5 by Shayan Doust at 2020-06-30T13:51:50+01:00
More files to exclude

- - - - -


3 changed files:

- debian/copyright
- debian/patches/modify_makefiles.patch
- debian/rules


Changes:

=====================================
debian/copyright
=====================================
@@ -3,10 +3,11 @@ Upstream-Name: mecat2
 Source: https://github.com/xiaochuanle/MECAT2
 Files-Excluded: third_party/hdf5-1.10.4.tar.gz
                 DEXTRACTOR/*
+                src/ncbi_blast/*
+                src/fsa/*
 Comment:
- The hdf5-1.10.4.tar.gz file in third_party/ was removed as this 
- already exists within the debian repository pre-packaged. DEXTRACTOR 
- is packaged separately.
+ The files listed above were removed as these 
+ already exists within the debian repository pre-packaged.
 
 Files: *
 Copyright: 20xx-20yy <upstream>


=====================================
debian/patches/modify_makefiles.patch
=====================================
@@ -6,18 +6,25 @@ Last-Update: 2020-06-29
 
 --- mecat2.orig/Makefile
 +++ mecat2/Makefile
-@@ -8,47 +8,13 @@
- 
- BUILD_TOP_DIR := ${PWD}/${OS_TYPE}-${MACHINE_TYPE}
+@@ -1,54 +1,10 @@
+-PWD := $(shell pwd)
+-OS_TYPE		:= $(shell echo `uname`)
+-MACHINE_TYPE	:= $(shell echo `uname -m`)
+-ifeq (${MACHINE_TYPE}, x86_64)
+-	MACHINE_TYPE = amd64
+-endif
+-BUILD_DIR	:= ${PWD}/${OS_TYPE}-${MACHINE_TYPE}/bin
++.PHONY: all clean mecat
  
+-BUILD_TOP_DIR := ${PWD}/${OS_TYPE}-${MACHINE_TYPE}
+-
 -HDF5_VERSION ?= 1.10.4
 -HDF5_INSTALL = ${BUILD_TOP_DIR}/hdf5
 -HDF5_SOURCE = ${BUILD_TOP_DIR}/hdf5-${HDF5_VERSION}
 -HDF5_INCLUDE = ${HDF5_INSTALL}/include
 -HDF5_LIB = ${HDF5_INSTALL}/lib/libhdf5.a
 -HDF5_TAR_GZ = ${BUILD_TOP_DIR}/hdf5-$(HDF5_VERSION).tar.gz
-+.PHONY: all clean mecat
- 
+-
 -DEXTRACTOR_BIN_NAME = dexqv dexta dextract undexqv undexta
 -DEXTRACTOR_BIN = $(patsubst %, ${BUILD_DIR}/%, $(DEXTRACTOR_BIN_NAME))
 -


=====================================
debian/rules
=====================================
@@ -4,15 +4,6 @@
 export LC_ALL=C.UTF-8
 
 include /usr/share/dpkg/default.mk
-# this provides:
-# DEB_SOURCE: the source package name
-# DEB_VERSION: the full version of the package (epoch + upstream vers. + revision)
-# DEB_VERSION_EPOCH_UPSTREAM: the package's version without the Debian revision
-# DEB_VERSION_UPSTREAM_REVISION: the package's version without the Debian epoch
-# DEB_VERSION_UPSTREAM: the package's upstream version
-# DEB_DISTRIBUTION: the distribution(s) listed in the current entry of debian/changelog
-# SOURCE_DATE_EPOCH: the source release date as seconds since the epoch, as
-#                    specified by <https://reproducible-builds.org/specs/source-date-epoch/>
 
 # for hardening you might like to uncomment this:
 # export DEB_BUILD_MAINT_OPTIONS=hardening=+all
@@ -20,12 +11,3 @@ include /usr/share/dpkg/default.mk
 %:
 	dh $@
 
-### When overriding auto_test make sure DEB_BUILD_OPTIONS will be respected
-#override_dh_auto_test:
-#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-#	do_stuff_for_testing
-#endif
-
-### If you **really** can not use uscan (even not with mode=git) use a debian/get-orig-script
-#get-orig-source:
-#	. debian/get-orig-source



View it on GitLab: https://salsa.debian.org/med-team/mecat2/-/commit/7d355cd59f4aa20a7a96e23f8d903216155a6ef3

-- 
View it on GitLab: https://salsa.debian.org/med-team/mecat2/-/commit/7d355cd59f4aa20a7a96e23f8d903216155a6ef3
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200630/039e3399/attachment-0001.html>