r43255 - in /packages/unstable/tangerine-icon-theme/debian: changelog control control.in copyright rules
noskcaj-guest at users.alioth.debian.org
noskcaj-guest at users.alioth.debian.org
Fri Sep 26 22:22:43 UTC 2014
Author: noskcaj-guest
Date: Fri Sep 26 22:22:42 2014
New Revision: 43255
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43255
Log:
Merge back from ubuntu
Modified:
packages/unstable/tangerine-icon-theme/debian/changelog
packages/unstable/tangerine-icon-theme/debian/control
packages/unstable/tangerine-icon-theme/debian/control.in
packages/unstable/tangerine-icon-theme/debian/copyright
packages/unstable/tangerine-icon-theme/debian/rules
Modified: packages/unstable/tangerine-icon-theme/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tangerine-icon-theme/debian/changelog?rev=43255&op=diff
==============================================================================
--- packages/unstable/tangerine-icon-theme/debian/changelog [utf-8] (original)
+++ packages/unstable/tangerine-icon-theme/debian/changelog [utf-8] Fri Sep 26 22:22:42 2014
@@ -1,10 +1,46 @@
-tangerine-icon-theme (0.26.debian-4) UNRELEASED; urgency=low
-
+tangerine-icon-theme (0.27.debian-1) UNRELEASED; urgency=low
+
+ [ Emilio Pozuelo Monfort ]
* debian/control.in,
debian/rules:
+ Use dpkg-vendor instead of lsb_release.
- -- Emilio Pozuelo Monfort <pochu at debian.org> Mon, 13 Dec 2010 00:42:43 +0100
+ [ Jackson Doak ]
+ * Merge changes from ubuntu
+
+ -- Jackson Doak <noskcaj at ubuntu.com> Sat, 27 Sep 2014 08:19:16 +1000
+
+tangerine-icon-theme (0.27) karmic; urgency=low
+
+ [ Dmitrijs Ledkovs ]
+ * 01-scalable-icons.patch
+ - Missing "/", fixes not all icons are installed (LP: #380474)
+ * 02-inherit-oxygen.patch
+ - Add oxygen theme to inherts list for KDE icons (LP: #152167)
+ * debian/copyright:
+ - change icon theme name from Human to Tangerine. (LP: #143995)
+
+ [ Daniel Holbach ]
+ * New release.
+ * debian/control.in:
+ - bump Standards-Version, no changes.
+ - bump debhelper version to >= 5.0.51~.
+ - drop 'XS' from XS-Vcs-Bzr.
+ - don't duplicate Section.
+ - drop autoconf, autotools-dev and automake Build-Depends.
+ * *Makefile.am, configure.ac, autogen.sh, Makefile: simplify build system a
+ lot, based on Martin Pitt's great work with human-icon-theme.
+ debian/patches/01-scalable-icons.patch is not necessary any more.
+ * debian/patches/02-inherit-oxygen.patch: directly applied.
+ * debian/clean-up.sh, debian/rules: clean-up.sh not necessary any more.
+ * debian/rules:
+ - removed autogen stuff.
+ - replaced gnome.mk with makefile.mk.
+ - call dh_icons.
+ * debian/copyright: replaced (C) with ©.
+ * ChangeLog: removed, revision history in bzr.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at gmail.com> Tue, 25 Aug 2009 19:02:46 +0000
tangerine-icon-theme (0.26.debian-3) unstable; urgency=high
@@ -66,23 +102,73 @@
-- Alan Baghumian <alan at technotux.org> Tue, 15 Jan 2008 11:56:20 +0330
-tangerine-icon-theme (0.21-1) unstable; urgency=low
-
- [ Alan Baghumian ]
- * New upstream release
- - Removing GTK Tango icons from Tangerine as they are now
- in GNOME.
- * Merged with previous changelog entry
- * Updated Parsix logos
-
- [ Kilian Krause ]
- * Add get-orig-source target.
-
- [ Loic Minier ]
- * Use ubuntu-get-source.mk instead of gnome-get-source.mk; bump up
- gnome-pkg-tools build-dep to >= 0.12.2.
-
- -- Loic Minier <lool at dooz.org> Tue, 31 Jul 2007 16:12:38 +0200
+tangerine-icon-theme (0.26) gutsy; urgency=low
+
+ * Various missing bits added.
+ * 'wallpaper' updates in icons involving a monitor.
+ * New symbolic link icon.
+
+ -- Lapo Calamandrei <calamandrei at gmail.com> Tue, 18 Sep 2007 16:13:01 +0200
+
+tangerine-icon-theme (0.25) gutsy; urgency=low
+
+ * New release.
+ * debian/rules, debian/control.in: updated to run ./autogen.sh on its own.
+
+ -- Daniel Holbach <daniel.holbach at ubuntu.com> Thu, 06 Sep 2007 11:22:11 +0200
+
+tangerine-icon-theme (0.24-0ubuntu1) gutsy; urgency=low
+
+ * New release.
+
+ -- Daniel Holbach <daniel.holbach at ubuntu.com> Wed, 29 Aug 2007 10:19:06 -0400
+
+tangerine-icon-theme (0.23-0ubuntu1) gutsy; urgency=low
+
+ * New release:
+ - dropped Tango icon theme inheritance.
+ - new drive-* icons.
+ - added recolored bit of g-i-t.
+ - added a recolored tango icon theme audio-x-generic.
+
+ -- Daniel Holbach <daniel.holbach at ubuntu.com> Thu, 23 Aug 2007 11:28:46 +0200
+
+tangerine-icon-theme (0.22-0ubuntu1) gutsy; urgency=low
+
+ * index.theme.in, debian/control.in: drop Tango inheritance on Lapo's
+ suggestion.
+
+ -- Daniel Holbach <daniel.holbach at ubuntu.com> Mon, 20 Aug 2007 12:27:12 +0200
+
+tangerine-icon-theme (0.21-0ubuntu3) gutsy; urgency=low
+
+ * forgot configure.ac
+
+ -- Kenneth Wimer <kwwii at ubuntu.com> Thu, 26 Jul 2007 18:47:54 +0200
+
+tangerine-icon-theme (0.21-0ubuntu2) feisty; urgency=low
+
+ * editing makefiles and index.theme.in to reflect the removal of all gtk-*
+ icons
+
+ -- Kenneth Wimer <kwwii at ubuntu.com> Thu, 26 Jul 2007 18:45:43 +0200
+
+tangerine-icon-theme (0.21-0ubuntu1) feisty; urgency=low
+
+ * removing the gtk tango icons from tangerine as they are now in gnome
+ upstream
+
+ -- Kenneth Wimer <kwwii at ubuntu.com> Wed, 25 Jul 2007 23:38:17 +0200
+
+tangerine-icon-theme (0.20-1ubuntu1) gutsy; urgency=low
+
+ * debian/conrol.in:
+ - don't depend on sng,
+ - change Maintainer field,
+ - added XS-Vcs-Bzr Tag.
+ * debian/rules: fixed clean target.
+
+ -- Daniel Holbach <daniel.holbach at ubuntu.com> Wed, 04 Jul 2007 12:28:05 +0200
tangerine-icon-theme (0.20-1) unstable; urgency=low
Modified: packages/unstable/tangerine-icon-theme/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tangerine-icon-theme/debian/control?rev=43255&op=diff
==============================================================================
--- packages/unstable/tangerine-icon-theme/debian/control [utf-8] (original)
+++ packages/unstable/tangerine-icon-theme/debian/control [utf-8] Fri Sep 26 22:22:42 2014
@@ -1,16 +1,11 @@
-# This file is autogenerated. DO NOT EDIT!
-#
-# Modifications should be made to debian/control.in instead.
-# This file is regenerated automatically in the clean target.
-
Source: tangerine-icon-theme
Section: non-free/x11
Priority: optional
Maintainer: Alan Baghumian <alan at technotux.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Loic Minier <lool at dooz.org>
-Build-Depends: debhelper (>= 5.0.0),
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-art-pkg/tangerine-icon-theme/ubuntu
+Build-Depends: debhelper (>= 5.0.51~),
cdbs,
- dpkg-dev (>= 1.15.1),
gnome-pkg-tools (>= 0.12.2)
Build-Depends-Indep: gettext,
libxml-parser-perl,
@@ -18,17 +13,14 @@
icon-naming-utils (>= 0.7.1),
libmagickcore-dev | libmagick9-dev,
imagemagick,
- autotools-dev,
librsvg2-dev (>= 2.12.3),
- autoconf,
- automake,
+ lsb-release,
intltool,
sharutils
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
Package: tangerine-icon-theme
Architecture: all
-Section: non-free/x11
Depends: gnome-icon-theme,
${misc:Depends}
Description: Tangerine Icon theme
Modified: packages/unstable/tangerine-icon-theme/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tangerine-icon-theme/debian/control.in?rev=43255&op=diff
==============================================================================
--- packages/unstable/tangerine-icon-theme/debian/control.in [utf-8] (original)
+++ packages/unstable/tangerine-icon-theme/debian/control.in [utf-8] Fri Sep 26 22:22:42 2014
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Alan Baghumian <alan at technotux.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5.0.0),
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-art-pkg/tangerine-icon-theme/ubuntu
+Build-Depends: debhelper (>= 5.0.51~),
cdbs,
- dpkg-dev (>= 1.15.1),
gnome-pkg-tools (>= 0.12.2)
Build-Depends-Indep: gettext,
libxml-parser-perl,
@@ -13,17 +13,14 @@
icon-naming-utils (>= 0.7.1),
libmagickcore-dev | libmagick9-dev,
imagemagick,
- autotools-dev,
librsvg2-dev (>= 2.12.3),
- autoconf,
- automake,
+ lsb-release,
intltool,
sharutils
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
Package: tangerine-icon-theme
Architecture: all
-Section: non-free/x11
Depends: gnome-icon-theme,
${misc:Depends}
Description: Tangerine Icon theme
Modified: packages/unstable/tangerine-icon-theme/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tangerine-icon-theme/debian/copyright?rev=43255&op=diff
==============================================================================
--- packages/unstable/tangerine-icon-theme/debian/copyright [utf-8] (original)
+++ packages/unstable/tangerine-icon-theme/debian/copyright [utf-8] Fri Sep 26 22:22:42 2014
@@ -27,7 +27,7 @@
License:
-The Human Icon Theme is licensed under the Creative Commons Legal Code
+The Tangerine Icon Theme is licensed under the Creative Commons Legal Code
Attribution-ShareAlike 2.5
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
@@ -289,7 +289,7 @@
Creative Commons may be contacted at http://creativecommons.org/
-The Debian packaging is (C) 2007-2008 Alan Baghumian <alan at technotux.org> and
+The Debian packaging is © 2007-2008 Alan Baghumian <alan at technotux.org> and
is licensed under the GPL, see above.
On Debian systems, the complete text of the GNU General
Modified: packages/unstable/tangerine-icon-theme/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tangerine-icon-theme/debian/rules?rev=43255&op=diff
==============================================================================
--- packages/unstable/tangerine-icon-theme/debian/rules [utf-8] (original)
+++ packages/unstable/tangerine-icon-theme/debian/rules [utf-8] Fri Sep 26 22:22:42 2014
@@ -1,10 +1,12 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/gnome-pkg-tools/1/rules/ubuntu-get-source.mk
+
+DEB_MAKE_INSTALL_TARGET=install DESTDIR=$(DEB_DESTDIR)
DISTRO := $(shell dpkg-vendor --query vendor)
@@ -12,13 +14,6 @@
ifeq ($(DISTRO),)
DISTRO := Debian
endif
-
-clean::
- @echo "=== Building for distribution: $(DISTRO) ==="
- $(SHELL) debian/clean-up.sh
-
-makebuilddir/tangerine-icon-theme::
- ./autogen.sh --prefix=/usr
ICON_DIR := debian/tangerine-icon-theme/usr/share/icons/Tangerine
@@ -34,4 +29,4 @@
rm -vf "$$encoded"; \
done; \
fi
-
+ dh_icons
More information about the pkg-gnome-commits
mailing list