diff options
| author | Thomas Goirand <thomas@goirand.fr> | 2013-11-20 19:47:48 +0800 |
|---|---|---|
| committer | Thomas Goirand <thomas@goirand.fr> | 2013-11-20 19:47:48 +0800 |
| commit | 1935fece8dc7ad5e4b24198fd0bf9c93ec80daa2 (patch) | |
| tree | 45abcb6788dd589c45d3cacb7a8c6347dd097761 /debian/copyright | |
| parent | 47a9ddc907a828ad079e5cdee6ed8c942af96d5e (diff) | |
| parent | 4523d576e9ad73f7ef14515bffc7c99c6184cdfd (diff) | |
| download | factory-boy-1935fece8dc7ad5e4b24198fd0bf9c93ec80daa2.tar factory-boy-1935fece8dc7ad5e4b24198fd0bf9c93ec80daa2.tar.gz | |
Merge branch 'debian/unstable' of ssh://git.gplhost.com/var/cache/git/openstack/factory-boy into debian/unstable
Conflicts:
debian/control
Diffstat (limited to 'debian/copyright')
| -rw-r--r-- | debian/copyright | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/debian/copyright b/debian/copyright index 16bfecf..54e3c27 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,10 +1,17 @@ -Format: http://dep.debian.net/deps/dep5 -Upstream-Name: novnc +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: factory_boy Source: https://github.com/rbarrois/factory_boy +Files: debian/* +Copyright: (c) 2012, Thomas Goirand <zigo@debian.org> + (c) 2012, Ghe Rivero <ghe.rivero@stackops.com> +License: MIT + Files: * Copyright: 2010 Mark Sandstrom License: MIT + +License: MIT 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 without limitation the rights |