diff -pruN 3.38.0-1/debian/changelog 3.38.0-1ubuntu1/debian/changelog --- 3.38.0-1/debian/changelog 2020-09-15 16:59:46.000000000 +0000 +++ 3.38.0-1ubuntu1/debian/changelog 2020-09-15 17:04:32.000000000 +0000 @@ -1,3 +1,11 @@ +adwaita-icon-theme (3.38.0-1ubuntu1) groovy; urgency=medium + + * Sync with Debian. Remaining change: + - Split into adwaita-icon-theme and adwaita-icon-theme-full + (debian/control{,.in}) + + -- Iain Lane Tue, 15 Sep 2020 18:04:32 +0100 + adwaita-icon-theme (3.38.0-1) unstable; urgency=medium * New upstream release @@ -5,6 +13,15 @@ adwaita-icon-theme (3.38.0-1) unstable; -- Iain Lane Tue, 15 Sep 2020 17:59:46 +0100 +adwaita-icon-theme (3.37.92-1ubuntu1) groovy; urgency=medium + + * Sync with Debian. Remaining change: + - Split into adwaita-icon-theme and adwaita-icon-theme-full + (debian/control{,.in}) + * debian/not-in-humanity.txt: application-x-generic is not in yaru + + -- Iain Lane Wed, 09 Sep 2020 17:46:37 +0100 + adwaita-icon-theme (3.37.92-1) experimental; urgency=medium * Team upload @@ -13,6 +30,28 @@ adwaita-icon-theme (3.37.92-1) experimen -- Simon McVittie Tue, 01 Sep 2020 12:22:20 +0100 +adwaita-icon-theme (3.36.1-2ubuntu3) groovy; urgency=medium + + * not-in-humanity: Include window decorations action icons + + -- Marco Trevisan (Treviño) Thu, 04 Jun 2020 01:41:09 +0200 + +adwaita-icon-theme (3.36.1-2ubuntu2) groovy; urgency=medium + + * rules: Put the PNGs generated by gtk-encode-symbolic-svg in a-i-t. + These are faster to load, and we don't pull in an SVG loader any more so + we shouldn't (only) be providing SVGs for any of our icons. + + -- Iain Lane Wed, 13 May 2020 12:01:29 +0100 + +adwaita-icon-theme (3.36.1-2ubuntu1) groovy; urgency=medium + + * Sync with Debian. Remaining change: + - Split into adwaita-icon-theme and adwaita-icon-theme-full + (debian/control{,.in}) + + -- Olivier Tilloy Thu, 07 May 2020 18:23:22 +0200 + adwaita-icon-theme (3.36.1-2) unstable; urgency=medium * Team upload @@ -34,6 +73,13 @@ adwaita-icon-theme (3.36.1-1) unstable; -- Laurent Bigonville Tue, 21 Apr 2020 10:28:04 +0200 +adwaita-icon-theme (3.36.0-1ubuntu1) focal; urgency=medium + + * Sync with Debian. Remaining change: + - Split into adwaita-icon-theme and adwaita-icon-theme-full + + -- Sebastien Bacher Fri, 13 Mar 2020 16:51:31 +0100 + adwaita-icon-theme (3.36.0-1) unstable; urgency=medium * New upstream release @@ -75,12 +121,26 @@ adwaita-icon-theme (3.34.0-1) experiment -- Iain Lane Thu, 12 Sep 2019 16:52:47 +0100 +adwaita-icon-theme (3.32.0-1ubuntu1) disco; urgency=medium + + * Sync with Debian. Remaining change: + - Split into adwaita-icon-theme and adwaita-icon-theme-full + + -- Jeremy Bicha Mon, 18 Mar 2019 18:28:42 -0400 + adwaita-icon-theme (3.32.0-1) experimental; urgency=medium * New upstream release -- Jeremy Bicha Mon, 18 Mar 2019 18:24:32 -0400 +adwaita-icon-theme (3.31.91-1ubuntu1) disco; urgency=medium + + * Sync with Debian. Remaining change: + - Split into adwaita-icon-theme and adwaita-icon-theme-full + + -- Jeremy Bicha Wed, 20 Feb 2019 08:12:53 -0500 + adwaita-icon-theme (3.31.91-1) experimental; urgency=medium * New upstream development release diff -pruN 3.38.0-1/debian/control 3.38.0-1ubuntu1/debian/control --- 3.38.0-1/debian/control 2020-09-15 16:59:46.000000000 +0000 +++ 3.38.0-1ubuntu1/debian/control 2020-09-15 17:04:32.000000000 +0000 @@ -5,7 +5,8 @@ Source: adwaita-icon-theme Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Iain Lane , Jeremy Bicha , Laurent Bigonville Build-Depends: debhelper-compat (= 12), dh-sequence-gnome @@ -15,9 +16,10 @@ Build-Depends-Indep: gettext, librsvg2-bin, librsvg2-common:native, Standards-Version: 4.5.0 -Rules-Requires-Root: no -Vcs-Browser: https://salsa.debian.org/gnome-team/adwaita-icon-theme -Vcs-Git: https://salsa.debian.org/gnome-team/adwaita-icon-theme.git +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/adwaita-icon-theme.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/adwaita-icon-theme +Vcs-Git: https://salsa.debian.org/gnome-team/adwaita-icon-theme.git -b ubuntu/master +Vcs-Browser: https://salsa.debian.org/gnome-team/adwaita-icon-theme/tree/ubuntu/master Package: adwaita-icon-theme Architecture: all @@ -25,9 +27,29 @@ Multi-Arch: foreign Depends: ${misc:Depends}, hicolor-icon-theme, gtk-update-icon-cache, + ubuntu-mono | adwaita-icon-theme-full Recommends: librsvg2-common -Breaks: gnome-themes-standard-data (<< 3.18.0-2~) -Replaces: gnome-themes-standard-data (<< 3.18.0-2~) +Breaks: gnome-themes-standard-data (<< 3.18.0-2~), adwaita-icon-theme-full (<< ${binary:Version}) +Replaces: gnome-themes-standard-data (<< 3.18.0-2~), adwaita-icon-theme-full (<< ${binary:Version}) +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 +Multi-arch: foreign +Depends: ${misc:Depends}, + adwaita-icon-theme (= ${binary:Version}), + gtk-update-icon-cache, +Recommends: librsvg2-common +Breaks: adwaita-icon-theme (<< ${binary:Version}), gnome-themes-standard-data (<< 3.18.0-2~) +Replaces: adwaita-icon-theme (<< ${binary:Version}), gnome-themes-standard-data (<< 3.18.0-2~) Provides: gnome-icon-theme-symbolic Description: default icon theme of GNOME This package contains the default icon theme used by the GNOME desktop. diff -pruN 3.38.0-1/debian/control.in 3.38.0-1ubuntu1/debian/control.in --- 3.38.0-1/debian/control.in 2020-09-15 16:59:46.000000000 +0000 +++ 3.38.0-1ubuntu1/debian/control.in 2020-09-15 17:04:32.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-compat (= 12), dh-sequence-gnome @@ -11,9 +12,10 @@ Build-Depends-Indep: gettext, librsvg2-bin, librsvg2-common:native, Standards-Version: 4.5.0 -Rules-Requires-Root: no -Vcs-Browser: https://salsa.debian.org/gnome-team/adwaita-icon-theme -Vcs-Git: https://salsa.debian.org/gnome-team/adwaita-icon-theme.git +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/adwaita-icon-theme.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/adwaita-icon-theme +Vcs-Git: https://salsa.debian.org/gnome-team/adwaita-icon-theme.git -b ubuntu/master +Vcs-Browser: https://salsa.debian.org/gnome-team/adwaita-icon-theme/tree/ubuntu/master Package: adwaita-icon-theme Architecture: all @@ -21,9 +23,29 @@ Multi-Arch: foreign Depends: ${misc:Depends}, hicolor-icon-theme, gtk-update-icon-cache, + ubuntu-mono | adwaita-icon-theme-full Recommends: librsvg2-common -Breaks: gnome-themes-standard-data (<< 3.18.0-2~) -Replaces: gnome-themes-standard-data (<< 3.18.0-2~) +Breaks: gnome-themes-standard-data (<< 3.18.0-2~), adwaita-icon-theme-full (<< ${binary:Version}) +Replaces: gnome-themes-standard-data (<< 3.18.0-2~), adwaita-icon-theme-full (<< ${binary:Version}) +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 +Multi-arch: foreign +Depends: ${misc:Depends}, + adwaita-icon-theme (= ${binary:Version}), + gtk-update-icon-cache, +Recommends: librsvg2-common +Breaks: adwaita-icon-theme (<< ${binary:Version}), gnome-themes-standard-data (<< 3.18.0-2~) +Replaces: adwaita-icon-theme (<< ${binary:Version}), gnome-themes-standard-data (<< 3.18.0-2~) Provides: gnome-icon-theme-symbolic Description: default icon theme of GNOME This package contains the default icon theme used by the GNOME desktop. diff -pruN 3.38.0-1/debian/gbp.conf 3.38.0-1ubuntu1/debian/gbp.conf --- 3.38.0-1/debian/gbp.conf 2020-09-15 16:59:46.000000000 +0000 +++ 3.38.0-1ubuntu1/debian/gbp.conf 2020-09-15 17:04:32.000000000 +0000 @@ -1,6 +1,7 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch = ubuntu/master +debian-tag = ubuntu/%(version)s upstream-branch = upstream/latest upstream-vcs-tag = %(version)s diff -pruN 3.38.0-1/debian/not-in-humanity.txt 3.38.0-1ubuntu1/debian/not-in-humanity.txt --- 3.38.0-1/debian/not-in-humanity.txt 1970-01-01 00:00:00.000000000 +0000 +++ 3.38.0-1ubuntu1/debian/not-in-humanity.txt 2020-09-15 17:04:32.000000000 +0000 @@ -0,0 +1,172 @@ +ac-adapter +accessories-character-map +application-certificate +application-x-executable +application-x-generic +appointment-missed +appointment-soon +audio-headphones +audio-headset +audio-speakers +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-delete +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 +filefind +file-manager +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 +go-jump +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-playback-pause +media-playback-start +media-playback-stop +media-removable +modem +multimedia-volume-control +network-vpn +network-wired-disconnected +non-starred +open-menu +pan-down +pan-end +pan-start +pan-up +printer-network +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 +viewmag- +viewmag+ +viewmag1 +viewmagfit +view-sort-ascending +view-sort-descending +window-close +window-maximize +window-minimize +window-new +window-restore +xfce4-mixer +x-office-presentation +zoom-best-fit +zoom-fit-best +zoom-in +zoom-original +zoom-out diff -pruN 3.38.0-1/debian/rules 3.38.0-1ubuntu1/debian/rules --- 3.38.0-1/debian/rules 2020-09-15 16:59:46.000000000 +0000 +++ 3.38.0-1ubuntu1/debian/rules 2020-09-15 17:04:32.000000000 +0000 @@ -3,6 +3,48 @@ %: dh $@ +override_dh_install: + dh_install -p adwaita-icon-theme debian/tmp/usr/share/pkgconfig + dh_install -p adwaita-icon-theme-full debian/tmp/usr/share/icons + + for dir in scalable scalable-up-to-32; do \ + SRC=$(CURDIR)/debian/adwaita-icon-theme-full/usr/share/icons/Adwaita/$${dir}; \ + DEST=$(CURDIR)/debian/adwaita-icon-theme/usr/share/icons/Adwaita; \ + mkdir -p $${SRC} $${DEST}; \ + mv $${SRC} $${DEST}; \ + done + + # 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 \ + usr/share/icons/Adwaita/*/*/$${name}-rtl.png \ + usr/share/icons/Adwaita/*/*/$${name}.svg \ + usr/share/icons/Adwaita/*/*/$${name}-symbolic.symbolic.png \ + usr/share/icons/Adwaita/*/*/$${name}-symbolic.svg \ + usr/share/icons/Adwaita/*/*/$${name}-symbolic-rtl.svg; do \ + ( [ -e $$i ] || [ -L $$i ] ) || continue; \ + 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/ + + 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 + +override_dh_missing: + dh_missing --fail-missing + override_dh_auto_clean: dh_auto_clean ./debian/copyright.pl > debian/copyright