[Gsrc-commit] /srv/bzr/gsrc/trunk r1254: clean up vc-dwim

[Brandon Invergo]

------------------------------------------------------------
revno: 1254
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Wed 2012-11-21 20:19:06 +0100
message:
  clean up vc-dwim
removed:
  deps/libgnomeui/
  deps/libgnomeui/Makefile
  deps/libgnomeui/sha256sums
added:
  gnu/vc-dwim/config.mk
modified:
  .bzrignore
  deps/libxml2/Makefile
  gar.env.mk
  gnu/gnusound/Makefile
  gnu/macchanger/Makefile
  gnu/vc-dwim/Makefile

=== modified file '.bzrignore'
--- a/.bzrignore        2011-04-13 10:55:57 +0000
+++ b/.bzrignore        2012-11-21 19:19:06 +0000
@@ -27,3 +27,6 @@
 doc/Makefile
 logmsg
 logmsg.keyring
+help
+*~
+#*

=== removed directory 'deps/libgnomeui'
=== removed file 'deps/libgnomeui/Makefile'
--- a/deps/libgnomeui/Makefile  2012-11-10 23:40:35 +0000
+++ b/deps/libgnomeui/Makefile  1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-GARNAME = libgnomeui
-version = 2.24
-release = 5
-GARVERSION = $(version).$(release)
-HOME_URL = http://www.gtk.org
-DESCRIPTION = User interface library for GNOME
-
-######################################################################
-
-MASTER_SITES = $(MASTER_GNOME)
-MASTER_SUBDIR = $(GARNAME)/$(version)/
-DISTFILES = $(DISTNAME).tar.gz
-SIGFILES = 
-
-BUILDDEPS = 
-LIBDEPS = glib
-
-######################################################################
-
-include ../../gar.lib/auto.mk
-include config.mk
-
-

=== removed file 'deps/libgnomeui/sha256sums'
--- a/deps/libgnomeui/sha256sums        2012-11-10 23:40:35 +0000
+++ b/deps/libgnomeui/sha256sums        1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-0a7ae41bf6161eabd52a4a845d1941b29d595a422bd3b7275ab1db0c7a3de9cb  
download/libgnomeui-2.24.5.tar.gz

=== modified file 'deps/libxml2/Makefile'
--- a/deps/libxml2/Makefile     2012-11-10 15:23:23 +0000
+++ b/deps/libxml2/Makefile     2012-11-21 19:19:06 +0000
@@ -9,6 +9,9 @@
 MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 
+BUILDDEPS = 
+LIBDEPS = libiconv
+
 ######################################################################
 
 include ../../gar.lib/auto.mk

=== modified file 'gar.env.mk'
--- a/gar.env.mk        2010-12-20 11:45:48 +0000
+++ b/gar.env.mk        2012-11-21 19:19:06 +0000
@@ -19,7 +19,7 @@
 
 # Allow us to link to libraries we installed.
 PATH := $(prefix)/bin:$(prefix)/sbin:$(PATH)
-LD_LIBRARY_PATH := $(prefix)/lib$(if $(LD_LIBRARY_PATH),:$(LD_LIBRARY_PATH))
+LD_LIBRARY_PATH := if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(prefix)/lib$
 
 # When building GARStow packages using a non-GARStow toolchain (i.e. when we're
 # bootstrapping from a different system), we need to specify some more paths

=== modified file 'gnu/gnusound/Makefile'
--- a/gnu/gnusound/Makefile     2012-11-07 23:11:48 +0000
+++ b/gnu/gnusound/Makefile     2012-11-21 19:19:06 +0000
@@ -12,7 +12,7 @@
 PATCHFILES = fix-install.diff
 
 BUILDDEPS = 
-LIBDEPS = gtk2 glib cairo gdk-pixbuf atk  #libgnomeui libglade gthread
+LIBDEPS = gtk2 glib cairo gdk-pixbuf atk libgnomeui # libglade gthread
 
 ######################################################################
 

=== modified file 'gnu/macchanger/Makefile'
--- a/gnu/macchanger/Makefile   2010-06-10 20:16:29 +0000
+++ b/gnu/macchanger/Makefile   2012-11-21 19:19:06 +0000
@@ -1,16 +1,20 @@
 GARNAME = macchanger
 GARVERSION = 1.5.0
+HOME_URL = http://www.alobbs.com/macchanger
+DESCRIPTION = A utility for viewing and changing MAC addresses of \
+networking devices
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = macchanger/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
 
-# BUILDDEPS = 
-# LIBDEPS = 
+BUILDDEPS = 
+LIBDEPS = 
 
-HOME_URL = http://www.alobbs.com/macchanger
-DESCRIPTION = MAC Changer
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk

=== modified file 'gnu/vc-dwim/Makefile'
--- a/gnu/vc-dwim/Makefile      2012-08-25 22:15:17 +0000
+++ b/gnu/vc-dwim/Makefile      2012-11-21 19:19:06 +0000
@@ -1,16 +1,19 @@
 GARNAME = vc-dwim
 GARVERSION = 1.6
+HOME_URL = http://www.gnu.org/software/vc-dwim/
+DESCRIPTION = A ChangeLog diff and commit tool
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = vc-dwim/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.xz
 SIGFILES = $(DISTNAME).tar.xz.sig
 
-# BUILDDEPS = 
-# LIBDEPS = 
+BUILDDEPS = 
+LIBDEPS = 
 
-HOME_URL = http://www.gnu.org/software/vc-dwim/
-DESCRIPTION = vc-dwim
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk

=== added file 'gnu/vc-dwim/config.mk'
--- a/gnu/vc-dwim/config.mk     1970-01-01 00:00:00 +0000
+++ b/gnu/vc-dwim/config.mk     2012-11-21 19:19:06 +0000
@@ -0,0 +1,4 @@
+## Configuration options for vc-dwim ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=