Source Mage code commit list

[Treeve Jelbert <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

 printer/cups/CONFIGURE     |    2 +-
 printer/cups/HISTORY       |    5 -----
 printer/cups/PRE_BUILD     |    5 -----
 printer/cups/str1879.patch |   36 ------------------------------------
 4 files changed, 1 insertion(+), 47 deletions(-)

New commits:
commit e5a36e23f3d8bea4f4a9dde771ccfa1f8e59d6ae
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

    Revert "cups - add str1879.patch"
    this patch has an unfortunate side effect, some things get installed to 
/cups  !!
    
    This reverts d5ebade05f600c3b31900583677d214ff0e48855 commit.

diff --git a/printer/cups/CONFIGURE b/printer/cups/CONFIGURE
index 9e074cc..f47ae87 100755
--- a/printer/cups/CONFIGURE
+++ b/printer/cups/CONFIGURE
@@ -1,2 +1,2 @@
 source $GRIMOIRE/FUNCTIONS   &&
-config_query_multi CUPS_LANG "which additional language to install?" none de 
es ja pl sv
+config_query_multi CUPS_LANG "which additional language to install?"  de es 
ja pl sv
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index 3c23a99..febf25a 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,8 +1,3 @@
-2006-08-07 Treeve Jelbert <treeve AT pi.be>
-       * CONFIGURE: enable 'none' in languages selection
-       * str1879.patch; add, supplied by CUPS project
-       * PRE_BUILD: add, apply patch
-
 2006-07-26 Treeve Jelbert <treeve AT pi.be>
        * BUILD: stop install of xinetd scrip
        * xinetd/cups-lpd: add
diff --git a/printer/cups/PRE_BUILD b/printer/cups/PRE_BUILD
deleted file mode 100755
index 7570be6..0000000
--- a/printer/cups/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build      &&
-cd $SOURCE_DIRECTORY   &&
-# apply CUPS patch
-patch  -p0 < $SPELL_DIRECTORY/str1879.patch  &&
-autoconf
diff --git a/printer/cups/str1879.patch b/printer/cups/str1879.patch
deleted file mode 100644
index 627107c..0000000
--- a/printer/cups/str1879.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- config-scripts/cups-defaults.m4    (revision 5801)
-+++ config-scripts/cups-defaults.m4    (working copy)
-@@ -25,7 +25,9 @@
- 
- dnl Default langugages...
- AC_ARG_WITH(languages, [  --with-languages        set installed languages, 
default="de es ja pl sv" ],
--      LANGUAGES="$withval",
-+      if test "x$withval" != xno; then
-+              LANGUAGES="$withval"
-+      fi,
-       LANGUAGES="de es ja pl sv")
- AC_SUBST(LANGUAGES)
- 
---- configure.in       (revision 5801)
-+++ configure.in       (working copy)
-@@ -54,9 +54,17 @@
-       INSTALL_LANGUAGES="install-languages"
-       UNINSTALL_LANGUAGES="uninstall-languages"
-       for lang in $LANGUAGES; do
--              LANGFILES="$LANGFILES doc/$lang/index.html"
--              LANGFILES="$LANGFILES templates/$lang/edit-config.tmpl"
--              LANGFILES="$LANGFILES templates/$lang/header.tmpl"
-+              if test -f doc/$lang/index.html.in; then
-+                      LANGFILES="$LANGFILES doc/$lang/index.html"
-+              fi
-+
-+              if test -f templates/$lang/edit-config.tmpl.in; then
-+                      LANGFILES="$LANGFILES 
templates/$lang/edit-config.tmpl"
-+              fi
-+
-+              if test -f templates/$lang/header.tmpl.in; then
-+                      LANGFILES="$LANGFILES templates/$lang/header.tmpl"
-+              fi
-       done
- fi
-