head	1.2;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.1.2.1
	OPENPKG_E1_FP:1.1.2.1
	OPENPKG_2_STABLE_MP:1.2
	OPENPKG_2_STABLE_20061018:1.1.2.1
	OPENPKG_2_STABLE_20060622:1.1
	OPENPKG_2_STABLE:1.1.0.2
	OPENPKG_2_STABLE_BP:1.1;
locks; strict;
comment	@# @;


1.2
date	2006.09.14.15.01.47;	author cs;	state Exp;
branches;
next	1.1;
commitid	mNxMIzi9Gc8x6OMr;

1.1
date	2006.03.10.11.18.59;	author rse;	state Exp;
branches
	1.1.2.1;
next	;
commitid	tCuUnavHI8MKUCor;

1.1.2.1
date	2006.10.16.14.50.39;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.2
log
@upgrading package: gpg-error 1.3 -> 1.4
@
text
@Index: src/gpg-error.c
--- src/gpg-error.c.orig	2006-09-05 20:21:14 +0200
+++ src/gpg-error.c	2006-09-14 16:59:50 +0200
@@@@ -77,11 +77,15 @@@@
   locale_dir = get_locale_dir ();
   if (locale_dir)
     {
+#ifdef ENABLE_NLS
       bindtextdomain (PACKAGE, locale_dir);
+#endif
       drop_locale_dir (locale_dir);
     }
+#ifdef ENABLE_NLS
   textdomain (PACKAGE);
 #endif
+#endif
 }
 
 
@


1.1
log
@upgrading package: gpg-error 1.1 -> 1.2
@
text
@d2 3
a4 3
--- src/gpg-error.c.orig	2005-12-18 16:24:34 +0100
+++ src/gpg-error.c	2006-03-10 11:31:17 +0100
@@@@ -78,10 +78,14 @@@@
d15 1
@


1.1.2.1
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@d2 3
a4 3
--- src/gpg-error.c.orig	2006-09-05 20:21:14 +0200
+++ src/gpg-error.c	2006-09-14 16:59:50 +0200
@@@@ -77,11 +77,15 @@@@
a14 1
 #endif
@