[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.44-782-gd639116

Mon Jun 18 21:14:51 UTC 2012

The following commit has been merged in the piatti branch:
commit a5620f0aa0df06fd50dd3e0d1323612c7dcc8ea6
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jun 18 21:52:50 2012 +0200

    * piuparts-master: depend on tango-icon-theme and drop sunny.png and
      weather-severe-alert.png and use links instead.

diff --git a/TODO b/TODO
index 7328815..9f5cbba 100644
--- a/TODO
+++ b/TODO
@@ -4,14 +4,6 @@ ahings to do for piuparts
 Please also check the BTS, especially the bugs with a severity
 higher than wishlist!
 
-for 0.45:
-
-- do not upload with sunny.png weather-severe-alert.png included. Replace them
-  with links and add depends to tango-icon-theme. Update copyright.
-
-- test installation via packages only.
-
-
 for 0.46:
 
 - slave.postinst should setup ~piupartss/.ssh/known_hosts from /etc/ssh,
diff --git a/debian/changelog b/debian/changelog
index 3ed1075..77b3a54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,9 +8,11 @@ piuparts (0.45) UNRELEASED; urgency=low
     dependencies.
   * Update piuparts.NEWS about master+slave packages.
   * Switch to debhelper8 packaging.
-  * debian/copyight: use versioned URI of the machine-readable copyright file,
+  * debian/copyright: use versioned URI of the machine-readable copyright file,
     thanks lintian.
   * Move /etc/sudoers.d/piuparts to piuparts-slave package.
+  * piuparts-master: depend on tango-icon-theme and drop sunny.png and
+    weather-severe-alert.png and use links instead.
 
   [ David Steele ]
   * Remove debian/postinst as it was only dealing with lenny time area
diff --git a/debian/control b/debian/control
index 3d31b14..aae9ed8 100644
--- a/debian/control
+++ b/debian/control
@@ -55,6 +55,7 @@ Recommends:
  python-rpy,
  r-base-dev,
  r-recommended,
+ tango-icon-theme
 Breaks:
  piuparts (<= 0.44)
 Replaces:
diff --git a/debian/copyright b/debian/copyright
index f24c86e..0afedfc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -33,66 +33,6 @@ License: GPL-2+
  License version 2 can be found in the file
  '/usr/share/common-licenses/GPL-2'.
 
-Files: */sunny.png */weather-severe-alert.png
-Comment: These files were downloaded from http://tango.freedesktop.org/releases/
- and released in the tango-icon-theme package. The license text is from that package.
-Copyright: 2005-2009 Ulisse Perusin <uli.peru at gmail.com>
-           2005-2009 Steven Garrity <sgarrity at silverorange.com>
-           2005-2009 Lapo Calamandrei <calamandrei at gmail.com>
-           2005-2009 Ryan Collier <rcollier at novell.com>
-           2005-2009 Rodney Dawes <dobey at novell.com>
-           2005-2009 Andreas Nilsson <nisses.mail at home.se>
-           2005-2009 Tuomas Kuosmanen <tigert at tigert.com>
-           2005-2009 Garrett LeSage <garrett at novell.com>
-           2005-2009 Jakub Steiner <jimmac at novell.com>
-License: Public Domain
- In the preparation of the 0.8.90 release Novell took care of tracking
- down all the contributors to get them to relicense their artwork
- into Public Domain.
- .
- The COPYING file of the tarball states the following:
- | The icons in this repository are herefore released into the Public Domain.
- .
- Additionally the copyright status of the files was tracked in the CVS and the
- rdf properties of the SVGs adjusted for all files that were put into Public
- Domain (see rdf:about and rdf:resource).  Both fields contain a link to the
- Creative Commons Public Domain Dediciation[0] as reproduced below:
- | Public Domain Dedication
- |
- | Copyright-Only Dedication (based on United States law) or Public Domain
- | Certification
- |
- | The person or persons who have associated work with this document (the
- | "Dedicator" or "Certifier") hereby either (a) certifies that, to the best
- | of his knowledge, the work of authorship identified is in the public
- | domain of the country from which the work is published, or (b)
- | hereby dedicates whatever copyright the dedicators holds in the work
- | of authorship identified below (the "Work") to the public domain. A
- | certifier, moreover, dedicates any copyright interest he may have in
- | the associated work, and for these purposes, is described as a
- | "dedicator" below.
- |
- | A certifier has taken reasonable steps to verify the copyright
- | status of this work. Certifier recognizes that his good faith efforts
- | may not shield him from liability if in fact the work certified is not
- | in the public domain.
- |
- | Dedicator makes this dedication for the benefit of the public at
- | large and to the detriment of the Dedicator's heirs and successors.
- | Dedicator intends this dedication to be an overt act of relinquishment
- | in perpetuity of all present and future rights under copyright law,
- | whether vested or contingent, in the Work. Dedicator understands that
- | such relinquishment of all rights includes the relinquishment of all
- | rights to enforce (by lawsuit or otherwise) those copyrights in the
- | Work.
- |
- | Dedicator recognizes that, once placed in the public domain, the Work
- | may be freely reproduced, distributed, transmitted, used, modified,
- | built upon, or otherwise exploited by anyone for any purpose, commercial
- | or non-commercial, and in any way, including by methods that have not
- | yet been invented or conceived.
- [0] http://creativecommons.org/licenses/publicdomain/
-
 Files: */debian.png */openlogo-ng-50.png
 Copyright: 1999 Software in the Public Interest
 License: Free
diff --git a/debian/piuparts-master.links b/debian/piuparts-master.links
new file mode 100644
index 0000000..9d65675
--- /dev/null
+++ b/debian/piuparts-master.links
@@ -0,0 +1,2 @@
+/usr/share/icons/Tango/24x24/status/sunny.png /usr/share/piuparts/htdocs/images/sunny.png
+/usr/share/icons/Tango/24x24/status/sunny.png /usr/share/piuparts/htdocs/images/weather-severe-alert.png
diff --git a/org/piuparts.debian.org/htdocs/images/sunny.png b/org/piuparts.debian.org/htdocs/images/sunny.png
deleted file mode 100644
index 17ec6a9..0000000
Binary files a/org/piuparts.debian.org/htdocs/images/sunny.png and /dev/null differ
diff --git a/org/piuparts.debian.org/htdocs/images/weather-severe-alert.png b/org/piuparts.debian.org/htdocs/images/weather-severe-alert.png
deleted file mode 100644
index 8de8ceb..0000000
Binary files a/org/piuparts.debian.org/htdocs/images/weather-severe-alert.png and /dev/null differ

-- 
piuparts git repository

