[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-115-g01f6717

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  01f6717300280cc7d14c7c3aeca327f7bdfefe1b (commit)
       via  a0f0d0071cec55a763b66f957b6e148034ed8980 (commit)
      from  07c9a7460c7144bc4f9e87ab8038bed4adede52e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 01f6717300280cc7d14c7c3aeca327f7bdfefe1b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Dec 7 10:03:59 2012 +0000

    Update kleopatra with ability to create .pgp files
    
        * packages/packages.current (kleopatara): Update to 20121207 build.

diff --git a/packages/packages.current b/packages/packages.current
index 32e0a56..de9d75e 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -485,8 +485,8 @@ chk  f877c4c69060718b7e4e22fa7475e788e33316df
 file kdelibs-20110203-src.zip
 chk  5c0515c4619af0e2e21cfd9c7a019d2dfa9db118
 
-file kleopatra-20110204-bin.zip
-chk  d92b7ee8e5009f29df72844027b25f5ecc7d2433
+file kleopatra-20121207-bin.zip
+chk  574e23d9f1fc92545de1f4cc7e7420ae32fa036e
 
-file kleopatra-20110204-src.zip
-chk  6a540dafaeb7a26a0ca18901692e558aa87117ec
+file kleopatra-20121207-src.zip
+chk  bf4c09af71decc4f3792c2e8d19a79bb5ce3f191

commit a0f0d0071cec55a763b66f957b6e148034ed8980
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Dec 7 10:00:07 2012 +0000

    Fix build when cups is installed
    
        * Makefile.am: Add --disable-cups to gtk_configure options.

diff --git a/src/Makefile.am b/src/Makefile.am
index 38ce62e..e6ad550 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -128,7 +128,7 @@ gpg4win_pkg_gdk_pixbuf_configure = \
   CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
 
 gpg4win_pkg_gtk__configure = \
-  CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
+  CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib --disable-cups
 
 # The GnuPG package provides man pages which we have to convert.
 # We also create the MO files here.

-----------------------------------------------------------------------

Summary of changes:
 packages/packages.current |    8 ++++----
 src/Makefile.am           |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org