[Gpg4win-commits] r659 - in trunk: . packages src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-01-02 17:01:34 +0100 (Wed, 02 Jan 2008)
New Revision: 659

Modified:
   trunk/ChangeLog
   trunk/README
   trunk/packages/packages.current
   trunk/src/Makefile.am
   trunk/src/pkg-config
Log:
2008-01-02  Marcus Brinkmann  <marcus at g10code.de>

	* packages/packages.current: Update pinentry to 0.7.5-cvs.

	* src/pkg-config (PREFIX): Suppress debug output.

	* src/Makefile.am (gpg4win_pkg_glib_post_install): Since we build
	the package from source, we need to fix up the pkg-config files in
	the runtime package directory.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-12-23 20:52:58 UTC (rev 658)
+++ trunk/ChangeLog	2008-01-02 16:01:34 UTC (rev 659)
@@ -1,3 +1,13 @@
+2008-01-02  Marcus Brinkmann  <marcus at g10code.de>
+
+	* packages/packages.current: Update pinentry to 0.7.5-cvs.
+
+	* src/pkg-config (PREFIX): Suppress debug output.
+
+	* src/Makefile.am (gpg4win_pkg_glib_post_install): Since we build
+	the package from source, we need to fix up the pkg-config files in
+	the runtime package directory.
+
 2007-12-21  Marcus Brinkmann  <marcus at g10code.de>
 
 	* src/uninst-kleopatra.nsi, src/inst-kleopatra.nsi: Update to

Modified: trunk/README
===================================================================
--- trunk/README	2007-12-23 20:52:58 UTC (rev 658)
+++ trunk/README	2008-01-02 16:01:34 UTC (rev 659)
@@ -1,4 +1,4 @@
-This is gpg4win - the GUI Installer Builder for W32.
+BThis is gpg4win - the GUI Installer Builder for W32.
 
 
 Instructions:
@@ -7,7 +7,7 @@
 1. Download the source and binary packages that are required to build
    the installer:
 
-   $ cd packages
+ 1;1609;0c  $ cd packages
    $ sh download.sh
    [...]
    $ cd ..
@@ -40,6 +40,8 @@
 Sarge - this has not been tested.  To satisfy all needs of configure
 at least the following packages need to be installed:
 
+ build-essential (libc6-dev, gcc, g++, make)
+ automake, autoconf (if building from SVN)
  mingw32
  nsis
  stow
@@ -100,6 +102,12 @@
 
 6. Add download information to packages/download.sh.
 
+7. If the package ships pkg-config (*.pc) support files, you need add
+   post install instructions to Makefile.am.  Note that *.pc files may
+   be in the "runtime" directory ${pkgidir} if the package is built
+   within gpg4win (or peculiarly shipped), or in the development
+   package ${pkgidir_dev}.
+
 Then run the usual "./autogen.sh" to create the actual configure file
 and run configure as described above.
 

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2007-12-23 20:52:58 UTC (rev 658)
+++ trunk/packages/packages.current	2008-01-02 16:01:34 UTC (rev 659)
@@ -268,15 +268,15 @@
 file libgcrypt/libgcrypt-1.4.0.tar.bz2
 chk  cd1b52e8ecfa361737c6f130ed2f1d850e312c16
 
-file pinentry/pinentry-0.7.4.tar.gz
-chk  6cd28bda641a6c89d0bb4120e646f967605c532a
-
 file libassuan/libassuan-1.0.4.tar.bz2
 chk  4b720706a8e4251d8cb7a0f2336226907df1426c
 
 # (Snapshots)
 server ftp://ftp.g10code.com/g10code/scratch
 
+file pinentry/pinentry-0.7.5-cvs.tar.gz
+chk  85919f061e4fa432fd3659de89a301878c6c7d25
+
 file gpgme-1.1.6-svn1279.tar.bz2
 chk  9751403f5c90c973fc47a5659f1fa67126253ab6
 

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-12-23 20:52:58 UTC (rev 658)
+++ trunk/src/Makefile.am	2008-01-02 16:01:34 UTC (rev 659)
@@ -289,7 +289,7 @@
 # We need to fix the prefix in the various packages using pkgconfig,
 # or we can't substitute it properly in our pkg-config wrapper.
 define gpg4win_pkg_glib_post_install
- (cd $$$${pkgidir_dev};							\
+ (cd $$$${pkgidir};							\
  perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
 endef
 

Modified: trunk/src/pkg-config
===================================================================
--- trunk/src/pkg-config	2007-12-23 20:52:58 UTC (rev 658)
+++ trunk/src/pkg-config	2008-01-02 16:01:34 UTC (rev 659)
@@ -40,9 +40,9 @@
 #    sed -e "s~\-x11\-~-win32-~g;" # replace x11 with win32 (target)
 #    sed -e "s~pangoxft~pangow32ft~g;" # replace x11 with win32 (target)
 then    
-    echo "PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR" >&2
-    echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >&2
-    echo "OKAY" >&2;
+#    echo "PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR" >&2
+#    echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >&2
+#    echo "OKAY" >&2;
     exit 0;
 else
     echo "pkg-config failed!" >&2