Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (d9e20034951f362ba0ab68d61a4bc6150249fe78)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (d9e20034951f362ba0ab68d61a4bc6150249fe78)
  • Date: Tue, 13 Mar 2007 23:45:47 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

graphics/gimp-help-2/DEPENDS | 10 +++++++++-
graphics/gimp-help-2/HISTORY | 5 +++++
2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit d9e20034951f362ba0ab68d61a4bc6150249fe78
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gimp-help-2 optionally depends on gimp

commit 94f1bcdcc5ba7714faaffbbf7f24fbe14f3be558
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gimp-help-2 may optionally use convert from imagemagick

commit 2acf6c792bc3deeaf640d1f7146faf1340114040
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
into devel"

This reverts commit 84519948ff8998d05b71bd2be153a5e3f05fde6d.

I don't know what this was trying to do, but it listed a bunch of
conflicts froma merge in devel...

commit ab7d0463a09a692758408d04a49b3f82e01a8047
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire into devel

Conflicts:

ChangeLog
FUNCTIONS
accounts
antivirus/clamav/DETAILS
antivirus/clamav/HISTORY
antivirus/klamav/DETAILS
antivirus/klamav/HISTORY
archive-libs/lzo/DETAILS
archive-libs/lzo/HISTORY
archive/bacula/DETAILS
archive/bacula/HISTORY
archive/dar/DETAILS
archive/dar/HISTORY
archive/dar/UP_TRIGGERS
archive/dar22/DETAILS
archive/p7zip/DETAILS
archive/p7zip/HISTORY
archive/ripmime/HISTORY
archive/star/DETAILS
archive/star/HISTORY
archive/tnef/HISTORY
archive/zoo/HISTORY
audio-creation/ardour/HISTORY
audio-creation/ceres3/HISTORY
audio-creation/csound5/BUILD
audio-creation/csound5/DEPENDS
audio-creation/csound5/DETAILS
audio-creation/csound5/HISTORY
audio-creation/csound5/INSTALL
audio-creation/dissociatedstudio/HISTORY
audio-creation/galan/HISTORY
audio-creation/ggseq/HISTORY
audio-creation/rosegarden/DETAILS
audio-creation/rosegarden/HISTORY
audio-creation/seq24/DETAILS
audio-creation/seq24/HISTORY
audio-creation/snd/CONFIGURE
audio-creation/snd/DETAILS
audio-creation/snd/HISTORY
audio-creation/snd/INSTALL
audio-creation/visecas/HISTORY
audio-drivers/alsa-oss/HISTORY
audio-drivers/jack/DETAILS
audio-drivers/jack/HISTORY
audio-drivers/portaudio-cvs/DETAILS
audio-drivers/portaudio-cvs/HISTORY
audio-drivers/portaudio/HISTORY
audio-libs/id3lib/HISTORY
audio-libs/libgpod/HISTORY
audio-libs/libid3/DETAILS
audio-libs/libid3/HISTORY
audio-libs/libid3tag/DETAILS
audio-libs/libid3tag/HISTORY
audio-libs/libmodplug/DETAILS
audio-libs/libmodplug/HISTORY
audio-libs/libsndfile/DETAILS
audio-libs/libsndfile/HISTORY
audio-libs/libtunepimp/BUILD
audio-libs/libtunepimp/HISTORY
audio-libs/libvisual/HISTORY
audio-libs/openal/BUILD
audio-libs/openal/CONFIGURE
audio-libs/openal/DEPENDS
audio-libs/openal/DETAILS
audio-libs/openal/HISTORY
audio-libs/soundtouch/HISTORY
audio-libs/tse3/DEPENDS
audio-libs/tse3/DETAILS
audio-libs/tse3/HISTORY
audio-libs/wavpack/DETAILS
audio-libs/wavpack/HISTORY
audio-libs/wavpack/UP_TRIGGERS
audio-players/JuK/DETAILS
audio-players/JuK/HISTORY
audio-players/alsaplayer/DETAILS
audio-players/alsaplayer/HISTORY
audio-players/amarok/BUILD
audio-players/amarok/DEPENDS
audio-players/amarok/DETAILS
audio-players/amarok/HISTORY
audio-players/beep-media-player-gui/HISTORY
audio-players/dcd/HISTORY
audio-players/eawpats/HISTORY
audio-players/exaile/BUILD
audio-players/exaile/DEPENDS
audio-players/exaile/DETAILS
audio-players/exaile/HISTORY
audio-players/madman/DEPENDS
audio-players/madman/DETAILS
audio-players/madman/HISTORY
audio-players/mixxx/DETAILS
audio-players/mixxx/HISTORY
audio-players/moc/HISTORY
audio-players/mpdc/HISTORY
audio-players/pmidi/HISTORY
audio-players/positron/HISTORY
audio-players/prokyon3/HISTORY
audio-players/pyxmms/HISTORY
audio-players/qsynth/DETAILS
audio-players/qsynth/HISTORY
audio-players/rawrec/HISTORY
audio-players/rhythmbox/DEPENDS
audio-players/rhythmbox/DETAILS
audio-players/rhythmbox/HISTORY
audio-players/sound-juicer/DETAILS
audio-players/sound-juicer/HISTORY
audio-players/timidity-cvs/HISTORY
audio-players/xmms-shell/HISTORY
audio-players/xmms2/BUILD
audio-players/xmms2/CONFIGURE
audio-players/xmms2/DEPENDS
audio-players/xmms2/HISTORY
audio-players/xmms2/INSTALL
audio-players/xmms2/PREPARE
audio-players/zinf/HISTORY
audio-plugins/crystality-plugin/HISTORY
audio-plugins/ladspa/DETAILS
audio-plugins/ladspa/HISTORY
audio-plugins/libvisual-plugins/HISTORY
audio-plugins/tap/HISTORY
audio-soft/cd-discid/HISTORY
audio-soft/cdrtoaster/HISTORY
audio-soft/id3/HISTORY
audio-soft/nmix/HISTORY
audio-soft/oggasm/HISTORY
audio-soft/qjackconnect/HISTORY
audio-soft/qjackctl/DETAILS
audio-soft/qjackctl/HISTORY
audio-soft/qloud/DEPENDS
audio-soft/qloud/HISTORY
audio-soft/sox/HISTORY
audio-soft/streamripper/HISTORY
chat-im/ayttm/DETAILS
chat-im/ayttm/HISTORY
chat-im/centericq/HISTORY
chat-im/ekiga/DETAILS
chat-im/ekiga/HISTORY
chat-im/gaim-assistant/DEPENDS
chat-im/gaim-assistant/DETAILS
chat-im/gaim-assistant/HISTORY
chat-im/gaim-blogger/DEPENDS
chat-im/gaim-blogger/DETAILS
chat-im/gaim-blogger/HISTORY
chat-im/gaim-encryption/DETAILS
chat-im/gaim-encryption/HISTORY
chat-im/gaim-guifications/DEPENDS
chat-im/gaim-guifications/DETAILS
chat-im/gaim-guifications/HISTORY
chat-im/gaim-rss-reader/DEPENDS
chat-im/gaim-rss-reader/HISTORY
chat-im/gaim-xmms-remote/DEPENDS
chat-im/gaim-xmms-remote/DETAILS
chat-im/gaim-xmms-remote/HISTORY
chat-im/gaim/DETAILS
chat-im/gaim/HISTORY
chat-im/gaim/PROVIDES
chat-im/gaimnosd/DEPENDS
chat-im/gaimnosd/DETAILS
chat-im/gaimnosd/HISTORY
chat-im/gajim/DETAILS
chat-im/gajim/HISTORY
chat-im/gnugadu2/HISTORY
chat-im/gossip/DETAILS
chat-im/gossip/HISTORY
chat-im/kadu/HISTORY
chat-im/licq/DETAILS
chat-im/licq/HISTORY
chat-im/licq/INSTALL
chat-im/licq/PRE_BUILD
chat-im/netwrite/HISTORY
chat-im/sim-icq/DEPENDS
chat-im/sim-icq/HISTORY
chat-irc/bitlbee/HISTORY
chat-irc/miau/DETAILS
chat-irc/miau/HISTORY
chat-irc/weechat/DETAILS
chat-irc/weechat/HISTORY
chat-irc/xchat-gnome/HISTORY
chat-irc/xchat/DEPENDS
chat-irc/xchat/DETAILS
chat-irc/xchat/HISTORY
chat-libs/opal/DETAILS
chat-libs/opal/HISTORY
chat-libs/openh323/DETAILS
chat-libs/openh323/HISTORY
chat-libs/pwlib/DETAILS
chat-libs/pwlib/HISTORY
cluster/clapack/DETAILS
cluster/clapack/HISTORY
cluster/lam/DETAILS
cluster/lam/HISTORY
cluster/lapack/DETAILS
cluster/lapack/HISTORY
cluster/lui/DETAILS
cluster/lui/HISTORY
cluster/metis/DETAILS
cluster/metis/HISTORY
cluster/netpipe/DETAILS
cluster/netpipe/HISTORY
cluster/oompi/DETAILS
cluster/oompi/HISTORY
cluster/openmosixview/DETAILS
cluster/openmosixview/HISTORY
cluster/parmetis/DETAILS
cluster/parmetis/HISTORY
cluster/procstatd/DETAILS
cluster/procstatd/HISTORY
cluster/xpvm/DETAILS
cluster/xpvm/HISTORY
collab/cpu/HISTORY
collab/drupal/DETAILS
collab/drupal/HISTORY
collab/gq/DETAILS
collab/gq/HISTORY
collab/imp/DETAILS
collab/imp/HISTORY
collab/ingo/DETAILS
collab/ingo/HISTORY
collab/kronolith/DETAILS
collab/kronolith/HISTORY
collab/ldap-account-manager/DETAILS
collab/ldap-account-manager/HISTORY
collab/ldap-account-manager/INSTALL
collab/mediawiki/HISTORY
collab/minimalist/HISTORY
collab/openca/DETAILS
collab/openca/HISTORY
collab/openldap/DETAILS
collab/openldap/HISTORY
collab/php_users/HISTORY
collab/phprojekt/DETAILS
collab/phprojekt/HISTORY
collab/pmi/HISTORY
collab/rapidsvn/HISTORY
collab/subversion/DETAILS
collab/subversion/HISTORY
collab/thcnet/HISTORY
collab/tikiwiki/HISTORY
collab/turba/DETAILS
collab/turba/HISTORY
collab/tutos/HISTORY
collab/vlad/HISTORY
collab/xoopsforge/HISTORY
crypto/aircrack-ng/DETAILS
crypto/aircrack-ng/HISTORY
crypto/beecrypt/HISTORY
crypto/cryptopp/HISTORY
crypto/cryptsetup-luks/DETAILS
crypto/cryptsetup-luks/HISTORY
crypto/cyrus-sasl/DETAILS
crypto/cyrus-sasl/HISTORY
crypto/dirmngr/DETAILS
crypto/dirmngr/HISTORY
crypto/encfs/DETAILS
crypto/encfs/HISTORY
crypto/gnutls/DETAILS
crypto/gnutls/HISTORY
crypto/gnutls/PREPARE
crypto/gpa/HISTORY
crypto/gpasman/HISTORY
crypto/gpgme/DETAILS
crypto/gpgme/HISTORY
crypto/gringotts/DETAILS
crypto/gringotts/HISTORY
crypto/gss/DETAILS
crypto/gss/HISTORY
crypto/hydan/HISTORY
crypto/libssh/HISTORY
crypto/openct/DETAILS
crypto/openct/HISTORY
crypto/opensc/DETAILS
crypto/opensc/HISTORY
crypto/openssl/DETAILS
crypto/openssl/HISTORY
crypto/openssl/UP_TRIGGERS
crypto/pcsc-lite/DETAILS
crypto/pcsc-lite/HISTORY
crypto/putty/BUILD
crypto/putty/HISTORY
crypto/rssh/HISTORY
crypto/scponly/HISTORY
crypto/secpanel/DETAILS
crypto/secpanel/HISTORY
crypto/shishi/HISTORY
crypto/ssldump/HISTORY
crypto/util-linux-crypto/DETAILS
crypto/util-linux-crypto/HISTORY
crypto/xmlsec/HISTORY
database/db/HISTORY
database/db/UP_TRIGGERS
database/dbd-interbase/HISTORY
database/firebird/BUILD
database/firebird/DEPENDS
database/firebird/DETAILS
database/firebird/FINAL
database/firebird/HISTORY
database/firebird/INSTALL
database/firebird/UP_TRIGGERS
database/flamerobin/DETAILS
database/flamerobin/HISTORY
database/hk_classes/CONFIGURE
database/hk_classes/DETAILS
database/hk_classes/HISTORY
database/ibpp/DETAILS
database/ibpp/HISTORY
database/libdbi-drivers/HISTORY
database/libiodbc/HISTORY
database/mdbtools/DETAILS
database/mdbtools/HISTORY
database/mysql-ruby/HISTORY
database/mysql/BUILD
database/mysql/CONFIGURE
database/mysql/DETAILS
database/mysql/HISTORY
database/mysql/PRE_SUB_DEPENDS
database/mysql/SUB_DEPENDS
database/odbcjdbc/BUILD
database/odbcjdbc/DETAILS
database/odbcjdbc/INSTALL
database/odbcjdbc/PRE_BUILD
database/odk-ng/BUILD
database/odk-ng/CONFIGURE
database/odk-ng/DEPENDS
database/odk-ng/DETAILS
database/odk-ng/HISTORY
database/odk-ng/INSTALL
database/odkutils/BUILD
database/odkutils/DETAILS
database/odkutils/HISTORY
database/odkutils/INSTALL
database/odkutils/PRE_BUILD
database/pgadmin3/HISTORY
database/postgresql/DETAILS
database/postgresql/HISTORY
database/qdbm/DETAILS
database/qdbm/HISTORY
database/rekall/DETAILS
database/rekall/HISTORY
database/sqlite/DETAILS
database/sqlite/HISTORY
database/tora/HISTORY
database/unixodbc/DEPENDS
database/unixodbc/HISTORY
database/xbsql/HISTORY
devel/anjuta/HISTORY
devel/bison/HISTORY
devel/boost-jam/DETAILS
devel/boost-jam/HISTORY
devel/cmake/DETAILS
devel/cmake/HISTORY
devel/cogito/DETAILS
devel/cogito/HISTORY
devel/distcc/HISTORY
devel/eclipse-cdt-sdk/HISTORY
devel/eclipse/DETAILS
devel/eclipse/HISTORY
devel/erlang/DETAILS
devel/erlang/HISTORY
devel/flex/HISTORY
devel/gcl/HISTORY
devel/gdb/HISTORY
devel/geany/DETAILS
devel/geany/HISTORY
devel/git/BUILD
devel/git/CONFIGURE
devel/git/DEPENDS
devel/git/DETAILS
devel/git/HISTORY
devel/lua/BUILD
devel/lua/DETAILS
devel/lua/HISTORY
devel/lua/INSTALL
devel/m4/BUILD
devel/m4/DETAILS
devel/m4/HISTORY
devel/monodevelop/DETAILS
devel/monodevelop/HISTORY
devel/motor/HISTORY
devel/nemerle/DETAILS
devel/nemerle/HISTORY
devel/nhc98/HISTORY
devel/ocaml/DETAILS
devel/ocaml/HISTORY
devel/pgadmin3/DEPENDS
devel/phpmyadmin/DETAILS
devel/phpmyadmin/HISTORY
devel/python/HISTORY
devel/qgit/DETAILS
devel/qgit/HISTORY
devel/rake/HISTORY
devel/rcs/DETAILS
devel/rcs/HISTORY
devel/rubygems/HISTORY
devel/swig/DETAILS
devel/swig/HISTORY
devel/tcl/DETAILS
devel/tcl/HISTORY
devel/tk/DETAILS
devel/tk/HISTORY
devel/zope3/DETAILS
devel/zope3/HISTORY
disk/grub/HISTORY
disk/netatalk/HISTORY
disk/qtparted/BUILD
disk/qtparted/DETAILS
disk/qtparted/HISTORY
disk/sfs/BUILD
disk/sfs/DEPENDS
disk/sfs/DETAILS
disk/sfs/HISTORY
disk/udev/BUILD
disk/udev/CONFIGURE
disk/udev/DEPENDS
disk/udev/DETAILS
disk/udev/HISTORY
disk/udev/INSTALL
disk/udev/Makefile.patch
disk/udev/PREPARE
disk/udev/PRE_BUILD
disk/udev/helpers/mac2name
disk/udev/init.d/coldplug
display/atitvout/DETAILS
display/atitvout/HISTORY
display/directfb/DETAILS
display/directfb/HISTORY
display/qingy/DEPENDS
display/qingy/DETAILS
display/qingy/HISTORY
display/xdirectfb/HISTORY
doc/chmlib/DETAILS
doc/chmlib/HISTORY
doc/cookbook/HISTORY
doc/flashcards/HISTORY
doc/man-pages/DETAILS
doc/man-pages/HISTORY
doc/tetex/DEPENDS
doc/tetex/HISTORY
doc/texinfo/HISTORY
doc/wv/DETAILS
doc/wv/HISTORY
e/e-profile/HISTORY
e/e17/DEPENDS
e/e17/HISTORY
e/e_module-calendar/DETAILS
e/e_module-calendar/HISTORY
e/e_module-calendar/PRE_BUILD
e/e_module-devian/DETAILS
e/e_module-devian/HISTORY
e/e_module-evolume/DEPENDS
e/e_module-evolume/DETAILS
e/e_module-evolume/HISTORY
e/e_module-moon/BUILD
e/e_module-moon/DETAILS
e/e_module-moon/HISTORY
e/e_module-moon/PRE_BUILD
e/e_module-mount/DETAILS
e/e_module-mount/HISTORY
e/e_module-mount/PRE_BUILD
e/e_module-screenshot/DEPENDS
e/e_module-screenshot/DETAILS
e/e_module-screenshot/HISTORY
e/e_module-screenshot/PRE_BUILD
e/e_module-slideshow/DETAILS
e/e_module-slideshow/HISTORY
e/e_module-slideshow/PRE_BUILD
e/e_module-tclock/DETAILS
e/e_module-tclock/HISTORY
e/e_module-tclock/PRE_BUILD
e/e_modules/CONFLICTS
e/e_modules/DEPENDS
e/e_modules/DETAILS
e/e_modules/HISTORY
e/e_utils/HISTORY
e/edje/DEPENDS
e/edje/HISTORY
e/emphasis/DEPENDS
e/emphasis/DETAILS
e/emphasis/HISTORY
e/emphasis/PRE_BUILD
e/engage/HISTORY
e/enlightenment/HISTORY
e/ewl/DEPENDS
e/ewl/DETAILS
e/ewl/HISTORY
e/imlib2/DETAILS
e/imlib2/HISTORY
e/imlib2_loaders/DETAILS
e/imlib2_loaders/HISTORY
editors/code-browser/DETAILS
editors/code-browser/HISTORY
editors/cooledit/HISTORY
editors/diakonos/DETAILS
editors/diakonos/HISTORY
editors/emacs/DEPENDS
editors/emacs/DETAILS
editors/emacs/HISTORY
editors/gle/DETAILS
editors/gle/HISTORY
editors/gtkspell/HISTORY
editors/jedit/DETAILS
editors/jedit/HISTORY
editors/makagiga/HISTORY
editors/scribus/DETAILS
editors/scribus/HISTORY
editors/ted/HISTORY
editors/texmacs/DETAILS
editors/texmacs/HISTORY
editors/transfig/HISTORY
editors/vim/HISTORY
editors/zile/profile.d/editor.sh
excluded
fonts/amspsfnt/DETAILS
fonts/cmpsfont/DETAILS
fonts/dbz/DETAILS
fonts/dejavu-ttf/DETAILS
fonts/latex-xft-fonts/DETAILS
ftp-libs/curlpp/DETAILS
ftp-libs/curlpp/HISTORY
ftp-libs/libtorrent/DETAILS
ftp-libs/libtorrent/HISTORY
ftp/amule/HISTORY
ftp/curl/DETAILS
ftp/curl/HISTORY
ftp/giftcurs/HISTORY
ftp/lftp/DETAILS
ftp/lftp/HISTORY
ftp/mldonkey/DETAILS
ftp/mldonkey/HISTORY
ftp/proftpd/CONFIGURE
ftp/proftpd/DETAILS
ftp/proftpd/HISTORY
ftp/rtorrent/DETAILS
ftp/rtorrent/HISTORY
gnome2-apps/balsa2/DETAILS
gnome2-apps/balsa2/HISTORY
gnome2-apps/epiphany/DETAILS
gnome2-apps/epiphany/HISTORY
gnome2-apps/gcursor/DETAILS
gnome2-apps/gcursor/HISTORY
gnome2-apps/glsof/DETAILS
gnome2-apps/glsof/HISTORY
gnome2-apps/gnomesu/DETAILS
gnome2-apps/gnomesu/HISTORY
gnome2-apps/gnomevfs-mount/DETAILS
gnome2-apps/gnomevfs-mount/HISTORY
gnome2-apps/gphpedit/DETAILS
gnome2-apps/gphpedit/HISTORY
gnome2-apps/gswitchit/HISTORY
...

diff --git a/graphics/gimp-help-2/DEPENDS b/graphics/gimp-help-2/DEPENDS
index e44bc60..da4bc7d 100755
--- a/graphics/gimp-help-2/DEPENDS
+++ b/graphics/gimp-help-2/DEPENDS
@@ -1 +1,9 @@
-depends gimp
+optional_depends gimp \
+ '--with-gimp' \
+ '--without-gimp' \
+ 'for integration with GIMP" &&
+
+optional_depends imagemagick \
+ '--enable-convert' \
+ '--disable-convert' \
+ 'for file size optimized PNGs'
diff --git a/graphics/gimp-help-2/HISTORY b/graphics/gimp-help-2/HISTORY
index eeaacc2..404f52d 100644
--- a/graphics/gimp-help-2/HISTORY
+++ b/graphics/gimp-help-2/HISTORY
@@ -1,3 +1,8 @@
+2007-03-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depend on imagemagick (for convert) to optimize
+ PNGs for file size
+ Optionally depends on gimp, it's not required. ;)
+
2007-03-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.12




  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (d9e20034951f362ba0ab68d61a4bc6150249fe78), Eric Sandall, 03/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page