head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2007.12.21.08.19.35;	author rse;	state Exp;
branches;
next	1.1;
commitid	VMtIWCXpEE5QZgKs;

1.1
date	2007.07.06.10.49.13;	author rse;	state Exp;
branches;
next	;
commitid	hBpiOgk8lZNZdHos;


desc
@@


1.2
log
@upgrading package: gnupg1 1.4.7 -> 1.4.8
@
text
@Index: g10/Makefile.am
--- g10/Makefile.am.orig	2007-10-23 09:50:35 +0200
+++ g10/Makefile.am	2007-12-21 09:06:51 +0100
@@@@ -24,9 +24,9 @@@@
 
 if ! HAVE_DOSISH_SYSTEM
 AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
-AM_CPPFLAGS += -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@@PACKAGE@@\""
-AM_CPPFLAGS += -DGNUPG_DATADIR="\"$(pkgdatadir)\""
-AM_CPPFLAGS += -DGNUPG_LIBDIR="\"$(libdir)/@@PACKAGE@@\""
+AM_CPPFLAGS += -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@@PACKAGE@@1\""
+AM_CPPFLAGS += -DGNUPG_DATADIR="\"$(pkgdatadir)1\""
+AM_CPPFLAGS += -DGNUPG_LIBDIR="\"$(libdir)/@@PACKAGE@@1\""
 endif
 
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
Index: keyserver/Makefile.in
--- keyserver/Makefile.in.orig	2007-12-20 08:54:09 +0100
+++ keyserver/Makefile.in	2007-12-21 09:15:58 +0100
@@@@ -312,7 +312,7 @@@@
 top_srcdir = @@top_srcdir@@
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
 EXTRA_SCRIPTS = gpgkeys_mailto
-gpglibexecdir = $(libexecdir)/@@PACKAGE@@
+gpglibexecdir = $(libexecdir)/@@PACKAGE@@1
 gpglibexec_PROGRAMS = @@GPGKEYS_LDAP@@ @@GPGKEYS_HKP@@ @@GPGKEYS_FINGER@@ @@GPGKEYS_CURL@@
 gpglibexec_SCRIPTS = @@GPGKEYS_MAILTO@@
 noinst_SCRIPTS = gpgkeys_test
@


1.1
log
@move gnupg to gnupg1
@
text
@d2 3
a4 3
--- g10/Makefile.am.orig	2006-12-14 10:16:00 +0100
+++ g10/Makefile.am	2007-07-06 12:00:28 +0200
@@@@ -26,9 +26,9 @@@@
d18 4
a21 4
--- keyserver/Makefile.in.orig	2007-03-05 10:44:42 +0100
+++ keyserver/Makefile.in	2007-07-06 12:00:09 +0200
@@@@ -334,7 +334,7 @@@@
 target_alias = @@target_alias@@
d26 1
a28 1
 gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h
@