Changeset 5045

Timestamp:

03/02/09 01:26:25 (4 years ago)

Author:

alanbach-guest

Message:

• New upstream stable release
  • updated changelog.ubuntu
  • removed 01_make_type_scalable_for_missing_icons.patch, merged upstream
  • updated debian/rules to work with the current upstream source

Location:

pkg/boss/non-free/human-icon-theme/trunk/debian

Files:

• changelog (modified) (1 diff)
• clean-up.sh (deleted)
• control (modified) (1 diff)
• control.in (modified) (1 diff)
• human-icon-theme.links (modified) (1 diff)
• rules (modified) (3 diffs)

pkg/boss/non-free/human-icon-theme/trunk/debian/changelog

@@ -5 +5 @@
     - removed 01_make_type_scalable_for_missing_icons.patch, merged
       upstream
+    - updated debian/rules to work with the current upstream source
 
- -- Alan Baghumian <alan@technotux.org>  Wed, 25 Feb 2009 19:14:21 -0800
+ -- Alan Baghumian <alan@technotux.org>  Sun, 01 Mar 2009 16:26:10 -0800
 
 human-icon-theme (3:0.30.2.parsix-1) unstable; urgency=low

pkg/boss/non-free/human-icon-theme/trunk/debian/control

@@ -3 +3 @@
 Priority: optional
 Maintainer: Alan Baghumian <alan@technotux.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5),
-               cdbs,
-               gnome-pkg-tools (>= 0.12.2)
+               cdbs
 Build-Depends-Indep: libxml-parser-perl,
+                     hicolor-icon-theme,
                      pkg-config (>= 0.19),
                      icon-naming-utils (>= 0.8.1),
-                     libmagick9-dev (>= 5.5.7),
+                     libmagickcore-dev | libmagick9-dev,
                      imagemagick (>= 5.5.7),
-                     autotools-dev,
                      librsvg2-dev (>= 2.12.3),
                      lsb-release,
-                     autoconf,
-                     automake,
                      intltool,
                      sharutils

pkg/boss/non-free/human-icon-theme/trunk/debian/control.in

@@ -5 +5 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5),
-               cdbs,
-               gnome-pkg-tools (>= 0.12.2)
+               cdbs
 Build-Depends-Indep: libxml-parser-perl,
+                     hicolor-icon-theme,
                      pkg-config (>= 0.19),
                      icon-naming-utils (>= 0.8.1),
-                     libmagick9-dev (>= 5.5.7),
+                     libmagickcore-dev | libmagick9-dev,
                      imagemagick (>= 5.5.7),
-                     autotools-dev,
                      librsvg2-dev (>= 2.12.3),
                      lsb-release,
-                     autoconf,
-                     automake,
                      intltool,
                      sharutils

pkg/boss/non-free/human-icon-theme/trunk/debian/human-icon-theme.links

@@ -104 +104 @@
 usr/share/icons/Human/scalable/devices/gnome-dev-removable-usb.svg usr/share/icons/Human/scalable/devices/drive-removable-media-usb.svg
 usr/share/icons/Human/scalable/devices/gnome-dev-media-sdmmc.svg usr/share/icons/Human/scalable/devices/media-flash.svg
-
+usr/share/icons/Human/16x16/stock/generic/stock_folder-move.png usr/share/icons/Human/16x16/actions/folder-move.png
+usr/share/icons/Human/16x16/stock/generic/stock_folder-copy.png usr/share/icons/Human/16x16/actions/folder-copy.png
+/usr/share/icons/Human/16x16/apps/gnome-logout.png /usr/share/icons/Human/16x16/actions/system-log-out.png
+/usr/share/icons/Human/22x22/apps/gnome-logout.png /usr/share/icons/Human/22x22/actions/system-log-out.png
+/usr/share/icons/Human/24x24/apps/gnome-logout.png /usr/share/icons/Human/24x24/actions/system-log-out.png
+/usr/share/icons/Human/48x48/apps/gnome-logout.png /usr/share/icons/Human/48x48/actions/system-log-out.png
+/usr/share/icons/Human/scalable/apps/gnome-logout.png /usr/share/icons/Human/scalable/actions/system-log-out.png

pkg/boss/non-free/human-icon-theme/trunk/debian/rules

@@ -2 +2 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.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
+include /usr/share/cdbs/1/class/makefile.mk
 
 DISTRO := $(shell lsb_release -si)
+
+DEB_MAKE_INSTALL_TARGET=install DESTDIR=$(DEB_DESTDIR)
+ICON_DIR := debian/human-icon-theme/usr/share/icons/Human
 DIRLIST := 22x22 24x24 48x48
 
@@ -18 +18 @@
         @echo "=== Building for distribution: $(DISTRO) ==="
         find debian/$(DISTRO) -name '*.png' | xargs rm -fv
-        $(SHELL) debian/clean-up.sh
-
-makebuilddir/human-icon-theme::
-        ./autogen.sh --prefix=/usr
 
 build:
@@ -31 +27 @@
         fi
 
-ICON_DIR := debian/human-icon-theme/usr/share/icons/Human
+binary-post-install/human-icon-theme::
+        dh_icons
 
-binary-post-install/human-icon-theme::
         # replace the Ubuntu logos with the distribution overrides
         if [ -d debian/$(DISTRO) ]; then \