[Gsrc-commit] /srv/bzr/gsrc/trunk r1294: add gnome directory and move gnome stuff into it

[Brandon Invergo]

------------------------------------------------------------
revno: 1294
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sat 2012-12-01 12:18:42 +0100
message:
  add gnome directory and move gnome stuff into it
added:
  gnome/
renamed:
  deps/atk/ => gnome/atk/
  deps/gdk-pixbuf/ => gnome/gdk-pixbuf/
  deps/glib/ => gnome/glib/
  deps/gtk/ => gnome/gtk/
  deps/gtk2/ => gnome/gtk2/
  deps/pango/ => gnome/pango/
modified:
  gar.lib.mk
  gnome/glib/Makefile

=== modified file 'gar.lib.mk'
--- a/gar.lib.mk        2012-10-25 21:24:03 +0000
+++ b/gar.lib.mk        2012-12-01 11:18:42 +0000
@@ -787,7 +787,7 @@
 # Function to allow searching for dependencies on a path, without needing
 # to specify full directory name.
 pathsearch = $(firstword $(wildcard $(addsuffix /$(strip $(1)),$(strip $(2)))))
-DEPPATH ?= .. $(GARDIR) $(GARDIR)/gnu $(GARDIR)/deps
+DEPPATH ?= .. $(GARDIR) $(GARDIR)/gnu $(GARDIR)/deps $(GARDIR)/gnome
 DEP = $(call pathsearch,$*,$(DEPPATH))
 
 # Standard deps install into the standard install dir.  For the

=== added directory 'gnome'
=== renamed directory 'deps/atk' => 'gnome/atk'
=== renamed directory 'deps/gdk-pixbuf' => 'gnome/gdk-pixbuf'
=== renamed directory 'deps/glib' => 'gnome/glib'
=== modified file 'gnome/glib/Makefile'
--- a/deps/glib/Makefile        2012-11-02 14:51:36 +0000
+++ b/gnome/glib/Makefile       2012-12-01 11:18:42 +0000
@@ -1,14 +1,17 @@
 GARNAME = glib
-version = 2.34
-release = 1
-GARVERSION = $(version).$(release)
+GARVERSION = 2.34.1
 HOME_URL = http://www.gtk.org
 DESCRIPTION = The GNOME general purpose utility library
 
 ######################################################################
 
+empty:=
+space:= $(empty) $(empty)
+VERSION_LIST = $(subst .,$(space),$(GARVERSION))
+SERIES = $(subst $(space),.,$(wordlist 1,2,$(VERSION_LIST)))
+
 MASTER_SITES = $(MASTER_GNOME)
-MASTER_SUBDIR = $(GARNAME)/$(version)/
+MASTER_SUBDIR = $(GARNAME)/$(SERIES)/
 DISTFILES = $(DISTNAME).tar.xz
 SIGFILES = 
 

=== renamed directory 'deps/gtk' => 'gnome/gtk'
=== renamed directory 'deps/gtk2' => 'gnome/gtk2'
=== renamed directory 'deps/pango' => 'gnome/pango'