pics: $(SVGIS) $(ICONSIZED)
clean::
- for p in *.svg; do rm -f $${p%*.svg}.{pdf,eps,png}; done
+ for p in *.svg; do [ "$$p" = ndhackergotchi.svg ] || rm -f $${p%*.svg}.{pdf,eps,png}; done
rm -rf *_tuned
rm -f $(ICONSIZED)
# all currently supported dists
allnddists="nd+debian-squeeze nd+debian-wheezy nd+debian-jessie nd+debian-sid \
- nd+ubuntu-lucid nd+ubuntu-precise nd+ubuntu-quantal nd+ubuntu-raring nd+ubuntu-saucy nd+ubuntu-trusty"
+ nd+ubuntu-lucid nd+ubuntu-precise nd+ubuntu-raring nd+ubuntu-saucy nd+ubuntu-trusty"
alldists="$allnddists debian-squeeze debian-wheezy debian-jessie debian-sid"
# default is debian
-neurodebian (0.33~a1) unstable; urgency=medium
+neurodebian (0.33) unstable; urgency=medium
- * New "upstream" release
+ * Support popularity-contest >= 1.61 encrypting submissions:
+ - provide GPG public key for encryption of submissions
+ * Updated list of currently supported Ubuntu releases
* New features:
- neurodebian and neurodebian packages to provide 1-click
NeuroDebian deployment on Debian/Ubuntu boxesw
- -- Yaroslav Halchenko <debian@onerussian.com> Mon, 28 Jul 2014 20:03:12 -0400
+ -- Yaroslav Halchenko <debian@onerussian.com> Fri, 08 Aug 2014 14:21:46 -0400
neurodebian (0.32) neurodebian; urgency=low
Upstream-Contact: NeuroDebian team <team@neuro.debian.net>
Source-Location: http://git.debian.org/?p=pkg-exppsy/neurodebian.git
-
Files: *
-Copyright: 2009-2014 NeuroDebian Team
+Copyright: 2009-2014 NeuroDebian Team (Yaroslav Halchenko, Michael Hanke, et al.)
License: GPL-3+
- On Debian systems the full text of the GNU General Public License can be found
- in the `/usr/share/common-licenses/GPL-3' file.
Files: artwork/openlogo*.svg
Copyright: 1999 Software in the Public Interest
-License: MIT
+License: Expat
+
+Files: sphinx/sphinxext/quote.py
+Copyright: 2010, Yaroslav O. Halchenko
+ 2007-2010, Sphinx team
+License: BSD-2
+
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+
+License: Expat
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+License: BSD-2
+ All rights reserved.
+ .
+ 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.
+ .
+ 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
+ OWNER 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.
+
--- /dev/null
+usr/share/popularity-contest
+etc/popularity-contest.d
--- /dev/null
+popcon/neurodebian.conf /etc/popularity-contest.d
+popcon/neurodebian-popcon.gpg /usr/share/popularity-contest
#!/bin/bash -e
+# following to be duplicated within postrm as well, but may be with
+# "Removing" message
popcon_conf=/etc/popularity-contest.conf
-if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
+nd_popcon_conf=/etc/popularity-contest.d/neurodebian.conf
+remove_neurodebian_popcon_pre161() {
# Adjust popularity-contest.conf
+ if [ -e "$popcon_conf" ] \
+ && grep -q "http://neuro.debian.net/cgi-bin/popcon-submit.cgi" $popcon_conf; then
+ #echo "Removing NeuroDebian url for Popularity Contest submissions."
+ # First remove any explicit mentioning and then empty additions
+ sed -i -e 's,http://neuro.debian.net/cgi-bin/popcon-submit.cgi,,g' \
+ -e '/SUBMITURLS+=" *"/d' \
+ -e '/SUBMITURLS="$SUBMITURLS *"/d' \
+ "$popcon_conf"
+ fi
+}
+
+add_neurodebian_popcon_pre161() {
+ # Adjust main popularity-contest configuration file. Should be
+ # used only with older versions of the popularity contest.
if [ -e "$popcon_conf" ]; then
# Fix dashism missing += operator
if grep -q 'SUBMITURLS+="' "$popcon_conf"; then
echo -e 'SUBMITURLS="$SUBMITURLS http://neuro.debian.net/cgi-bin/popcon-submit.cgi"' >> "$popcon_conf"
fi
fi
+}
+
+add_neurodebian_popcon_161() {
+ # 1.60 introduced encryption and a way to provide multiple keys to
+ # encrypt submissions to multiple servers.
+
+ # "Installation" is taken care of through installing files under
+ # /etc/popularity-contest.d, so no additional actions necessary here
+ :
+}
+
+popcon_version=$(dpkg -l popularity-contest | tail -n 1 | awk '{print $3;}')
+
+if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
+ if dpkg --compare-versions $popcon_version lt 1.61; then
+ add_neurodebian_popcon_pre161
+ else
+ # Assure that we have no "old" settings for submission
+ remove_neurodebian_popcon_pre161 || :
+ fi
fi
#DEBHELPER#
#DEBHELPER#
-# If requested to be purged -- remove our entry
popcon_conf=/etc/popularity-contest.conf
-if [ "$1" = "purge" ]; then
+nd_popcon_conf=/etc/popularity-contest.d/neurodebian.conf
+remove_neurodebian_popcon_pre161() {
# Adjust popularity-contest.conf
- if [ -e "$popcon_conf" ]; then
+ if [ -e "$popcon_conf" ] \
+ && grep -q "http://neuro.debian.net/cgi-bin/popcon-submit.cgi" $popcon_conf; then
echo "Removing NeuroDebian url for Popularity Contest submissions."
# First remove any explicit mentioning and then empty additions
sed -i -e 's,http://neuro.debian.net/cgi-bin/popcon-submit.cgi,,g' \
-e '/SUBMITURLS="$SUBMITURLS *"/d' \
"$popcon_conf"
fi
+}
+
+# If requested to be purged -- remove our entry
+if [ "$1" = "purge" ]; then
+ remove_neurodebian_popcon_pre161
fi
raring = Ubuntu 13.04 "Raring Ringtail" (raring)
saucy = Ubuntu 13.10 "Saucy Salamander" (saucy)
trusty = Ubuntu 14.04 "Trusty Tahr" (trusty)
+utopic = Ubuntu 14.10 "Utopic Unicorn" (utopic)
[metadata]
# base url: <url>/<src_pkg-name>/<file>
# is a tuple of a build family ID and a release name joined by a dash, e.g.
# debian-sid
environments = nd+debian-sid nd+debian-jessie nd+debian-wheezy nd+debian-squeeze
- nd+ubuntu-raring nd+ubuntu-quantal nd+ubuntu-precise nd+ubuntu-lucid
+ nd+ubuntu-lucid nd+ubuntu-precise nd+ubuntu-raring nd+ubuntu-saucy nd+ubuntu-trusty
# what command to use for package building: pbuilder or cowbuilder
builder = pbuilder
raring = nd13.04
saucy = nd13.10
trusty = nd14.04
+utopic = nd14.10
--- /dev/null
+KEYRING="$KEYRING --keyring /usr/share/popularity-contest/neurodebian-popcon.gpg"
+POPCONKEY="$POPCONKEY -r 0x544665CB8B48DE1D"
+SUBMITURLS="$SUBMITURLS http://neuro.debian.net/cgi-bin/popcon-submit.cgi"
if(mir in mirrors) {
var retrepo = "wget -O- http://neuro.debian.net/lists/" + rel + "."
+ mir + "." + comp + " | sudo tee /etc/apt/sources.list.d/neurodebian.sources.list\n"
- + "sudo apt-key adv --recv-keys --keyserver pgp.mit.edu 2649A5A9\n";
+ + "sudo apt-key adv --recv-keys --keyserver hkp://pgp.mit.edu:80 2649A5A9\n";
return retrepo;
}
projects / neurodebian.git / commitdiff