Change path of localization fies to fit Debian standard. (Closes: Bug#73368)

Gbp-Pq: Name change-path-of-localization-files-to-fit-Debian-standar.patch

diff --git a/fpcsrc/utils/fpdoc/dglobals.pp b/fpcsrc/utils/fpdoc/dglobals.pp
index 5ef5af83f69ff9517d2fd50a43af46ed9aa05210..343247910cfbdef8bd52b88f670ca248dddac7eb 100644 (file)
--- a/fpcsrc/utils/fpdoc/dglobals.pp
+++ b/fpcsrc/utils/fpdoc/dglobals.pp
@@ -1676,7 +1676,7 @@ procedure TranslateDocStrings(const Lang: String);
 
 Const
 {$ifdef unix}
-  DefDir = '/usr/local/share/locale';
+  DefDir = '/usr/share/locale';
 {$else}  
   DefDir = 'intl';
 {$endif}
@@ -1690,7 +1690,7 @@ begin
     Dir:=DefDir;
   Dir:=IncludeTrailingPathDelimiter(Dir);
 {$IFDEF Unix}
-  mo := TMOFile.Create(Format(Dir+'%s/LC_MESSAGES/dglobals.mo', [Lang]));
+  mo := TMOFile.Create(Format(Dir+'%s/LC_MESSAGES/dglobals-' + {$include %FPCVERSION%} + '.mo', [Lang]));
 {$ELSE}
   mo := TMOFile.Create(Format(Dir+'dglobals.%s.mo', [Lang]));
 {$ENDIF}

diff --git a/fpcsrc/utils/fpdoc/fpclasschart.pp b/fpcsrc/utils/fpdoc/fpclasschart.pp
index a3a68f64e95dfd6672a2abc2c2198839f8497415..935e4308114b1a493ccf561cfb43da22008543a4 100644 (file)
--- a/fpcsrc/utils/fpdoc/fpclasschart.pp
+++ b/fpcsrc/utils/fpdoc/fpclasschart.pp
@@ -689,7 +689,7 @@ Function ParseCommandLine : Integer;
 
 Const
 {$IFDEF Unix}
-  MoFileTemplate = '/usr/local/share/locale/%s/LC_MESSAGES/makeskel.mo';
+  MoFileTemplate = '/usr/share/locale/%s/LC_MESSAGES/makeskel-' + {$include %FPCVERSION%} + '.mo';
 {$ELSE}
   MoFileTemplate ='intl/makeskel.%s.mo';
 {$ENDIF}

diff --git a/fpcsrc/utils/fpdoc/fpdoc.pp b/fpcsrc/utils/fpdoc/fpdoc.pp
index 586decbf63d2374054d074559c94a761c9eae6cf..efdddb7e12fa89934c7d384db89a3debd295d5ba 100644 (file)
--- a/fpcsrc/utils/fpdoc/fpdoc.pp
+++ b/fpcsrc/utils/fpdoc/fpdoc.pp
@@ -369,7 +369,7 @@ Procedure TFPDocApplication.DoRun;
 
 begin
 {$IFDEF Unix}
-  gettext.TranslateResourceStrings('/usr/local/share/locale/%s/LC_MESSAGES/fpdoc.mo');
+  gettext.TranslateResourceStrings('/usr/share/locale/%s/LC_MESSAGES/fpdoc-' + {$include %FPCVERSION%} + '.mo');
 {$ELSE}
   gettext.TranslateResourceStrings('intl/fpdoc.%s.mo');
 {$ENDIF}

diff --git a/fpcsrc/utils/fpdoc/intl/Makefile b/fpcsrc/utils/fpdoc/intl/Makefile
index 0ad56eb39e5f8d503505d05462283d32a10d2bee..a356d08b4a2b10e85d82457713144854997f50d8 100644 (file)
--- a/fpcsrc/utils/fpdoc/intl/Makefile
+++ b/fpcsrc/utils/fpdoc/intl/Makefile
@@ -1,3 +1,5 @@
+FPC_VERSION=$(shell ${PP} -iV)
+
 all:   de
 
 clean:
@@ -16,8 +18,8 @@ pot:
        rstconv -i ../makeskel.rst -o makeskel.pot
        rstconv -i ../fpdocmk.rst -o fpdocmk.pot
 
-install:
-       install -D -m 0644 fpdoc.de.mo /usr/local/share/locale/de/LC_MESSAGES/fpdoc.mo
-       install -D -m 0644 dglobals.de.mo /usr/local/share/locale/de/LC_MESSAGES/dglobals.mo
-       install -D -m 0644 makeskel.de.mo /usr/local/share/locale/de/LC_MESSAGES/makeskel.mo
-       install -D -m 0644 fpdocmk.de.mo /usr/local/share/locale/de/LC_MESSAGES/fpdocmk.mo
+install: de
+       install -D -m 0644 fpdoc.de.mo ${INSTALL_PREFIX}/share/locale/de/LC_MESSAGES/fpdoc-${FPC_VERSION}.mo
+       install -D -m 0644 dglobals.de.mo ${INSTALL_PREFIX}/share/locale/de/LC_MESSAGES/dglobals-${FPC_VERSION}.mo
+       install -D -m 0644 makeskel.de.mo ${INSTALL_PREFIX}/share/locale/de/LC_MESSAGES/makeskel-${FPC_VERSION}.mo
+       install -D -m 0644 fpdocmk.de.mo ${INSTALL_PREFIX}/share/locale/de/LC_MESSAGES/fpdocmk-${FPC_VERSION}.mo

diff --git a/fpcsrc/utils/fpdoc/makeskel.pp b/fpcsrc/utils/fpdoc/makeskel.pp
index 3c5a9b7abe62c7e5def0c35c73a04aa208321abf..9944833ff9d7cf4eda069716bf730380da805dd5 100644 (file)
--- a/fpcsrc/utils/fpdoc/makeskel.pp
+++ b/fpcsrc/utils/fpdoc/makeskel.pp
@@ -568,7 +568,7 @@ Function ParseCommandLine : Integer;
 
 Const
 {$IFDEF Unix}
-  MoFileTemplate = '/usr/local/share/locale/%s/LC_MESSAGES/makeskel.mo';
+  MoFileTemplate = '/usr/share/locale/%s/LC_MESSAGES/makeskel-' + {$include %FPCVERSION%} + '.mo';
 {$ELSE}
   MoFileTemplate ='intl/makeskel.%s.mo';
 {$ENDIF}

diff --git a/fpcsrc/utils/fpdoc/unitdiff.pp b/fpcsrc/utils/fpdoc/unitdiff.pp
index a7259cb47235a07cb50aa0adf3362cdff41e2c79..2514729f489131eca02fcae89ea0329c1193fcdf 100644 (file)
--- a/fpcsrc/utils/fpdoc/unitdiff.pp
+++ b/fpcsrc/utils/fpdoc/unitdiff.pp
@@ -169,7 +169,7 @@ procedure ParseCommandLine;
 
 Const
 {$IFDEF Unix}
-  MoFileTemplate = '/usr/local/share/locale/%s/LC_MESSAGES/makeskel.mo';
+  MoFileTemplate = '/usr/share/locale/%s/LC_MESSAGES/makeskel-' + {$include %FPCVERSION%} + '.mo';
 {$ELSE}
   MoFileTemplate ='intl/makeskel.%s.mo';
 {$ENDIF}