[med-svn] [Git][med-team/conda-build][master] 2 commits: For very strange reasons Git does not like the line endings of two files and...

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / conda-build


Commits:
31c1dab1 by Andreas Tille at 2019-11-20T10:43:37Z
For very strange reasons Git does not like the line endings of two files and decided to change these files
This hack reverts that specific change by simply unpacking the files again from original tarball

- - - - -
6c223cf9 by Andreas Tille at 2019-11-20T10:45:14Z
Depends: conda

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -7,16 +7,18 @@ Build-Depends: debhelper-compat (= 12),
                dh-python,
                python3,
                python3-setuptools,
-               python3-pytest
+               python3-pytest,
+               conda <!nocheck>
 Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/med-team/conda-build
 Vcs-Git: https://salsa.debian.org/med-team/conda-build.git
 Homepage: https://conda.io/
 
 Package: conda-build
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Architecture: all
+Depends: ${python3:Depends},
+         ${misc:Depends},
+         conda
 Description: commands and tools for building conda packages
  Conda is a cross-platform, language-agnostic binary package manager. It
  is the package manager used by Anaconda installations, but it may be


=====================================
debian/rules
=====================================
@@ -19,3 +19,9 @@ include /usr/share/dpkg/default.mk
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
+
+# For very strange reasons Git does not like the line endings of two files and decided to change these files
+# This hack reverts that specific change by simply unpacking the files again from original tarball
+override_dh_clean:
+	dh_clean
+	tar -xaf ../$(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz --wildcards --no-anchored -C `dirname $(CURDIR)` 'conda-build-*/tests/test-recipes/metadata/_c_vendoring_detection/*'



View it on GitLab: https://salsa.debian.org/med-team/conda-build/compare/558ebba1f0f36851c9f04a381e8b589e6fb8bc2f...6c223cf9d4df7a1238a4e7d6f9a1e071056b3e95

-- 
View it on GitLab: https://salsa.debian.org/med-team/conda-build/compare/558ebba1f0f36851c9f04a381e8b589e6fb8bc2f...6c223cf9d4df7a1238a4e7d6f9a1e071056b3e95
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/20191120/60523153/attachment-0001.html>