Merge branch 'release/0.3.2'
This commit is contained in:
		
						commit
						1e973cc7c4
					
				
					 4 changed files with 24 additions and 20 deletions
				
			
		| 
						 | 
					@ -1,3 +1,7 @@
 | 
				
			||||||
 | 
					2014-04-10  Jan Dittberner  <jan@dittberner.info>
 | 
				
			||||||
 | 
						* 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  <jan@dittberner.info>
 | 
					2014-02-09  Jan Dittberner  <jan@dittberner.info>
 | 
				
			||||||
	* renamed module from ddportfolio to debianmemberportfolio
 | 
						* renamed module from ddportfolio to debianmemberportfolio
 | 
				
			||||||
	* add patch for DUCK URL by Paul Wise
 | 
						* add patch for DUCK URL by Paul Wise
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -31,12 +31,12 @@ alladdresses.pattern=http://qa.debian.org/developer.php?login=%(name)s
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[bugs]
 | 
					[bugs]
 | 
				
			||||||
urls=received,reported,usertags,searchall,wnpp,correspondent,graph
 | 
					urls=received,reported,usertags,searchall,wnpp,correspondent,graph
 | 
				
			||||||
received.pattern=http://bugs.debian.org/%(email)s
 | 
					received.pattern=https://bugs.debian.org/%(email)s
 | 
				
			||||||
reported.pattern=http://bugs.debian.org/from:%(email)s
 | 
					reported.pattern=https://bugs.debian.org/from:%(email)s
 | 
				
			||||||
usertags.pattern=http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=%(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
 | 
					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
 | 
					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
 | 
					graph.pattern=http://qa.debian.org/data/bts/graphs/by-maint/%(email)s.png
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[build]
 | 
					[build]
 | 
				
			||||||
| 
						 | 
					@ -45,17 +45,17 @@ buildd.pattern=https://buildd.debian.org/status/package.php?p=%(email)s&compact=
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[qa]
 | 
					[qa]
 | 
				
			||||||
urls=lintian,lintianfull,piuparts,patchtracker,dmd,duck
 | 
					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
 | 
					lintian.pattern=http://lintian.debian.org/maintainer/%(email)s.html
 | 
				
			||||||
lintianfull.pattern=http://lintian.debian.org/full/%(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
 | 
					patchtracker.pattern=http://patch-tracker.debian.org/email/%(email)s
 | 
				
			||||||
duck.pattern=http://duck.debian.net/?sourcepackage=%(email)s
 | 
					duck.pattern=http://duck.debian.net/?sourcepackage=%(email)s
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[lists]
 | 
					[lists]
 | 
				
			||||||
urls=dolists,adolists,gmane
 | 
					urls=dolists,adolists,gmane
 | 
				
			||||||
dolists.pattern=http://lists.debian.org/cgi-bin/search?author=%(name)s&sort=date
 | 
					dolists.pattern=https://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
 | 
					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.*
 | 
					gmane.pattern=http://search.gmane.org/?email=%(name)s&group=gmane.linux.debian.*
 | 
				
			||||||
# debconf list search has a tricky URL format
 | 
					# debconf list search has a tricky URL format
 | 
				
			||||||
# http://lists.debconf.org/lurker/search \
 | 
					# 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.pattern=finger %(username)s@db.debian.org
 | 
				
			||||||
dbfinger.type=finger
 | 
					dbfinger.type=finger
 | 
				
			||||||
dbfinger.optional=true
 | 
					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
 | 
					db.optional=true
 | 
				
			||||||
webid.pattern=http://webid.debian.net/maintainers/%(username)s
 | 
					webid.pattern=http://webid.debian.net/maintainers/%(username)s
 | 
				
			||||||
webid.optional=true
 | 
					webid.optional=true
 | 
				
			||||||
alioth.pattern=http://alioth.debian.org/users/%(aliothusername)s/
 | 
					alioth.pattern=http://alioth.debian.org/users/%(aliothusername)s/
 | 
				
			||||||
alioth.optional=true
 | 
					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.pattern=http://forums.debian.net/memberlist.php?mode=viewprofile&u=%(forumsid)d
 | 
				
			||||||
forum.optional=true
 | 
					forum.optional=true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -92,23 +92,23 @@ 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
 | 
					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.pattern=http://planet-search.debian.org/cgi-bin/search.cgi?terms=%%22%(username)s%%22
 | 
				
			||||||
planetuser.optional=true
 | 
					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
 | 
					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=http://www.google.com/search?q=site:www.debian.org+%(name)s
 | 
					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
 | 
					search.pattern=http://search.debian.org/cgi-bin/omega?P=%%22%(name)s%%22
 | 
				
			||||||
gpgfinger.pattern=finger %(username)s/key@db.debian.org
 | 
					gpgfinger.pattern=finger %(username)s/key@db.debian.org
 | 
				
			||||||
gpgfinger.type=finger
 | 
					gpgfinger.type=finger
 | 
				
			||||||
gpgfinger.optional=true
 | 
					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
 | 
					gpgweb.optional=true
 | 
				
			||||||
nm.pattern=https://nm.debian.org/public/person/%(username)s
 | 
					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
 | 
					contrib.optional=true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[ssh]
 | 
					[ssh]
 | 
				
			||||||
# SSH functions
 | 
					# SSH functions
 | 
				
			||||||
urls=owndndoms,miainfo,groupinfo
 | 
					urls=owndndoms,miainfo,groupinfo
 | 
				
			||||||
# owned *.debian.net domains
 | 
					# 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.type=ldapsearch
 | 
				
			||||||
owndndoms.optional=true
 | 
					owndndoms.optional=true
 | 
				
			||||||
# MIA information
 | 
					# MIA information
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -53,9 +53,9 @@ copyright = u'2009-2014, Jan Dittberner'
 | 
				
			||||||
# built documents.
 | 
					# built documents.
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# The short X.Y version.
 | 
					# The short X.Y version.
 | 
				
			||||||
version = '0.3.1'
 | 
					version = '0.3.2'
 | 
				
			||||||
# The full version, including alpha/beta/rc tags.
 | 
					# The full version, including alpha/beta/rc tags.
 | 
				
			||||||
release = '0.3.1'
 | 
					release = version
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# The language for content autogenerated by Sphinx. Refer to documentation
 | 
					# The language for content autogenerated by Sphinx. Refer to documentation
 | 
				
			||||||
# for a list of supported languages.
 | 
					# for a list of supported languages.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										6
									
								
								setup.py
									
										
									
									
									
								
							
							
						
						
									
										6
									
								
								setup.py
									
										
									
									
									
								
							| 
						 | 
					@ -28,14 +28,14 @@ except ImportError:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
setup(
 | 
					setup(
 | 
				
			||||||
    name='debianmemberportfolio',
 | 
					    name='debianmemberportfolio',
 | 
				
			||||||
    version='0.3.1',
 | 
					    version='0.3.2',
 | 
				
			||||||
    description='service to create Debian Member Portfolio URLs',
 | 
					    description='service to create Debian Member Portfolio URLs',
 | 
				
			||||||
    long_description="""This is a service implementation that returns a set of
 | 
					    long_description="""This is a service implementation that returns a set of
 | 
				
			||||||
    personalized URLs as outlined in http://wiki.debian.org/DDPortfolio. It
 | 
					    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
 | 
					    takes the Debian Member's full name and email address as input and returns
 | 
				
			||||||
    a JSON formatted array of URLs.""",
 | 
					    a JSON formatted array of URLs.""",
 | 
				
			||||||
    # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
 | 
					    # 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',
 | 
					                 'Environment :: Web Environment',
 | 
				
			||||||
                 'License :: DFSG approved',
 | 
					                 'License :: DFSG approved',
 | 
				
			||||||
                 'License :: OSI approved :: ' +
 | 
					                 'License :: OSI approved :: ' +
 | 
				
			||||||
| 
						 | 
					@ -46,7 +46,7 @@ setup(
 | 
				
			||||||
    author_email='jan@dittberner.info',
 | 
					    author_email='jan@dittberner.info',
 | 
				
			||||||
    url='http://debian-stuff.dittberner.info/debianmemberportfolio',
 | 
					    url='http://debian-stuff.dittberner.info/debianmemberportfolio',
 | 
				
			||||||
    license='AGPL-3.0+',
 | 
					    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']),
 | 
					    packages=find_packages(exclude=['ez_setup']),
 | 
				
			||||||
    include_package_data=True,
 | 
					    include_package_data=True,
 | 
				
			||||||
    test_suite='nose.collector',
 | 
					    test_suite='nose.collector',
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue