libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif/po fr.po,1.1,1.2

[<as...@us...>]

Update of /cvsroot/libexif/libexif/po
In directory sc8-pr-cvs1:/tmp/cvs-serv1632

Modified Files:
	fr.po 
Log Message:
Update. The remaining fuzzy and untranslated msg are technical one
I don't know how to translate cleanly.


Index: fr.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/fr.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fr.po	22 Nov 2002 12:45:41 -0000	1.1
+++ fr.po	27 Nov 2002 08:01:09 -0000	1.2
@@ -105,7 +105,7 @@
 
 #: libexif/exif-entry.c:341
 msgid "Partial"
-msgstr ""
+msgstr "Partiel"
 
 #: libexif/exif-entry.c:344 libexif/exif-entry.c:525
 msgid "Other"
@@ -185,11 +185,11 @@
 
 #: libexif/exif-entry.c:451
 msgid "Trilinear sensor"
-msgstr ""
+msgstr "Capteur trilinéaire"
 
 #: libexif/exif-entry.c:454
 msgid "Color sequential linear sensor"
-msgstr ""
+msgstr "Capteur linéaire séquentiel de couleur"
 
 #: libexif/exif-entry.c:470
 msgid "Daylight"
@@ -385,76 +385,80 @@
 
 #: libexif/exif-entry.c:719
 msgid "Flash fired, compulsory flash mode, return light not detected."
-msgstr ""
+msgstr "Flash déclenché, mode de flash obligatoire, lumière de retour non détectée."
 
 #: libexif/exif-entry.c:723
 msgid "Flash fired, compulsory flash mode, return light detected."
-msgstr ""
+msgstr "Flash déclenché, mode de flash obligatoire, lumière de retour détectée."
 
 #: libexif/exif-entry.c:727
 msgid "Flash did not fire, compulsory flash mode."
-msgstr ""
+msgstr "Flash non déclenché, mode de flash obligatoire."
 
 #: libexif/exif-entry.c:731
 msgid "Flash did not fire, auto mode."
-msgstr ""
+msgstr "Flash non déclenché, mode auto."
 
 #: libexif/exif-entry.c:735
 msgid "Flash fired, auto mode."
-msgstr ""
+msgstr "Flash déclenché, mode auto."
 
 #: libexif/exif-entry.c:738
 msgid "Flash fired, auto mode, return light not detected."
-msgstr ""
+msgstr "Flash déclenché, mode auto, lumière de retour non détectée."
 
 #: libexif/exif-entry.c:742
 msgid "Flash fired, auto mode, return light detected."
-msgstr ""
+msgstr "Flash déclenché, mode auto, lumière de retour détectée."
 
 #: libexif/exif-entry.c:746
 msgid "No flash function."
-msgstr ""
+msgstr "Pas de fonction flash."
 
 #: libexif/exif-entry.c:749
 msgid "Flash fired, red-eye reduction mode."
-msgstr ""
+msgstr "Flash déclenché, mode anti-yeux rouges."
 
 #: libexif/exif-entry.c:753
 msgid "Flash fired, red-eye reduction mode, return light not detected."
-msgstr ""
+msgstr "Flash déclenché, mode anti-yeux rouges, lumière de retour non détectée."
 
 #: libexif/exif-entry.c:757
 msgid "Flash fired, red-eye reduction mode, return light detected."
-msgstr ""
+msgstr "Flash déclenché, mode anti-yeux rouges, lumière de retour détectée."
 
 #: libexif/exif-entry.c:761
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode."
-msgstr ""
+msgstr "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges."
 
 #: libexif/exif-entry.c:765
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
 "detected."
 msgstr ""
+"Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, lumière "
+"de retour non détectée."
 
 #: libexif/exif-entry.c:770
 msgid ""
 "Flash fired, compulsory flash mode, red-eye reduction mode, return light "
 "detected."
 msgstr ""
+"Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, lumière "
+"de retour détectée"
 
 #: libexif/exif-entry.c:775
 msgid "Flash fired, auto mode, red-eye reduction mode."
-msgstr ""
+msgstr "Flash déclenché, mode auto, mode anti-yeux rouges."
 
 #: libexif/exif-entry.c:779
 msgid ""
 "Flash fired, auto mode, return light not detected, red-eye reduction mode."
-msgstr ""
+msgstr "Flash déclenché, mode auto, lumière de retour non détectée, mode anti-yeux rouges."
 
 #: libexif/exif-entry.c:784
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode."
-msgstr ""
+msgstr "Flash déclenché, mode auto, lumière de retour détectée, mode anti-yeux rouges."
 
 #: libexif/exif-entry.c:795
 #, c-format
@@ -556,17 +560,17 @@
 #: libexif/exif-entry.c:970
 #, c-format
 msgid "Within distance %i of (x,y) = (%i,%i)"
-msgstr ""
+msgstr "Dans la distance %i de (x,y) = (%i,%i)"
 
 #: libexif/exif-entry.c:979
 #, c-format
 msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
-msgstr ""
+msgstr "Dans le rectangle (largeur %i, hauteur %i) autour de (x,y) = (%i,%i)"
 
 #: libexif/exif-entry.c:985
 #, c-format
 msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
-msgstr ""
+msgstr "Nombre inattendu de composants (%li, attendait 2, 3, ou 4)."
 
 #: libexif/exif-entry.c:1159 libexif/olympus/exif-olympus-entry.c:166
 msgid "unknown"
@@ -642,7 +646,7 @@
 
 #: libexif/exif-entry.c:1241
 msgid "creative"
-msgstr ""
+msgstr "créatif"
 
 #: libexif/exif-entry.c:1244
 msgid "action"
@@ -837,6 +841,9 @@
 "YCbCr images, the value set for this tag is 3. In JPEG compressed data a "
 "JPEG marker is used instead of this tag."
 msgstr ""
+"Le nombre de composants par pixel. Puisque le standard s'applique aux images "
+"RGB et YCbCr, la valeur de ce marqueur est 3. Dans des données compressées "
+"en JPEG un marqueur JPEG est utilisé à la place de ce marqueur."
 
 #: libexif/exif-tag.c:115
 msgid "Rows per Strip"
@@ -919,6 +926,9 @@
 "tag is not necessary, since color space is specified in the color space "
 "information tag (<ColorSpace>)."
 msgstr ""
+"Une fonction de transfert pour l'image, décrite en style tableau. Normalement, "
+"ce marqueur n'est pas nécessaire, puisque l'espace des couleurs est spécifié "
+"dans le marqueur d'information sur l'espace des couleurs (<ColorSpace>)."
 
 #: libexif/exif-tag.c:146
 msgid "Software"
@@ -931,6 +941,11 @@
 "is not specified, but it is recommended that the example shown below be "
 "followed. When the field is left blank, it is treated as unknown."
 msgstr ""
+"Ce marqueur enregistre le nom et la version du logiciel ou du matériel "
+"de l'appareil ou du périphérique d'entrée utilisé pour générer l'image. Le "
+"format détaillé n'est pas spécifié, mais il est recommandé que l'exemple "
+"ci-dessous soit suivi. Lorsque le champ est vide, il est traité comme "
+"inconnu."
 
 #: libexif/exif-tag.c:153
 msgid "Date and Time"
@@ -955,6 +970,11 @@
 "the information be written as in the example below for ease of "
 "Interoperability. When the field is left blank, it is treated as unknown."
 msgstr ""
+"Ce marqueur enregistre le nom du propriétaire de l'appareil, du photographe "
+"ou du créateur de l'image. Le format détaillé n'est pas spécifié, mais il est "
+"recommandé que cette information soit écrite comme dans l'exemple ci-dessous "
+"pour faciliter l'interopérabilité. Lorsque le champ est laissé blanc, il est "
+"considéré comme inconnu."
 
 #: libexif/exif-tag.c:162
 msgid "White Point"
@@ -980,11 +1000,11 @@
 
 #: libexif/exif-tag.c:171
 msgid "Transfer Range"
-msgstr ""
+msgstr "Échelle de transfert"
 
 #: libexif/exif-tag.c:174
 msgid "JPEG Interchange Format"
-msgstr ""
+msgstr "Format d'échange JPEG"
 
 #: libexif/exif-tag.c:175
 msgid ""
@@ -994,7 +1014,7 @@
 
 #: libexif/exif-tag.c:179
 msgid "JPEG Interchange Format Length"
-msgstr ""
+msgstr "Longueur du format d'échange JPEG"
 
 #: libexif/exif-tag.c:180
 msgid ""
@@ -1004,10 +1024,16 @@
 "be recorded. Compressed thumbnails must be recorded in no more than 64 "
 "Kbytes, including all other data to be recorded in APP1."
 msgstr ""
+"Le nombre d'octets de données des vignettes compressées JPEG. Ce n'est pas "
+"utilisé pour les données des images JPEG primaires. Les vignettes JPEG ne sont "
+"pas divisées mais sont enregistrées sous la forme d'un flux continu JPEG de SOI "
+"à EOI. Les marqueurs Appn et COM ne doivent pas être enregistrés. Les vignettes "
+"compressées doivent être enregistrées dans moins de 64 kilo-octets, incluant toutes "
+"les autres données devant être enregistrées dans APP1."
 
 #: libexif/exif-tag.c:188
 msgid "YCbCr Coefficients"
-msgstr ""
+msgstr "Coéfficients YCbCr"
 
 #: libexif/exif-tag.c:189
 msgid ""
@@ -1030,7 +1056,7 @@
 
 #: libexif/exif-tag.c:202
 msgid "YCbCr Positioning"
-msgstr ""
+msgstr "Positionnement YCbCr"
 
 #: libexif/exif-tag.c:203
 msgid ""
@@ -1059,10 +1085,16 @@
 "being the value that gives the optimal image characteristics "
 "Interoperability these conditions."
 msgstr ""
+"La valeur de référence des points noir et blanc. Nul défaut n'est donné en "
+"TIFF, mais les valeurs ci-dessous sont données comme défauts ici. L'espace "
+"des couleurs est déclaré dans le marqueur d'informations de l'espace des "
+"couleurs, avec la valeur par défaut étant celle donnant les caractéristiques "
+"optimales de l'image dans ces conditions."
+
 
 #: libexif/exif-tag.c:233 libexif/exif-tag.c:528
 msgid "CFA Pattern"
-msgstr ""
+msgstr "Motif CFA"
 
 #: libexif/exif-tag.c:234 libexif/exif-tag.c:529
 msgid ""
@@ -1122,6 +1154,8 @@
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
+"La classe du programme utilisé par l'appareil pour configurer l'exposition "
+"lorsque la photo a été prise."
 
 #: libexif/exif-tag.c:275
 msgid "Spectral Sensitivity"
@@ -1482,33 +1516,39 @@
 
 #: libexif/exif-tag.c:493
 msgid "Focal Plane x-Resolution"
-msgstr ""
+msgstr "x-Résolution du plan focal"
 
 #: libexif/exif-tag.c:494
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
+"Indique le nombre de pixels de largeur (X) de l'image par "
+"<FocalPlaneResolutionUnit> sur le plan focal de l'appareil."
 
 #: libexif/exif-tag.c:497
 msgid "Focal Plane y-Resolution"
-msgstr ""
+msgstr "y-Résolution du plan focal"
 
 #: libexif/exif-tag.c:498
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
+"Indique le nombre de pixels de hauteur (Y) de l'image par "
+"<FocalPlaneResolutionUnit> sur le plan focal de l'appareil."
 
 #: libexif/exif-tag.c:501
 msgid "Focal Plane Resolution Unit"
-msgstr ""
+msgstr "Unité de résolution du plan focal"
 
 #: libexif/exif-tag.c:502
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
+"Indique l'unité de mesure de <FocalPlaneXResolution> et de "
+"<FocalPlaneYResolution>. Cette valeur est la même que <ResolutionUnit>."
 
 #: libexif/exif-tag.c:506
 msgid "Subject Location"
@@ -1524,7 +1564,7 @@
 
 #: libexif/exif-tag.c:513
 msgid "Exposure index"
-msgstr ""
+msgstr "Index d'exposition"
 
 #: libexif/exif-tag.c:514
 msgid ""
@@ -1555,10 +1595,12 @@
 msgstr "Type de scène"
 
 #: libexif/exif-tag.c:524
+#, fuzzy
 msgid ""
 "Indicates the type of scene. If a DSC recorded the image, this tag value "
 "must always be set to 1, indicating that the image was directly photographed."
 msgstr ""
+"Indique le type de scène."
 
 #: libexif/exif-tag.c:532
 msgid "Subject Area"
@@ -1614,6 +1656,9 @@
 "numerator of the recorded value is 0, this indicates that digital zoom was "
 "not used."
 msgstr ""
+"Ce marqueur indique la valeur du zoom numérique lorsque l'image a été prise."
+"Si le numérateur de la valeur enregistrée est 0, celà signifie que le zoom "
+"numérique n'a pas été utilisé."
 
 #: libexif/exif-tag.c:553
 msgid "Focal Length In 35mm Film"
@@ -1625,10 +1670,13 @@
 "in mm. A value of 0 means the focal length is unknown. Note that this tag "
 "differs from the FocalLength tag."
 msgstr ""
+"Ce marqueur indique la longueur focale équivalente en assumant un appareil "
+"avec un film de 35mm, en mm. Une valeur de 0 indique que la longueur focale "
+"est inconnue. Notez que ce marqueur est différent du marqueur FocalLength."
 
 #: libexif/exif-tag.c:559
 msgid "Scene Capture Type"
-msgstr ""
+msgstr "Type de capture de la scène"
 
 #: libexif/exif-tag.c:560
 msgid ""
@@ -1677,7 +1725,7 @@
 
 #: libexif/exif-tag.c:577
 msgid "Device Setting Description"
-msgstr ""
+msgstr "Description des paramètres du périphérique"
 
 #: libexif/exif-tag.c:578
 msgid ""
@@ -1685,6 +1733,9 @@
 "particular camera model. The tag is used only to indicate the picture-taking "
 "conditions in the reader."
 msgstr ""
+"Ce marqueur indique les informations sur les conditions lors de la "
+"prise de vue pour un modèle particulier d'appareil. Ce marqueur n'est "
+"utilisé que pour indiquer les paramètres de prise de vue au lecteur."
 
 #: libexif/exif-tag.c:583
 msgid "Subject Distance Range"
@@ -1704,6 +1755,9 @@
 "recorded as an ASCII string equivalent to hexadecimal notation and 128-bit "
 "fixed length."
 msgstr ""
+"Ce marqueur indique un identificateur unique assigné à chaque image. Il "
+"est enregistré sous la forme d'une chaîne ASCII équivalente à la notation "
+"hexadécimale et d'une longueur fixe de 128 bits."
 
 #: libexif/fuji/exif-fuji-tag.c:49
 msgid "Version"
@@ -1718,9 +1772,8 @@
 msgstr "Balance des blancs"
 
 #: libexif/fuji/exif-fuji-tag.c:53
-#, fuzzy
 msgid "Chromaticity saturation"
-msgstr "Saturation faible"
+msgstr "Saturation chromatique"
 
 #: libexif/fuji/exif-fuji-tag.c:55
 msgid "Flash mode"
@@ -1736,15 +1789,15 @@
 
 #: libexif/fuji/exif-fuji-tag.c:59
 msgid "Focusing mode"
-msgstr ""
+msgstr "Mode de mise au point"
 
 #: libexif/fuji/exif-fuji-tag.c:60
 msgid "Slow synchro mode"
-msgstr ""
+msgstr "Mode de synchronisation lente"
 
 #: libexif/fuji/exif-fuji-tag.c:61
 msgid "Picture mode"
-msgstr ""
+msgstr "Mode de lecture"
 
 #: libexif/fuji/exif-fuji-tag.c:62 libexif/olympus/exif-olympus-tag.c:52
 msgid "Unknown 1"
@@ -1752,7 +1805,7 @@
 
 #: libexif/fuji/exif-fuji-tag.c:63
 msgid "Continuous taking"
-msgstr ""
+msgstr "Prise de vues continue"
 
 #: libexif/fuji/exif-fuji-tag.c:64 libexif/olympus/exif-olympus-tag.c:54
 msgid "Unknown 2"
@@ -1760,11 +1813,11 @@
 
 #: libexif/fuji/exif-fuji-tag.c:65
 msgid "Blur warning"
-msgstr ""
+msgstr "Avertissement de flou"
 
 #: libexif/fuji/exif-fuji-tag.c:66
 msgid "Auto focus warning"
-msgstr ""
+msgstr "Avertissement de mise au point automatique"
 
 #: libexif/fuji/exif-fuji-tag.c:67
 msgid "Auto exposure warning"

[libexif-cvs] libexif/libexif/canon exif-canon-note.c,1.3,1.4

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif/canon
In directory sc8-pr-cvs1:/tmp/cvs-serv15933/libexif/canon

Modified Files:
	exif-canon-note.c 
Log Message:
remove Id tag

Index: exif-canon-note.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-canon-note.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exif-canon-note.c	22 Nov 2002 17:19:20 -0000	1.3
+++ exif-canon-note.c	26 Nov 2002 19:31:29 -0000	1.4
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-
 static void
 exif_canon_note_free (ExifNote *n)
 {

[libexif-cvs] libexif/libexif exif.c,1.1,1.2 exif.h,1.1,1.2

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv15933/libexif

Modified Files:
	exif.c exif.h 
Log Message:
remove Id tag

Index: exif.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exif.c	11 Dec 2001 20:28:30 -0000	1.1
+++ exif.c	26 Nov 2002 19:31:29 -0000	1.2
@@ -21,8 +21,6 @@
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-$Id$
-
 */
 
 #include <sys/time.h>

Index: exif.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exif.h	11 Dec 2001 20:28:30 -0000	1.1
+++ exif.h	26 Nov 2002 19:31:29 -0000	1.2
@@ -21,8 +21,6 @@
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-$Id$
-
 */
 
 typedef struct exif_rational {

[libexif-cvs] libexif/aolserver Makefile,1.1,1.2 nsexif.c,1.2,1.3

[<as...@us...>]

Update of /cvsroot/libexif/libexif/aolserver
In directory sc8-pr-cvs1:/tmp/cvs-serv15933/aolserver

Modified Files:
	Makefile nsexif.c 
Log Message:
remove Id tag

Index: Makefile
===================================================================
RCS file: /cvsroot/libexif/libexif/aolserver/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	25 Oct 2000 00:10:58 -0000	1.1
+++ Makefile	26 Nov 2002 19:31:28 -0000	1.2
@@ -1,4 +1,3 @@
-
 NSHOME   =  /home/aol31
 
 EXIFDIR  = ..

Index: nsexif.c
===================================================================
RCS file: /cvsroot/libexif/libexif/aolserver/nsexif.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nsexif.c	22 Nov 2002 17:19:19 -0000	1.2
+++ nsexif.c	26 Nov 2002 19:31:28 -0000	1.3
@@ -21,9 +21,6 @@
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-$Id$
-
-
 This is a loadable module for the AOLserver web server that provides
 an interface to the EXIF tag parsing library.
 

[libexif-cvs] exif exif.1,1.1,1.2

[<as...@us...>]

Update of /cvsroot/libexif/exif
In directory sc8-pr-cvs1:/tmp/cvs-serv14105

Modified Files:
	exif.1 
Log Message:
Id tag

Index: exif.1
===================================================================
RCS file: /cvsroot/libexif/exif/exif.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exif.1	15 Sep 2002 22:10:46 -0000	1.1
+++ exif.1	26 Nov 2002 19:27:25 -0000	1.2
@@ -1,4 +1,3 @@
-.\" $Id$
 .\" (c) 2002 by Thomas Pircher (tehpeh at gmx dot net)
 .\"
 .\" Permission is granted to make and distribute verbatim copies of this

[libexif-cvs] libexif configure.in,1.40,1.41

[<as...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv17276

Modified Files:
	configure.in 
Log Message:
no branches, ooops

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- configure.in	22 Nov 2002 23:11:24 -0000	1.40
+++ configure.in	22 Nov 2002 23:56:13 -0000	1.41
@@ -1,7 +1,7 @@
 AC_PREREQ(2.50)
 AC_INIT(libexif/exif-data.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libexif, 0.5.8dev1)
+AM_INIT_AUTOMAKE(libexif, 0.5.7rc3)
 AM_MAINTAINER_MODE
 
 dnl ---------------------------------------------------------------------------

[libexif-cvs] libexif configure.in,1.39,1.40

[<as...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv1659

Modified Files:
	configure.in 
Log Message:
HEAD is a dev release

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- configure.in	22 Nov 2002 12:45:41 -0000	1.39
+++ configure.in	22 Nov 2002 23:11:24 -0000	1.40
@@ -1,7 +1,7 @@
 AC_PREREQ(2.50)
 AC_INIT(libexif/exif-data.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libexif, 0.5.7rc3)
+AM_INIT_AUTOMAKE(libexif, 0.5.8dev1)
 AM_MAINTAINER_MODE
 
 dnl ---------------------------------------------------------------------------

[libexif-cvs] libexif/aolserver nsexif.c,1.1,1.2

[<as...@us...>]

Update of /cvsroot/libexif/libexif/aolserver
In directory sc8-pr-cvs1:/tmp/cvs-serv22079/aolserver

Modified Files:
	nsexif.c 
Log Message:
- clean the headers of gettext macros
- generic clean of the headers: use "" instead of <> to first
  look at local sources, not system ones
- rename exif-i18n.h by generic i18n.h


Index: nsexif.c
===================================================================
RCS file: /cvsroot/libexif/libexif/aolserver/nsexif.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nsexif.c	25 Oct 2000 00:10:58 -0000	1.1
+++ nsexif.c	22 Nov 2002 17:19:19 -0000	1.2
@@ -144,7 +144,3 @@
 }
 
 int Ns_ModuleVersion = 1;
-
-
-
-

[libexif-cvs] libexif/test test-mem.c,1.2,1.3 test-tree.c,1.3,1.4

[<as...@us...>]

Update of /cvsroot/libexif/libexif/test
In directory sc8-pr-cvs1:/tmp/cvs-serv22079/test

Modified Files:
	test-mem.c test-tree.c 
Log Message:
- clean the headers of gettext macros
- generic clean of the headers: use "" instead of <> to first
  look at local sources, not system ones
- rename exif-i18n.h by generic i18n.h


Index: test-mem.c
===================================================================
RCS file: /cvsroot/libexif/libexif/test/test-mem.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test-mem.c	25 Jul 2002 15:52:07 -0000	1.2
+++ test-mem.c	22 Nov 2002 17:19:21 -0000	1.3
@@ -18,12 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include "exif-data.h"
+#include "exif-ifd.h"
 
 #include <stdio.h>
-
-#include <libexif/exif-data.h>
-#include <libexif/exif-ifd.h>
 
 int
 main (int argc, char **argv)

Index: test-tree.c
===================================================================
RCS file: /cvsroot/libexif/libexif/test/test-tree.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- test-tree.c	25 Jan 2002 14:39:01 -0000	1.3
+++ test-tree.c	22 Nov 2002 17:19:21 -0000	1.4
@@ -1,8 +1,7 @@
-#include <config.h>
+#include "config.h"
+#include "libjpeg/jpeg-data.h"
 
 #include <stdio.h>
-
-#include <libjpeg/jpeg-data.h>
 
 int
 main (int argc, char **argv)

[libexif-cvs] libexif/libjpeg jpeg-data.c,1.6,1.7 jpeg-marker.c,1.1,1.2

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libjpeg
In directory sc8-pr-cvs1:/tmp/cvs-serv22079/libjpeg

Modified Files:
	jpeg-data.c jpeg-marker.c 
Log Message:
- clean the headers of gettext macros
- generic clean of the headers: use "" instead of <> to first
  look at local sources, not system ones
- rename exif-i18n.h by generic i18n.h


Index: jpeg-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libjpeg/jpeg-data.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jpeg-data.c	8 Jun 2002 20:54:47 -0000	1.6
+++ jpeg-data.c	22 Nov 2002 17:19:21 -0000	1.7
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "jpeg-data.h"
 
 #include <stdlib.h>

Index: jpeg-marker.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libjpeg/jpeg-marker.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jpeg-marker.c	21 Dec 2001 17:14:54 -0000	1.1
+++ jpeg-marker.c	22 Nov 2002 17:19:21 -0000	1.2
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 #include "jpeg-marker.h"
 
 #include <stdlib.h>

[libexif-cvs] libexif/libexif/olympus exif-olympus-entry.c,1.3,1.4 exif-olympus-note.c,1.2,1.3 exif-olympus-tag.c,1.2,1.3

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1:/tmp/cvs-serv22079/libexif/olympus

Modified Files:
	exif-olympus-entry.c exif-olympus-note.c exif-olympus-tag.c 
Log Message:
- clean the headers of gettext macros
- generic clean of the headers: use "" instead of <> to first
  look at local sources, not system ones
- rename exif-i18n.h by generic i18n.h


Index: exif-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-olympus-entry.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exif-olympus-entry.c	22 Nov 2002 15:20:01 -0000	1.3
+++ exif-olympus-entry.c	22 Nov 2002 17:19:20 -0000	1.4
@@ -18,34 +18,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include "exif-format.h"
 #include "exif-olympus-entry.h"
+#include "exif-utils.h"
+#include "i18n.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include <libexif/exif-format.h>
-#include <libexif/exif-utils.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 struct _ExifOlympusEntryPrivate {
 	unsigned int ref_count;

Index: exif-olympus-note.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-olympus-note.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-olympus-note.c	26 Feb 2002 08:31:35 -0000	1.2
+++ exif-olympus-note.c	22 Nov 2002 17:19:21 -0000	1.3
@@ -18,15 +18,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include "exif-byte-order.h"
 #include "exif-olympus-note.h"
+#include "exif-utils.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-
-#include <libexif/exif-byte-order.h>
-#include <libexif/exif-utils.h>
 
 #define DEBUG
 

Index: exif-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-olympus-tag.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-olympus-tag.c	22 Nov 2002 15:20:01 -0000	1.2
+++ exif-olympus-tag.c	22 Nov 2002 17:19:21 -0000	1.3
@@ -18,29 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-olympus-tag.h"
+#include "i18n.h"
 
 #include <stdlib.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 static struct {
 	ExifOlympusTag tag;

[libexif-cvs] libexif/libexif/fuji exif-fuji-entry.c,1.1,1.2 exif-fuji-note.c,1.1,1.2 exif-fuji-tag.c,1.2,1.3

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif/fuji
In directory sc8-pr-cvs1:/tmp/cvs-serv22079/libexif/fuji

Modified Files:
	exif-fuji-entry.c exif-fuji-note.c exif-fuji-tag.c 
Log Message:
- clean the headers of gettext macros
- generic clean of the headers: use "" instead of <> to first
  look at local sources, not system ones
- rename exif-i18n.h by generic i18n.h


Index: exif-fuji-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/fuji/exif-fuji-entry.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exif-fuji-entry.c	21 Feb 2002 14:18:54 -0000	1.1
+++ exif-fuji-entry.c	22 Nov 2002 17:19:20 -0000	1.2
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-fuji-entry.h"
 
 #include <stdlib.h>

Index: exif-fuji-note.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/fuji/exif-fuji-note.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exif-fuji-note.c	21 Feb 2002 14:18:54 -0000	1.1
+++ exif-fuji-note.c	22 Nov 2002 17:19:20 -0000	1.2
@@ -18,14 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include "exif-byte-order.h"
 #include "exif-fuji-note.h"
+#include "exif-utils.h"
 
 #include <stdlib.h>
 #include <string.h>
-
-#include <libexif/exif-byte-order.h>
-#include <libexif/exif-utils.h>
 
 struct _ExifFujiNotePrivate {
 	ExifByteOrder order;

Index: exif-fuji-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/fuji/exif-fuji-tag.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-fuji-tag.c	22 Nov 2002 15:20:01 -0000	1.2
+++ exif-fuji-tag.c	22 Nov 2002 17:19:20 -0000	1.3
@@ -18,29 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-fuji-tag.h"
+#include "i18n.h"
 
 #include <stdlib.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 static struct {
 	ExifFujiTag tag;

[libexif-cvs] libexif/libexif/hp exif-hp-note.c,1.2,1.3

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif/hp
In directory sc8-pr-cvs1:/tmp/cvs-serv22079/libexif/hp

Modified Files:
	exif-hp-note.c 
Log Message:
- clean the headers of gettext macros
- generic clean of the headers: use "" instead of <> to first
  look at local sources, not system ones
- rename exif-i18n.h by generic i18n.h


Index: exif-hp-note.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/hp/exif-hp-note.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-hp-note.c	11 Jun 2002 06:41:28 -0000	1.2
+++ exif-hp-note.c	22 Nov 2002 17:19:20 -0000	1.3
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-hp-note.h"
 
 #include <stdlib.h>

[libexif-cvs] libexif/libexif i18n.h,NONE,1.1 Makefile.am,1.16,1.17 exif-byte-order.c,1.2,1.3 exif-content.c,1.5,1.6 exif-data.c,1.21,1.22 exif-entry.c,1.26,1.27 exif-format.c,1.5,1.6 exif-ifd.c,1.2,1.3 exif-note.c,1.5,1.6 exif-tag.c,1.9,1.10 exif-utils.c,1.3,1.4 exif-i18n.h,1.2,NONE

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv22079/libexif

Modified Files:
	Makefile.am exif-byte-order.c exif-content.c exif-data.c 
	exif-entry.c exif-format.c exif-ifd.c exif-note.c exif-tag.c 
	exif-utils.c 
Added Files:
	i18n.h 
Removed Files:
	exif-i18n.h 
Log Message:
- clean the headers of gettext macros
- generic clean of the headers: use "" instead of <> to first
  look at local sources, not system ones
- rename exif-i18n.h by generic i18n.h


--- NEW FILE: i18n.h ---
(This appears to be a binary file; contents omitted.)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	22 Nov 2002 16:47:56 -0000	1.16
+++ Makefile.am	22 Nov 2002 17:19:19 -0000	1.17
@@ -3,6 +3,7 @@
 INCLUDES =              				\
 	-DLIBEXIF_LOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(top_srcdir)/libexif				\
+	-I$(top_srcdir)/libjpeg				\
 	-I$(top_srcdir)/intl				\
 	-I$(top_srcdir)
 
@@ -16,14 +17,14 @@
 	exif-entry.c		\
 	exif-format.c		\
 	exif-ifd.c		\
-	exif-i18n.h		\
 	exif-note.c		\
 	exif-tag.c		\
-	exif-utils.c
+	exif-utils.c		\
+	i18n.h
 libexif_la_LIBADD = -lm			\
 	canon/libexif-canon.la		\
 	fuji/libexif-fuji.la		\
-	hp/libexif-hp.la	\
+	hp/libexif-hp.la		\
 	olympus/libexif-olympus.la
 
 libexifincludedir = $(includedir)/libexif

Index: exif-byte-order.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-byte-order.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-byte-order.c	22 Nov 2002 15:20:00 -0000	1.2
+++ exif-byte-order.c	22 Nov 2002 17:19:19 -0000	1.3
@@ -17,29 +17,12 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+
+#include "config.h"
 #include "exif-byte-order.h"
+#include "i18n.h"
 
 #include <stdlib.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 const char *
 exif_byte_order_get_name (ExifByteOrder order)

Index: exif-content.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-content.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exif-content.c	13 Feb 2002 08:31:42 -0000	1.5
+++ exif-content.c	22 Nov 2002 17:19:19 -0000	1.6
@@ -17,7 +17,8 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+
+#include "config.h"
 #include "exif-content.h"
 
 #include <stdlib.h>

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- exif-data.c	30 Aug 2002 07:05:43 -0000	1.21
+++ exif-data.c	22 Nov 2002 17:19:19 -0000	1.22
@@ -17,17 +17,16 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+
+#include "config.h"
 #include "exif-data.h"
+#include "exif-ifd.h"
+#include "exif-utils.h"
+#include "jpeg-marker.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-
-#include <libjpeg/jpeg-marker.h>
-
-#include <libexif/exif-utils.h>
-#include <libexif/exif-ifd.h>
 
 #undef MAX
 #define MAX(a, b)  (((a) > (b)) ? (a) : (b))

Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- exif-entry.c	22 Nov 2002 15:20:00 -0000	1.26
+++ exif-entry.c	22 Nov 2002 17:19:19 -0000	1.27
@@ -17,36 +17,18 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+
+#include "config.h"
 #include "exif-entry.h"
+#include "exif-ifd.h"
+#include "exif-utils.h"
+#include "i18n.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 #include <math.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
-
-#include "exif-utils.h"
-#include <libexif/exif-ifd.h>
 
 //#define DEBUG
 

Index: exif-format.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-format.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exif-format.c	22 Nov 2002 15:20:01 -0000	1.5
+++ exif-format.c	22 Nov 2002 17:19:19 -0000	1.6
@@ -17,29 +17,12 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+
+#include "config.h"
 #include "exif-format.h"
+#include "i18n.h"
 
 #include <stdlib.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 static struct {
         ExifFormat format;

Index: exif-ifd.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-ifd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-ifd.c	22 Nov 2002 15:20:01 -0000	1.2
+++ exif-ifd.c	22 Nov 2002 17:19:19 -0000	1.3
@@ -18,29 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-ifd.h"
 
 #include <stdlib.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 static struct {
 	ExifIfd ifd;

Index: exif-note.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-note.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exif-note.c	26 Jun 2002 17:17:02 -0000	1.5
+++ exif-note.c	22 Nov 2002 17:19:19 -0000	1.6
@@ -18,15 +18,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-note.h"
+#include "canon/exif-canon-note.h"
+#include "fuji/exif-fuji-note.h"
+#include "olympus/exif-olympus-note.h"
 
 #include <stdlib.h>
 #include <string.h>
-
-#include <canon/exif-canon-note.h>
-#include <fuji/exif-fuji-note.h>
-#include <olympus/exif-olympus-note.h>
 
 struct _ExifNotePrivate {
 	ExifByteOrder order;

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- exif-tag.c	22 Nov 2002 15:20:01 -0000	1.9
+++ exif-tag.c	22 Nov 2002 17:19:19 -0000	1.10
@@ -18,29 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-tag.h"
+#include "i18n.h"
 
 #include <stdlib.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 static struct {
 	ExifTag tag;

Index: exif-utils.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-utils.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exif-utils.c	16 Sep 2002 20:58:40 -0000	1.3
+++ exif-utils.c	22 Nov 2002 17:19:19 -0000	1.4
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-utils.h"
 
 typedef signed short ExifSShort;

--- exif-i18n.h DELETED ---

[libexif-cvs] libexif/libexif/canon exif-canon-entry.c,1.1,1.2 exif-canon-note.c,1.2,1.3 exif-canon-tag.c,1.2,1.3

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif/canon
In directory sc8-pr-cvs1:/tmp/cvs-serv22079/libexif/canon

Modified Files:
	exif-canon-entry.c exif-canon-note.c exif-canon-tag.c 
Log Message:
- clean the headers of gettext macros
- generic clean of the headers: use "" instead of <> to first
  look at local sources, not system ones
- rename exif-i18n.h by generic i18n.h


Index: exif-canon-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-canon-entry.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exif-canon-entry.c	21 Feb 2002 09:42:49 -0000	1.1
+++ exif-canon-entry.c	22 Nov 2002 17:19:20 -0000	1.2
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-canon-entry.h"
 
 #include <stdlib.h>

Index: exif-canon-note.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-canon-note.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-canon-note.c	21 Feb 2002 09:55:22 -0000	1.2
+++ exif-canon-note.c	22 Nov 2002 17:19:20 -0000	1.3
@@ -18,11 +18,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-canon-note.h"
 
 #include <stdlib.h>
 #include <string.h>
+
 
 static void
 exif_canon_note_free (ExifNote *n)

Index: exif-canon-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-canon-tag.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-canon-tag.c	22 Nov 2002 15:20:01 -0000	1.2
+++ exif-canon-tag.c	22 Nov 2002 17:19:20 -0000	1.3
@@ -18,29 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "exif-canon-tag.h"
+#include "i18n.h"
 
 #include <stdlib.h>
-
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (GETTEXT_PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
 
 static struct {
 	ExifCanonTag tag;

[libexif-cvs] libexif/test Makefile.am,1.6,1.7

[<as...@us...>]

Update of /cvsroot/libexif/libexif/test
In directory sc8-pr-cvs1:/tmp/cvs-serv8142/test

Modified Files:
	Makefile.am 
Log Message:
Add -I$(top_srcdir)/libexif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/test/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	27 Oct 2002 22:04:22 -0000	1.6
+++ Makefile.am	22 Nov 2002 16:47:56 -0000	1.7
@@ -1,4 +1,6 @@
-INCLUDES =			\
+INCLUDES =				\
+	-I$(top_srcdir)/libexif		\
+	-I$(top_srcdir)intl		\
 	-I$(top_srcdir)	
 
 noinst_PROGRAMS =	\

[libexif-cvs] libexif/libexif/olympus Makefile.am,1.2,1.3

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1:/tmp/cvs-serv8142/libexif/olympus

Modified Files:
	Makefile.am 
Log Message:
Add -I$(top_srcdir)/libexif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	15 Sep 2002 13:19:26 -0000	1.2
+++ Makefile.am	22 Nov 2002 16:47:56 -0000	1.3
@@ -1,5 +1,6 @@
 INCLUDES =					\
-        -I$(top_srcdir)/intl			\
+	-I$(top_srcdir)/libexif			\
+	-I$(top_srcdir)/intl			\
 	-I$(top_srcdir)
 
 noinst_LTLIBRARIES = libexif-olympus.la

[libexif-cvs] libexif/libjpeg Makefile.am,1.1,1.2

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libjpeg
In directory sc8-pr-cvs1:/tmp/cvs-serv8142/libjpeg

Modified Files:
	Makefile.am 
Log Message:
Add -I$(top_srcdir)/libexif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libjpeg/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	21 Dec 2001 17:14:54 -0000	1.1
+++ Makefile.am	22 Nov 2002 16:47:56 -0000	1.2
@@ -1,4 +1,6 @@
-INCLUDES =		\
+INCLUDES =				\
+	-I$(top_srcdir)/libexif		\
+	-I$(top_srcdir)intl		\
 	-I$(top_srcdir)
 
 noinst_LTLIBRARIES = libjpeg.la

[libexif-cvs] libexif/libexif/fuji Makefile.am,1.2,1.3

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif/fuji
In directory sc8-pr-cvs1:/tmp/cvs-serv8142/libexif/fuji

Modified Files:
	Makefile.am 
Log Message:
Add -I$(top_srcdir)/libexif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/fuji/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	15 Sep 2002 13:19:26 -0000	1.2
+++ Makefile.am	22 Nov 2002 16:47:56 -0000	1.3
@@ -1,5 +1,6 @@
 INCLUDES =					\
-        -I$(top_srcdir)/intl			\
+	-I$(top_srcdir)/libexif			\
+	-I$(top_srcdir)/intl			\
 	-I$(top_srcdir)
 
 noinst_LTLIBRARIES = libexif-fuji.la

[libexif-cvs] libexif/libexif/hp Makefile.am,1.2,1.3

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif/hp
In directory sc8-pr-cvs1:/tmp/cvs-serv8142/libexif/hp

Modified Files:
	Makefile.am 
Log Message:
Add -I$(top_srcdir)/libexif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/hp/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	10 Jun 2002 17:54:21 -0000	1.2
+++ Makefile.am	22 Nov 2002 16:47:56 -0000	1.3
@@ -1,4 +1,6 @@
-INCLUDES = 		\
+INCLUDES = 			\
+	-I$(top_srcdir)/libexif	\
+	-I$(top_srcdir)/intl	\
 	-I$(top_srcdir)
 
 noinst_LTLIBRARIES = libexif-hp.la

[libexif-cvs] libexif/libexif Makefile.am,1.15,1.16

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv8142/libexif

Modified Files:
	Makefile.am 
Log Message:
Add -I$(top_srcdir)/libexif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	15 Sep 2002 13:19:26 -0000	1.15
+++ Makefile.am	22 Nov 2002 16:47:56 -0000	1.16
@@ -2,8 +2,9 @@
 
 INCLUDES =              				\
 	-DLIBEXIF_LOCALEDIR=\""$(datadir)/locale"\"	\
-        -I$(top_srcdir)					\
-        -I$(top_srcdir)/intl
+	-I$(top_srcdir)/libexif				\
+	-I$(top_srcdir)/intl				\
+	-I$(top_srcdir)
 
 lib_LTLIBRARIES = libexif.la
 

[libexif-cvs] libexif/libexif/canon Makefile.am,1.2,1.3

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif/canon
In directory sc8-pr-cvs1:/tmp/cvs-serv8142/libexif/canon

Modified Files:
	Makefile.am 
Log Message:
Add -I$(top_srcdir)/libexif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	15 Sep 2002 13:19:26 -0000	1.2
+++ Makefile.am	22 Nov 2002 16:47:55 -0000	1.3
@@ -1,5 +1,6 @@
 INCLUDES =					\
-        -I$(top_srcdir)/intl			\
+	-I$(top_srcdir)/libexif			\
+	-I$(top_srcdir)/intl			\
 	-I$(top_srcdir)
 
 noinst_LTLIBRARIES = libexif-canon.la

[libexif-cvs] libexif/libexif/canon exif-canon-tag.c,1.1,1.2

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif/canon
In directory sc8-pr-cvs1:/tmp/cvs-serv20546/canon

Modified Files:
	exif-canon-tag.c 
Log Message:
PACKAGE -> GETTEXT_PACKAGE


Index: exif-canon-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-canon-tag.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exif-canon-tag.c	21 Feb 2002 09:42:49 -0000	1.1
+++ exif-canon-tag.c	22 Nov 2002 15:20:01 -0000	1.2
@@ -26,7 +26,7 @@
 #ifdef ENABLE_NLS
 #  include <libintl.h>
 #  undef _
-#  define _(String) dgettext (PACKAGE, String)
+#  define _(String) dgettext (GETTEXT_PACKAGE, String)
 #  ifdef gettext_noop
 #    define N_(String) gettext_noop (String)
 #  else

[libexif-cvs] libexif/libexif/fuji exif-fuji-tag.c,1.1,1.2

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif/fuji
In directory sc8-pr-cvs1:/tmp/cvs-serv20546/fuji

Modified Files:
	exif-fuji-tag.c 
Log Message:
PACKAGE -> GETTEXT_PACKAGE


Index: exif-fuji-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/fuji/exif-fuji-tag.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exif-fuji-tag.c	21 Feb 2002 14:18:54 -0000	1.1
+++ exif-fuji-tag.c	22 Nov 2002 15:20:01 -0000	1.2
@@ -26,7 +26,7 @@
 #ifdef ENABLE_NLS
 #  include <libintl.h>
 #  undef _
-#  define _(String) dgettext (PACKAGE, String)
+#  define _(String) dgettext (GETTEXT_PACKAGE, String)
 #  ifdef gettext_noop
 #    define N_(String) gettext_noop (String)
 #  else

[libexif-cvs] libexif/libexif/olympus exif-olympus-entry.c,1.2,1.3 exif-olympus-tag.c,1.1,1.2

[<as...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1:/tmp/cvs-serv20546/olympus

Modified Files:
	exif-olympus-entry.c exif-olympus-tag.c 
Log Message:
PACKAGE -> GETTEXT_PACKAGE


Index: exif-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-olympus-entry.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-olympus-entry.c	26 Feb 2002 08:31:35 -0000	1.2
+++ exif-olympus-entry.c	22 Nov 2002 15:20:01 -0000	1.3
@@ -31,7 +31,7 @@
 #ifdef ENABLE_NLS
 #  include <libintl.h>
 #  undef _
-#  define _(String) dgettext (PACKAGE, String)
+#  define _(String) dgettext (GETTEXT_PACKAGE, String)
 #  ifdef gettext_noop
 #    define N_(String) gettext_noop (String)
 #  else

Index: exif-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-olympus-tag.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exif-olympus-tag.c	21 Feb 2002 14:18:54 -0000	1.1
+++ exif-olympus-tag.c	22 Nov 2002 15:20:01 -0000	1.2
@@ -26,7 +26,7 @@
 #ifdef ENABLE_NLS
 #  include <libintl.h>
 #  undef _
-#  define _(String) dgettext (PACKAGE, String)
+#  define _(String) dgettext (GETTEXT_PACKAGE, String)
 #  ifdef gettext_noop
 #    define N_(String) gettext_noop (String)
 #  else