diff -Nru adwaita-icon-theme-3.14.0/debian/changelog adwaita-icon-theme-3.14.0/debian/changelog --- adwaita-icon-theme-3.14.0/debian/changelog 2014-10-04 16:28:24.000000000 +0000 +++ adwaita-icon-theme-3.14.0/debian/changelog 2015-01-16 17:55:26.000000000 +0000 @@ -1,3 +1,10 @@ +adwaita-icon-theme (3.14.0-2ubuntu1~ppa0) vivid; urgency=medium + + * Split into adwaita-icon-theme and adwaita-icon-theme-full, per + gnome-icon-theme. + + -- Iain Lane Fri, 16 Jan 2015 17:55:26 +0000 + adwaita-icon-theme (3.14.0-2) unstable; urgency=high * Team upload. diff -Nru adwaita-icon-theme-3.14.0/debian/control adwaita-icon-theme-3.14.0/debian/control --- adwaita-icon-theme-3.14.0/debian/control 2014-10-04 16:30:05.000000000 +0000 +++ adwaita-icon-theme-3.14.0/debian/control 2015-01-16 17:55:30.000000000 +0000 @@ -5,8 +5,9 @@ Source: adwaita-icon-theme Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Michael Biebl +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Michael Biebl Build-Depends: debhelper (>= 8), cdbs, gnome-pkg-tools (>= 0.10) @@ -27,9 +28,28 @@ Depends: ${misc:Depends}, hicolor-icon-theme, libgtk-3-bin, - librsvg2-common + librsvg2-common, + humanity-icon-theme | adwaita-icon-theme-full Replaces: gnome-themes-standard-data (<< 3.13.90) Breaks: gnome-themes-standard-data (<< 3.13.90) +Description: default icon theme of GNOME (small subset) + This package contains the default icon theme used by the GNOME desktop. + The icons are used in many of the official gnome applications like eog, + evince, system monitor, and many more. + . + This package only contains a small subset of the original GNOME icons which + are not provided by the Humanity icon theme, to avoid installing many + duplicated icons. Please install adwaita-icon-theme-full if you want the full + set. + +Package: adwaita-icon-theme-full +Architecture: all +Section: gnome +Multi-arch: foreign +Depends: ${misc:Depends}, + adwaita-icon-theme (= ${binary:Version}) +Breaks: adwaita-icon-theme (<< 3.14.0-2ubuntu1~) +Replaces: adwaita-icon-theme (<< 3.14.0-2ubuntu1~) Description: default icon theme of GNOME This package contains the default icon theme used by the GNOME desktop. The icons are used in many of the official gnome applications like eog, diff -Nru adwaita-icon-theme-3.14.0/debian/control.in adwaita-icon-theme-3.14.0/debian/control.in --- adwaita-icon-theme-3.14.0/debian/control.in 2014-09-18 19:38:58.000000000 +0000 +++ adwaita-icon-theme-3.14.0/debian/control.in 2015-01-16 17:54:51.000000000 +0000 @@ -1,7 +1,8 @@ Source: adwaita-icon-theme Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>= 8), cdbs, @@ -23,9 +24,28 @@ Depends: ${misc:Depends}, hicolor-icon-theme, libgtk-3-bin, - librsvg2-common + librsvg2-common, + humanity-icon-theme | adwaita-icon-theme-full Replaces: gnome-themes-standard-data (<< 3.13.90) Breaks: gnome-themes-standard-data (<< 3.13.90) +Description: default icon theme of GNOME (small subset) + This package contains the default icon theme used by the GNOME desktop. + The icons are used in many of the official gnome applications like eog, + evince, system monitor, and many more. + . + This package only contains a small subset of the original GNOME icons which + are not provided by the Humanity icon theme, to avoid installing many + duplicated icons. Please install adwaita-icon-theme-full if you want the full + set. + +Package: adwaita-icon-theme-full +Architecture: all +Section: gnome +Multi-arch: foreign +Depends: ${misc:Depends}, + adwaita-icon-theme (= ${binary:Version}) +Breaks: adwaita-icon-theme (<< 3.14.0-2ubuntu1~) +Replaces: adwaita-icon-theme (<< 3.14.0-2ubuntu1~) Description: default icon theme of GNOME This package contains the default icon theme used by the GNOME desktop. The icons are used in many of the official gnome applications like eog, diff -Nru adwaita-icon-theme-3.14.0/debian/not-in-humanity.txt adwaita-icon-theme-3.14.0/debian/not-in-humanity.txt --- adwaita-icon-theme-3.14.0/debian/not-in-humanity.txt 1970-01-01 00:00:00.000000000 +0000 +++ adwaita-icon-theme-3.14.0/debian/not-in-humanity.txt 2015-01-16 16:37:36.000000000 +0000 @@ -0,0 +1,160 @@ +ac-adapter +accessories-character-map +application-certificate +application-x-executable +appointment-missed +appointment-soon +audio-headphones +audio-headset +avatar-default +battery-caution-charging +battery-empty +battery-full +battery-full-charged +battery-full-charging +battery-good +battery-good-charging +battery-low-charging +battery-missing +call-start +call-stop +camera +changes-allow +changes-prevent +computer +computer-fail +document-send +drive-multidisk +edit-find +edit-find-replace +emblem-default +emblem-downloads +emblem-mail +emblem-nowrite +emblem-readonly +emblem-unreadable +emblem-web +face-angel +face-angry +face-cool +face-crying +face-devilish +face-embarrassed +face-glasses +face-kiss +face-laugh +face-monkey +face-plain +face-raspberry +face-sad +face-sick +face-smile +face-smile-big +face-smirk +face-surprise +face-tired +face-uncertain +face-wink +face-worried +file-manager +filefind +find +format-indent-less +format-indent-more +format-justify-center +format-justify-fill +format-justify-left +format-justify-right +format-text-bold +format-text-italic +format-text-strikethrough +format-text-underline +gnome-character-map +gnome-fs-executable +gnome-modem +gnome-searchtool +gnome-stock-text-indent +gnome-stock-text-unindent +gtk-bold +gtk-find +gtk-find-and-replace +gtk-italic +gtk-justify-center +gtk-justify-fill +gtk-justify-left +gtk-justify-right +gtk-missing-image +gtk-search +gtk-sort-ascending +gtk-sort-descending +gtk-spell-check +gtk-strikethrough +gtk-underline +gtk-zoom-100 +gtk-zoom-fit +gtk-zoom-in +gtk-zoom-out +gucharmap +help-faq +input-dialpad +input-tablet +insert-image +insert-link +kfind +kfm +mail-attachment +media-removable +modem +multimedia-volume-control +network-vpn +network-wired-disconnected +non-starred +pan-down-symbolic +pan-end-symbolic +pan-end-symbolic-rtl +pan-start-symbolic +pan-start-symbolic-rtl +pan-up-symbolic +preferences-desktop-font +preferences-system-notifications +preferences-system-privacy +preferences-system-search +preferences-system-sharing +scanner +search +security-high +security-low +security-medium +software-update-available +software-update-urgent +speaker +starred +stock_lock-broken +stock_lock-ok +stock_search +stock_search-and-replace +stock_zoom-1 +stock_zoom-in +stock_zoom-out +stock_zoom-page +system +system-file-manager +system-search +text-x-preview +tools-check-spelling +trophy-bronze +trophy-gold +trophy-silver +view-sort-ascending +view-sort-descending +viewmag+ +viewmag- +viewmag1 +viewmagfit +x-office-presentation +xfce4-mixer +zoom-best-fit +zoom-fit-best +zoom-in +zoom-original +zoom-out diff -Nru adwaita-icon-theme-3.14.0/debian/rules adwaita-icon-theme-3.14.0/debian/rules --- adwaita-icon-theme-3.14.0/debian/rules 2014-10-04 16:21:55.000000000 +0000 +++ adwaita-icon-theme-3.14.0/debian/rules 2015-01-16 16:55:24.000000000 +0000 @@ -6,5 +6,46 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +BITMAPS := $(shell ls Adwaita | sed -rn 's/^([0-9]+)x[0-9]+$$/\1/p') + +INSTDIR := $(CURDIR)/debian/adwaita-icon-theme-full/usr/share/icons/Adwaita + +DEB_DH_ICONS_ARGS := --no-act + +install/adwaita-icon-theme:: + dh_install -p adwaita-icon-theme debian/tmp/usr/share/pkgconfig + dh_install -p adwaita-icon-theme-full debian/tmp/usr/share/icons + + # keep icons which are not shipped by humanity in a-i-t; do a [ -e ] + # check to ensure that we don't copy dangling symlinks + set -ex; cd $(CURDIR)/debian/adwaita-icon-theme-full; \ + for name in `cat ../not-in-humanity.txt`; do \ + for i in usr/share/icons/Adwaita/*/*/$${name}.png; do \ + ( [ -e $$i ] || [ -L $$i ] ) || continue; \ + if echo "$$i" | grep -q 256x256; then continue; fi; \ + mkdir -p ../adwaita-icon-theme/`dirname $$i`; \ + if [ -L $$i ] && [ -e $$i ]; then \ + mv `dirname $$i`/`readlink $$i` ../adwaita-icon-theme/`dirname $$i`; \ + fi; \ + mv $$i ../adwaita-icon-theme/`dirname $$i`; \ + if ! [ -e ../adwaita-icon-theme/$$i ]; then echo "broken: $$i"; exit 1; fi; \ + done; \ + done; \ + mv usr/share/icons/Adwaita/index.theme ../adwaita-icon-theme/usr/share/icons/Adwaita/ + + for i in $(BITMAPS); do \ + d=$${i}x$${i} ; \ + if [ -d $(INSTDIR)/$$d/places ]; then \ + mv $(INSTDIR)/$$d/places/start-here.png $(INSTDIR)/$$d/places/gnome-foot.png ; \ + rsvg-convert -w $$i -h $$i -o $(INSTDIR)/$$d/places/debian-swirl.png debian/debian-swirl.svg ; \ + fi ; \ + done + if [ -d debian/ubuntu-icons ]; then \ + for i in $$(find debian/ubuntu-icons/ -name '*.svg' -o -name '*.png'); do \ + iconname=$${i##debian/ubuntu-icons/}; \ + cp $$i $(INSTDIR)/$$iconname; \ + done; \ + fi + clean:: ./debian/copyright.pl > debian/copyright