[DebianGIS-dev] [SCM] tilestache branch, master, updated. upstream/1.0.1-12-g56f2815

2010-11-15 Thread David Paleino
The following commit has been merged in the master branch:
commit 1edf79fba45b90d4272926cac4af4d71de3ab694
Merge: 114cba93b41e40e1e77bd160c43e416948a4fde3 
4860a1f88c9ba0d2a3094d377648ca66036ec7e1
Author: David Paleino da...@debian.org
Date:   Mon Nov 15 21:22:52 2010 +0100

Merge commit 'upstream/1.2.2'


-- 
map tiles caching system

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel


[DebianGIS-dev] [SCM] tilestache branch, master, updated. upstream/1.0.1-12-g56f2815

2010-11-15 Thread David Paleino
The following commit has been merged in the master branch:
commit 39faa91362aaa1bdd645f15f9adc351696a5b8a2
Author: David Paleino da...@debian.org
Date:   Mon Nov 15 21:24:07 2010 +0100

New version

diff --git a/debian/changelog b/debian/changelog
index 7fb0d43..2fc86c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-tilestache (1.1.3-1) UNRELEASED; urgency=low
+tilestache (1.2.2-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #603050)
 

-- 
map tiles caching system

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel


[DebianGIS-dev] [SCM] tilestache branch, master, updated. upstream/1.0.1-12-g56f2815

2010-11-15 Thread David Paleino
The following commit has been merged in the master branch:
commit 56f2815f54343f48362d7b7f28d3498e551a34bc
Author: David Paleino da...@debian.org
Date:   Mon Nov 15 21:30:26 2010 +0100

Fix copyright file

diff --git a/debian/copyright b/debian/copyright
index 5b7adaf..1319a1f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,15 +6,41 @@ Copyright: © 2010, David Paleino da...@debian.org
 License: BSD
 
 Files: *
-Copyright: ©, Michal Migurski m...@stamen.com
+Copyright: © 2010, Michal Migurski m...@stamen.com
+ © 2010, Aaron Cope
 License: BSD
+X-Comment: not yet included in the tarball,
+ 
https://github.com/migurski/TileStache/commit/30aeaa3c111e6c21bacbc6ad8276114bd85d9305
 
 Files: TileStache/Goodies/Providers/DejaVuSansMono-alphanumeric.ttf
 Copyright: © 2003, Bitstream, Inc.
 License: other
 
 License: BSD
-X-Comment: TODO, mail written to upstream to know exact licensing terms
+ 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.
+ .
+ - Neither the name of the project nor the names of its contributors may be
+   used to endorse or promote products derived from this software without
+   specific prior written permission.
+ .
+ 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 HOLDER 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.
 
 License: other
  Bitstream Vera Fonts Copyright

-- 
map tiles caching system

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel