From 502c6c4749721d2276dff67f2ea248014c479305 Mon Sep 17 00:00:00 2001 From: Paul Wise Date: Wed, 26 Mar 2014 17:23:53 +0800 Subject: [PATCH 1/3] Fix the link to the contributors site --- debianmemberportfolio/model/portfolio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debianmemberportfolio/model/portfolio.ini b/debianmemberportfolio/model/portfolio.ini index 733fe8b..0dccf71 100644 --- a/debianmemberportfolio/model/portfolio.ini +++ b/debianmemberportfolio/model/portfolio.ini @@ -101,7 +101,7 @@ gpgfinger.optional=true gpgweb.pattern=http://db.debian.org/fetchkey.cgi?fingerprint=%(gpgfp)s gpgweb.optional=true nm.pattern=https://nm.debian.org/public/person/%(username)s -contrib.pattern=https://contributors.debian.org/contributors/contributor/%(aliothusername)s +contrib.pattern=https://contributors.debian.org/contributor/%(email)s contrib.optional=true [ssh] From 923c463592830abe70fa8b7d7ae2ea7bf4059bc3 Mon Sep 17 00:00:00 2001 From: Paul Wise Date: Wed, 26 Mar 2014 17:45:19 +0800 Subject: [PATCH 2/3] Use SSL in links and commands where available --- debianmemberportfolio/model/portfolio.ini | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/debianmemberportfolio/model/portfolio.ini b/debianmemberportfolio/model/portfolio.ini index 0dccf71..a656087 100644 --- a/debianmemberportfolio/model/portfolio.ini +++ b/debianmemberportfolio/model/portfolio.ini @@ -31,12 +31,12 @@ alladdresses.pattern=http://qa.debian.org/developer.php?login=%(name)s [bugs] urls=received,reported,usertags,searchall,wnpp,correspondent,graph -received.pattern=http://bugs.debian.org/%(email)s -reported.pattern=http://bugs.debian.org/from:%(email)s -usertags.pattern=http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=%(email)s +received.pattern=https://bugs.debian.org/%(email)s +reported.pattern=https://bugs.debian.org/from:%(email)s +usertags.pattern=https://bugs.debian.org/cgi-bin/pkgreport.cgi?users=%(email)s searchall.pattern=http://bugs-search.debian.org/cgi-bin/search.cgi?phrase=%(name)s;search=search wnpp.pattern=http://qa.debian.org/developer.php?wnpp=%(email)s -correspondent.pattern=http://bugs.debian.org/cgi-bin/pkgreport.cgi?correspondent=%(email)s +correspondent.pattern=https://bugs.debian.org/cgi-bin/pkgreport.cgi?correspondent=%(email)s graph.pattern=http://qa.debian.org/data/bts/graphs/by-maint/%(email)s.png [build] @@ -45,17 +45,17 @@ buildd.pattern=https://buildd.debian.org/status/package.php?p=%(email)s&compact= [qa] urls=lintian,lintianfull,piuparts,patchtracker,dmd,duck -dmd.pattern=http://udd.debian.org/dmd.cgi?email=%(email)s +dmd.pattern=https://udd.debian.org/dmd.cgi?email=%(email)s lintian.pattern=http://lintian.debian.org/maintainer/%(email)s.html lintianfull.pattern=http://lintian.debian.org/full/%(email)s.html -piuparts.pattern=http://piuparts.debian.org/sid/maintainer/%(firstchar)s/%(email)s.html +piuparts.pattern=https://piuparts.debian.org/sid/maintainer/%(firstchar)s/%(email)s.html patchtracker.pattern=http://patch-tracker.debian.org/email/%(email)s duck.pattern=http://duck.debian.net/?sourcepackage=%(email)s [lists] urls=dolists,adolists,gmane -dolists.pattern=http://lists.debian.org/cgi-bin/search?author=%(name)s&sort=date -adolists.pattern=http://www.google.com/search?q=site%%3Alists.alioth.debian.org+%%22%(name)s%%22 +dolists.pattern=https://lists.debian.org/cgi-bin/search?author=%(name)s&sort=date +adolists.pattern=https://www.google.com/search?q=site%%3Alists.alioth.debian.org+%%22%(name)s%%22 gmane.pattern=http://search.gmane.org/?email=%(name)s&group=gmane.linux.debian.* # debconf list search has a tricky URL format # http://lists.debconf.org/lurker/search \ @@ -76,13 +76,13 @@ nm.pattern=https://nm.debian.org/public/nmstatus/%(username)s dbfinger.pattern=finger %(username)s@db.debian.org dbfinger.type=finger dbfinger.optional=true -db.pattern=http://db.debian.org/search.cgi?uid=%(username)s&dosearch=Search +db.pattern=https://db.debian.org/search.cgi?uid=%(username)s&dosearch=Search db.optional=true webid.pattern=http://webid.debian.net/maintainers/%(username)s webid.optional=true alioth.pattern=http://alioth.debian.org/users/%(aliothusername)s/ alioth.optional=true -wiki.pattern=http://wiki.debian.org/%(wikihomepage)s +wiki.pattern=https://wiki.debian.org/%(wikihomepage)s forum.pattern=http://forums.debian.net/memberlist.php?mode=viewprofile&u=%(forumsid)d forum.optional=true @@ -92,13 +92,13 @@ debtags.pattern=http://debtags.debian.net/reports/maint/%(email)s planetname.pattern=http://planet-search.debian.org/cgi-bin/search.cgi?terms=%%22%(name)s%%22 planetuser.pattern=http://planet-search.debian.org/cgi-bin/search.cgi?terms=%%22%(username)s%%22 planetuser.optional=true -links.pattern=http://www.google.com/search?hl=en&lr=&q=site%%3Adebian.org+%%22%(name)s%%22+-site%%3Anm.debian.org+-site%%3Alintian.debian.org+-site%%3Abugs.debian.org+-site%%3Alists.debian.org+-site%%3Apackages.debian.org+-site%%3Alists.alioth.debian.org+-site%%3Aftp.debian.org++-site%%3Apackages.qa.debian.org++-site%%3Aftp*.*.debian.org+-inurl%%3Adebian.org%%2Fdevel%%2Fpeople.+-inurl%%3Aindices%%2FMaintainers+-inurl%%3Adebian.org%%2Fdebian%%2Fproject++-inurl%%3A%%2Fdists%%2F&btnG=Search -website.pattern=http://www.google.com/search?q=site:www.debian.org+%(name)s +links.pattern=https://www.google.com/search?hl=en&lr=&q=site%%3Adebian.org+%%22%(name)s%%22+-site%%3Anm.debian.org+-site%%3Alintian.debian.org+-site%%3Abugs.debian.org+-site%%3Alists.debian.org+-site%%3Apackages.debian.org+-site%%3Alists.alioth.debian.org+-site%%3Aftp.debian.org++-site%%3Apackages.qa.debian.org++-site%%3Aftp*.*.debian.org+-inurl%%3Adebian.org%%2Fdevel%%2Fpeople.+-inurl%%3Aindices%%2FMaintainers+-inurl%%3Adebian.org%%2Fdebian%%2Fproject++-inurl%%3A%%2Fdists%%2F&btnG=Search +website.pattern=https://www.google.com/search?q=site:www.debian.org+%(name)s search.pattern=http://search.debian.org/cgi-bin/omega?P=%%22%(name)s%%22 gpgfinger.pattern=finger %(username)s/key@db.debian.org gpgfinger.type=finger gpgfinger.optional=true -gpgweb.pattern=http://db.debian.org/fetchkey.cgi?fingerprint=%(gpgfp)s +gpgweb.pattern=https://db.debian.org/fetchkey.cgi?fingerprint=%(gpgfp)s gpgweb.optional=true nm.pattern=https://nm.debian.org/public/person/%(username)s contrib.pattern=https://contributors.debian.org/contributor/%(email)s @@ -108,7 +108,7 @@ contrib.optional=true # SSH functions urls=owndndoms,miainfo,groupinfo # owned *.debian.net domains -owndndoms.pattern=ldapsearch -u -x -H ldap://db.debian.org -b dc=debian,dc=org uid=%(username)s dnsZoneEntry +owndndoms.pattern=ldapsearch -u -x -H ldaps://db.debian.org -b dc=debian,dc=org uid=%(username)s dnsZoneEntry owndndoms.type=ldapsearch owndndoms.optional=true # MIA information From 871284270db560bd03d5c9a30426f6aeeee67060 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Thu, 10 Apr 2014 18:06:39 +0200 Subject: [PATCH 3/3] prepare release 0.3.2 - update ChangeLog - bump version number in docs/source/conf.py and setup.py --- ChangeLog | 4 ++++ docs/source/conf.py | 4 ++-- setup.py | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc09b22..d9b5d81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-04-10 Jan Dittberner + * add patch by Paul Wise to use SSL where available + * add patch by Paul Wise to fix link to the contributors site + 2014-02-09 Jan Dittberner * renamed module from ddportfolio to debianmemberportfolio * add patch for DUCK URL by Paul Wise diff --git a/docs/source/conf.py b/docs/source/conf.py index f1afed6..bde4e28 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -53,9 +53,9 @@ copyright = u'2009-2014, Jan Dittberner' # built documents. # # The short X.Y version. -version = '0.3.1' +version = '0.3.2' # The full version, including alpha/beta/rc tags. -release = '0.3.1' +release = version # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 2fd613b..a9ebba4 100644 --- a/setup.py +++ b/setup.py @@ -28,14 +28,14 @@ except ImportError: setup( name='debianmemberportfolio', - version='0.3.1', + version='0.3.2', description='service to create Debian Member Portfolio URLs', long_description="""This is a service implementation that returns a set of personalized URLs as outlined in http://wiki.debian.org/DDPortfolio. It takes the Debian Member's full name and email address as input and returns a JSON formatted array of URLs.""", # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=['Development Status :: 3 - Alpha', + classifiers=['Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'License :: DFSG approved', 'License :: OSI approved :: ' + @@ -46,7 +46,7 @@ setup( author_email='jan@dittberner.info', url='http://debian-stuff.dittberner.info/debianmemberportfolio', license='AGPL-3.0+', - install_requires=["Pylons>=0.10rc1", 'babel>=0.9.4'], + install_requires=["Pylons>=1.0", 'babel>=0.9.6'], packages=find_packages(exclude=['ez_setup']), include_package_data=True, test_suite='nose.collector',