[med-svn] [Git][med-team/mgltools-vision][master] 7 commits: Depends idle-python2.7 only
Andreas Tille
gitlab at salsa.debian.org
Wed Dec 19 10:37:30 GMT 2018
Andreas Tille pushed to branch master at Debian Med / mgltools-vision
Commits:
dbe7f34a by Andreas Tille at 2018-12-19T10:33:01Z
Depends idle-python2.7 only
- - - - -
fe0461df by Andreas Tille at 2018-12-19T10:33:16Z
debhelper 11
- - - - -
cc2464f2 by Andreas Tille at 2018-12-19T10:33:19Z
Point Vcs fields to salsa.debian.org
- - - - -
42dbef35 by Andreas Tille at 2018-12-19T10:33:19Z
Standards-Version: 4.2.1
- - - - -
336dabd9 by Andreas Tille at 2018-12-19T10:33:19Z
Remove trailing whitespace in debian/copyright
- - - - -
b0ffe2db by Andreas Tille at 2018-12-19T10:34:12Z
Do not parse d/changelog
- - - - -
92508e50 by Andreas Tille at 2018-12-19T10:36:33Z
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,8 +1,20 @@
-mgltools-vision (1.5.7+dfsg-2) UNRELEASED; urgency=medium
+mgltools-vision (1.5.7+dfsg-2) unstable; urgency=medium
+ * Team upload
+
+ [ Jelmer Vernooij ]
* Remove unnecessary X-Python{,3}-Version field in debian/control.
- -- Jelmer Vernooij <jelmer at debian.org> Thu, 25 Oct 2018 00:03:58 +0000
+ [ Andreas Tille ]
+ * Depends idle-python2.7 only (not idle any more)
+ Closes: #890134
+ * debhelper 11
+ * Point Vcs fields to salsa.debian.org
+ * Standards-Version: 4.2.1
+ * Remove trailing whitespace in debian/copyright
+ * Do not parse d/changelog
+
+ -- Andreas Tille <tille at debian.org> Wed, 19 Dec 2018 11:34:12 +0100
mgltools-vision (1.5.7+dfsg-1) unstable; urgency=medium
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
@@ -5,13 +5,13 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
Section: non-free/science
XS-Autobuild: yes
Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
python-all,
python-numpy,
dh-python
-Standards-Version: 4.1.2
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/mgltools-vision.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/mgltools-vision.git
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/med-team/mgltools-vision
+Vcs-Git: https://salsa.debian.org/med-team/mgltools-vision.git
Homepage: http://mgltools.scripps.edu/
Package: mgltools-vision
@@ -19,7 +19,7 @@ Architecture: all
Depends: ${shlibs:Depends},
${misc:Depends},
${python:Depends},
- idle|idle-python2.7,
+ idle-python2.7,
mgltools-networkeditor,
mgltools-mglutil,
mgltools-support
=====================================
debian/copyright
=====================================
@@ -21,7 +21,7 @@ License: Scripps
received by you will be used only for NON COMMERCIAL purposes.
This license is issued to you as an individual.
.
- For COMMERCIAL use done with the software please contact Michel F.
+ For COMMERCIAL use done with the software please contact Michel F.
Sanner for details about commercial usage license agreements.
.
For any question regarding license agreements, please contact
@@ -34,16 +34,16 @@ License: Scripps
.
2. COMMERCIAL USAGE is defined as revenues generating activities. These
include using this software for consulting activities and selling
- applications built on top of, or using this software. Scientific
- research in an academic environment and teaching are considered
+ applications built on top of, or using this software. Scientific
+ research in an academic environment and teaching are considered
NON COMMERCIAL.
.
- 3. Copying Restrictions. You will not sell or otherwise distribute commercially
- these programs or derivatives to any other party, whether with or without
+ 3. Copying Restrictions. You will not sell or otherwise distribute commercially
+ these programs or derivatives to any other party, whether with or without
consideration.
.
- 4. Ownership of Software. You will not obtain, and will not attempt to
- obtain copyright coverage thereon without the express purpose written
+ 4. Ownership of Software. You will not obtain, and will not attempt to
+ obtain copyright coverage thereon without the express purpose written
consent of The Scripps Research Institute and Dr. Sanner.
.
5. IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
=====================================
debian/rules
=====================================
@@ -5,7 +5,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEBPKGNAME := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+include /usr/share/dpkg/default.mk
BRANCH=`cat debian/get-orig-source/current-branch`
RCVERSION=`cat debian/get-orig-source/rc-version`
@@ -20,13 +20,13 @@ override_dh_install:
dh_numpy
find debian -name "runVision" | xargs -r chmod +x
find debian -name *.jpg -o -name *.png -o -name *.pdb -o -name *.gif | xargs -r chmod 644
- mkdir -p debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME)
+ mkdir -p debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE)
for dir in Icons doc icons ; do \
- mv debian/$(DEBPKGNAME)/$(DISTDIR)/$${dir} debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME) ; \
- ln -sf ../../../../share/$(DEBPKGNAME)/$${dir} debian/$(DEBPKGNAME)/$(DISTDIR)/$${dir} ; \
+ mv debian/$(DEB_SOURCE)/$(DISTDIR)/$${dir} debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE) ; \
+ ln -sf ../../../../share/$(DEB_SOURCE)/$${dir} debian/$(DEB_SOURCE)/$(DISTDIR)/$${dir} ; \
done
- cp -a debian/lena-replacement/lena.jpg debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME)/doc/Examples
- cp -a debian/lena-replacement/lena.jpg debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME)/doc/Examples/matplotlib/Data
+ cp -a debian/lena-replacement/lena.jpg debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE)/doc/Examples
+ cp -a debian/lena-replacement/lena.jpg debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE)/doc/Examples/matplotlib/Data
get-orig-source:
./debian/get-orig-source/get-orig-source $(SRC) $(BRANCH) $(RCVERSION)
View it on GitLab: https://salsa.debian.org/med-team/mgltools-vision/compare/c0304edb28257cda2ce41fc4c8c53877ada7cda5...92508e50ef08129a26c9c4608fefd5f98cb8454a
--
View it on GitLab: https://salsa.debian.org/med-team/mgltools-vision/compare/c0304edb28257cda2ce41fc4c8c53877ada7cda5...92508e50ef08129a26c9c4608fefd5f98cb8454a
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/20181219/3be75b41/attachment-0001.html>
More information about the debian-med-commit
mailing list