[med-svn] [Git][med-team/conda][master] 3 commits: Fix cleaning after build time tests

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / conda


Commits:
ea36f3b2 by Andreas Tille at 2019-04-04T19:09:21Z
Fix cleaning after build time tests

- - - - -
271019d9 by Andreas Tille at 2019-04-04T20:22:42Z
Fix copyright

- - - - -
abbd9363 by Andreas Tille at 2019-04-04T20:22:57Z
Add ITP bug number

- - - - -


3 changed files:

- debian/changelog
- debian/copyright
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,5 @@
 conda (4.6.10+dfsg-1) UNRELEASED; urgency=medium
 
-  * Initial release (Closes: #<bug>)
-  TODO: https://salsa.debian.org/med-team/python-pycosat (#924294 - package is in new queue)
+  * Initial release (Closes: #926416)
 
  -- Andreas Tille <tille at debian.org>  Sun, 10 Mar 2019 09:33:50 +0100


=====================================
debian/copyright
=====================================
@@ -6,9 +6,33 @@ Files-Excluded: *.exe
                 *.ico
 
 Files: *
-Copyright: 20xx-20yy <upstream>
-License: <license>
+Copyright: 2012-2019 Anaconda, Inc.
+License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2019 Andreas Tille <tille at debian.org>
-License: <license>
+License: BSD-3-clause
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the copyright holder nor the names of its
+      contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


=====================================
debian/rules
=====================================
@@ -50,5 +50,8 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	    $(CURDIR)/tmp_test_ignore/conda_env
 	CONDA_PKGS_DIRS=/tmp/pkgs dh_auto_test
 	# restore all tests
+	mv $(CURDIR)/tmp_test_ignore/conda_env/* tests/conda_env
+	rmdir $(CURDIR)/tmp_test_ignore/conda_env
 	mv $(CURDIR)/tmp_test_ignore/* tests
+	rmdir $(CURDIR)/tmp_test_ignore
 endif



View it on GitLab: https://salsa.debian.org/med-team/conda/compare/509324072078771c52cbc4b09eb28c7158436699...abbd93632392e216b8fc1247a44e66fbdc11acb4

-- 
View it on GitLab: https://salsa.debian.org/med-team/conda/compare/509324072078771c52cbc4b09eb28c7158436699...abbd93632392e216b8fc1247a44e66fbdc11acb4
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/20190404/8253f49a/attachment-0001.html>