vcs.maemo.org Git - oespirit1/blob - hildon-icons/mer-changes.patch

   1 --- hildon-icons-2.1.debian.orig/index.theme
   2 +++ hildon-icons-2.1.debian/index.theme
   3 @@ -2,7 +2,7 @@
   4  Name=hildon-Icons
   5  Comment=Default hildon Theme
   6  Directories=16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,16x16/hildon,26x26/apps,26x26/devices,26x26/filesystems,26x26/mimetypes,26x26/hildon,34x34/apps,34x34/devices,34x34/filesystems,34x34/mimetypes,34x34/hildon,40x40/apps,40x40/devices,40x40/filesystems,40x40/mimetypes,40x40/hildon,50x50/apps,50x50/devices,50x50/filesystems,50x50/mimetypes,50x50/hildon,250x250/hildon,scalable/apps,scalable/devices,scalable/filesystems,scalable/mimetypes,scalable/hildon
   7 -Inherits=gnome
   8 +Inherits=hicolor
   9
  10  [16x16/apps]
  11  Size=16
  12 --- hildon-icons-2.1.debian.orig/install-theme.sh
  13 +++ hildon-icons-2.1.debian/install-theme.sh
  14 @@ -25,9 +25,7 @@
  15  pushd $2
  16
  17  for i in $1/*/*.png; do
  18 -       INFO="`file $i | sed -e 's/,//g'`"
  19 -       IX="`echo $INFO | awk -- '{ print $5}'`"
  20 -       IY="`echo $INFO | awk -- '{ print $7}'`"
  21 +       eval $(basename `dirname $1` | awk -Fx '{ print "IX=" $1 " IY=" $2 }')
  22
  23         [ -n "$DH_VERBOSE" ] && echo "$i $IX $IY"
  24         if [ "$IX" = "$IY" ]; then
  25 --- hildon-icons-2.1.debian.orig/debian/rules
  26 +++ hildon-icons-2.1.debian/debian/rules
  27 @@ -0,0 +1,39 @@
  28 +#!/usr/bin/make -f
  29 +
  30 +build:
  31 +
  32 +clean:
  33 +       dh_testdir
  34 +       dh_testroot
  35 +       [ ! -f Makefile ] || $(MAKE) distclean
  36 +       dh_clean
  37 +
  38 +install: build
  39 +       dh_testdir
  40 +       dh_testroot
  41 +       dh_clean -k
  42 +       mkdir -p $(CURDIR)/debian/tmp/usr/share/icons/hildon
  43 +       cp index.theme $(CURDIR)/debian/tmp/usr/share/icons/hildon/
  44 +       ./install-theme.sh $(CURDIR)/icons $(CURDIR)/debian/tmp/usr/share/icons/hildon
  45 +       ./make-mime-symlinks.sh $(CURDIR)/debian/tmp/usr/share/icons/hildon/scalable
  46 +       ./make-mime-symlinks.sh $(CURDIR)/debian/tmp/usr/share/icons/hildon/26x26
  47 +
  48 +# Build architecture-independent files here.
  49 +binary-indep: build install
  50 +       dh_install -i
  51 +       dh_installchangelogs -i
  52 +       dh_installdocs -i
  53 +       dh_icons -i
  54 +       dh_link -i
  55 +       dh_compress -i
  56 +       dh_fixperms -i
  57 +       dh_installdeb -i
  58 +       dh_gencontrol -i
  59 +       dh_md5sums -i
  60 +       dh_builddeb -i
  61 +
  62 +# Build architecture-dependent files here.
  63 +binary-arch: build install
  64 +
  65 +binary: binary-indep binary-arch
  66 +.PHONY: build clean binary-indep binary-arch binary install
  67 --- hildon-icons-2.1.debian.orig/debian/compat
  68 +++ hildon-icons-2.1.debian/debian/compat
  69 @@ -0,0 +1 @@
  70 +4
  71 --- hildon-icons-2.1.debian.orig/debian/hildon-icons.install
  72 +++ hildon-icons-2.1.debian/debian/hildon-icons.install
  73 @@ -0,0 +1 @@
  74 +debian/tmp/usr
  75 --- hildon-icons-2.1.debian.orig/debian/control
  76 +++ hildon-icons-2.1.debian/debian/control
  77 @@ -0,0 +1,13 @@
  78 +Source: hildon-icons
  79 +Section: x11
  80 +Priority: optional
  81 +Maintainer: Debian Maemo Maintainers <pkg-maemo-maintainers@lists.alioth.debian.org>
  82 +Uploaders: Loic Minier <lool@dooz.org>, Jonny Lamb <jonnylamb@jonnylamb.com>, Riku Voipio <riku.voipio@iki.fi>
  83 +Build-Depends: debhelper (>= 5.0.51~)
  84 +Standards-Version: 3.8.0
  85 +
  86 +Package: hildon-icons
  87 +Architecture: all
  88 +Depends: gnome-icon-theme
  89 +Description: Default Hildon icon theme for maemo's SDK
  90 + This is the default Hildon icon theme for maemo's SDK.
  91 --- hildon-icons-2.1.debian.orig/debian/copyright
  92 +++ hildon-icons-2.1.debian/debian/copyright
  93 @@ -0,0 +1,27 @@
  94 +This package was downloaded from:
  95 +    <http://repository.maemo.org/pool/maemo4.1/free/s/sdk-default-icons/>
  96 +
  97 +Initial packaging was updated for Ubuntu by Loïc Minier <lool@dooz.org> on
  98 +Tue, 24 Jun 2008 13:56:51 +0200.
  99 +
 100 +The original debian/copyright follows:
 101 +
 102 +Copyright (C) 2006-2008 Nokia Corporation. All rights reserved.
 103 +Contact: Maemo Integration <integration@maemo.org>
 104 +
 105 +This software is licensed under the Creative Commons Attribution 3.0 License,
 106 +which can be found at http://creativecommons.org/licenses/by/3.0/
 107 +
 108 +THE SOFTWARE IS DISTRIBUTED AS-IS WITH NO REPRESENTATIONS OR  WARRANTIES OF ANY
 109 +KIND CONCERNING THE WORK, EXPRESS, IMPLIED,  STATUTORY OR OTHERWISE, INCLUDING,
 110 +WITHOUT LIMITATION,  WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A
 111 +PARTICULAR  PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER
 112 +DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,  WHETHER OR NOT
 113 +DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW  THE EXCLUSION OF IMPLIED
 114 +WARRANTIES, SO SUCH EXCLUSION MAY NOT  APPLY TO YOU.
 115 +
 116 +EXCEPT TO THE EXTENT REQUIRED BY  APPLICABLE LAW, IN NO EVENT WILL NOKIA
 117 +CORPORATION BE LIABLE TO YOU ON  ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL,
 118 +CONSEQUENTIAL,  PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR
 119 +THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE  POSSIBILITY OF
 120 +SUCH DAMAGES.
 121 --- hildon-icons-2.1.debian.orig/debian/changelog
 122 +++ hildon-icons-2.1.debian/debian/changelog
 123 @@ -0,0 +1,29 @@
 124 +hildon-icons (2.1.debian-2mer1) jaunty; urgency=low
 125 +
 126 +  * Change Inherits to hicolor.
 127 +
 128 + -- Carsten V. Munk <cvm@cs.au.dk>  Sun, 22 Mar 2009 20:03:38 +0000
 129 +
 130 +hildon-icons (2.1.debian-2) unstable; urgency=medium
 131 +
 132 +  [ Jonny Lamb ]
 133 +  * Fixed install-theme.sh to get the image resolutions correctly instead of
 134 +    failing to build. (Closes: #494226)
 135 +
 136 + -- Riku Voipio <riku.voipio@iki.fi>  Sat, 09 Aug 2008 00:58:04 +0300
 137 +
 138 +hildon-icons (2.1.debian-1) unstable; urgency=low
 139 +
 140 +  * Initial upload to debian
 141 +  * New upstream version with CC-BY 3.0 license
 142 +  * Merge packaging fixes from ubuntu, Thanks Loic Minier
 143 +
 144 + -- Riku Voipio <riku.voipio@iki.fi>  Thu, 26 Jun 2008 23:20:43 +0300
 145 +
 146 +hildon-icons (2.0.debian-5) unstable; urgency=low
 147 +
 148 +  * re-Debianization
 149 +  * rename package and make it not conflict with hicolor-icon-theme
 150 +
 151 + -- Riku Voipio <riku.voipio@iki.fi>  Sat, 20 Oct 2007 22:57:33 +0300
 152 +