trans-coord/gnun/server/gnun GNUmakefile ChangeLog

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/03/07 18:23:32

Modified files:
        gnun/server/gnun: GNUmakefile ChangeLog 

Log message:
        (update-po): Replace default values of Content-Type and
        Content-Transfer-Encoding with commonly used values.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.253&r2=1.254

Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- GNUmakefile 27 Feb 2012 13:48:47 -0000      1.114
+++ GNUmakefile 7 Mar 2012 18:23:32 -0000       1.115
@@ -417,10 +417,18 @@
 fi
 endef
 
-# The command to update a PO file ($(1)) from the POT ($(2)).  The target is
-# `touched' in order `make' to consider it up-to-date even if there
-# is nothing to merge.
+# The command to update a PO file ($(1)) from the POT ($(2)).
+#
+# The target is `touched' in order to make `make' to consider it
+# up-to-date even if there is nothing to merge.  The default values of
+# Content-Type and Content-Transfer-Encoding are replaced with commonly
+# used values.
 define update-po
+$(SED) --in-place \
+  '1,/^$$$$/ { \
+     address@hidden("Content-Type: text/plain; 
charset\)=CHARSET\\n"@\1=UTF-8\\n"@; \
+     s/^\("Content-Transfer-Encoding:\) ENCODING\\n"/\1 8bit\\n"/; \
+   }' $(1); \
 $(MSGMERGE) --update --previous $(1) $(2) && touch $(1) \
   && ($(call update-po-status,$(1)); \
       if test "x$(WDIFF)" != x \

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -b -r1.253 -r1.254
--- ChangeLog   27 Feb 2012 19:10:19 -0000      1.253
+++ ChangeLog   7 Mar 2012 18:23:32 -0000       1.254
@@ -1,13 +1,9 @@
-<<<<<<< ChangeLog
-2012-01-24  Pavel Kharitonov  <address@hidden>
+2012-03-07  Pavel Kharitonov  <address@hidden>
 
-       * GNUMakefile (generate-html, home-rules, template-rules)
-       (extra-template-lang-rules, article-rules): Invoke update-po and
-       substitute-localized-includes in generate-html.  Without
-       update-po, the Outdated-Since field was not updated in the
-       templates, and ADD-FUZZY-DIFF didn't apply to them.
+       * GNUMakefile (update-po): Replace default values of
+       Content-Type and Content-Transfer-Encoding with commonly used
+       values.
 
-=======
 2012-02-27  Pavel Kharitonov  <address@hidden>
 
        * GNUMakefile (update-po): Fix the previous commit.
@@ -20,7 +16,6 @@
        update-po, the Outdated-Since field was not updated in the
        templates, and ADD-FUZZY-DIFF didn't apply to them.
 
->>>>>>> 1.252
 2012-02-21  Rafael Beraldo <address@hidden> (tiny change)
 
        * doc/gnun.texi (PO Files): Update URL for vim plugin