Download as
Browse Code »

Commit 2e6471e446687537d4e08e2accf9218d90356b8b

Authored by Perry Werneck
1 parent d403240e
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Fixing .deb builds

Showing 5 changed files with 74 additions and 78 deletions   Show diff stats
Makefile.in
  Diff comments   View file @2e6471e
... ... @@ -115,8 +115,20 @@ publish-release: \
115 115 #---[ Install Rules ]--------------------------------------------------------------------
116 116  
117 117 install: \
  118 + install-application \
  119 + install-devel
  120 +
  121 +install-devel: \
118 122 $(foreach MODULE, $(MODULES), install-$(MODULE)) \
119 123 locale/$(PACKAGE_TARNAME).pot \
  124 + install-sdk
  125 +
  126 + @$(MAKE) \
  127 + -C src/libpw3270cpp \
  128 + DESTDIR=$(DESTDIR) \
  129 + install
  130 +
  131 +install-application: \
120 132 install-pw3270 \
121 133 install-branding \
122 134 install-ui \
... ... @@ -133,11 +145,8 @@ ifneq ($(HELP2MAN),no)
133 145 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ | gzip --best --stdout - > $(DESTDIR)/$(mandir)/man1/$(PACKAGE_NAME).1.gz
134 146 endif
135 147  
136   - @$(MAKE) -C src/libpw3270cpp DESTDIR=$(DESTDIR) install
137   -
138 148 @$(MKDIR) $(DESTDIR)$(libdir)/pw3270-plugins
139 149  
140   -
141 150 install-%: \
142 151 modules/%/Makefile
143 152  
... ...
locale/pt_BR.po
  Diff comments   View file @2e6471e
... ... @@ -5,7 +5,7 @@ msgid ""
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2019-02-25 17:29-0300\n"
  8 +"POT-Creation-Date: 2019-02-25 19:57-0300\n"
9 9 "PO-Revision-Date: 2019-02-06 11:14-0200\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Português <>\n"
... ... @@ -55,7 +55,7 @@ msgstr &quot;Ação %s precisa de um valor válido&quot;
55 55 msgid "%s action needs src attribute"
56 56 msgstr "Ação %s precisa do atributo src"
57 57  
58   -#: main.c:97
  58 +#: main.c:96
59 59 #, c-format
60 60 msgid "%s requires GTK version %d.%d.%d"
61 61 msgstr "%s requer GTK versão %d.%d.%d"
... ... @@ -95,7 +95,7 @@ msgstr &quot;%s: Tabulação vertical não é suportada&quot;
95 95 msgid "%s<b>%s</b> for %s"
96 96 msgstr "%s<b>%s</b> para %s"
97 97  
98   -#: main.c:380
  98 +#: main.c:379
99 99 msgid "- 3270 Emulator for Gtk"
100 100 msgstr "- Emulador 3270 para GTK"
101 101  
... ... @@ -168,7 +168,7 @@ msgstr &quot;&quot;
168 168 msgid "<b>Text options</b>"
169 169 msgstr "<b>Opções de texto</b>"
170 170  
171   -#: main.c:400
  171 +#: main.c:399
172 172 msgid ""
173 173 "<b>Valid options:</b>\n"
174 174 "\n"
... ... @@ -261,7 +261,7 @@ msgstr &quot;Um parametro de ENVIO/RECEBIMENTO inválido foi enviado para o host.&quot;
261 261 msgid "Appends the source file to the destination file."
262 262 msgstr "Adiciona conteúdo do arquivo origem ao final do arquivo destino."
263 263  
264   -#: main.c:369
  264 +#: main.c:368
265 265 msgid "Application name"
266 266 msgstr "Nome da aplicação"
267 267  
... ... @@ -1046,7 +1046,7 @@ msgstr &quot;&quot;
1046 1046 msgid "Function bar"
1047 1047 msgstr "Barra de funções"
1048 1048  
1049   -#: main.c:101 main.c:476
  1049 +#: main.c:100 main.c:475
1050 1050 msgid "GTK Version mismatch"
1051 1051 msgstr "Divergência de versão GTK"
1052 1052  
... ... @@ -1107,11 +1107,11 @@ msgstr &quot;Servidor rejeitou o tipo de dispositivo ou requisição&quot;
1107 1107 msgid "Host rejected resource(s)"
1108 1108 msgstr "Servidor rejeitou recurso(s)"
1109 1109  
1110   -#: main.c:360
  1110 +#: main.c:359
1111 1111 msgid "Host system type"
1112 1112 msgstr "Tipo do sistema no servidor"
1113 1113  
1114   -#: main.c:358
  1114 +#: main.c:357
1115 1115 msgid "Host to connect"
1116 1116 msgstr "Servidor a conectar"
1117 1117  
... ... @@ -1323,7 +1323,7 @@ msgstr &quot;Load&quot;
1323 1323 msgid "Load queue from file"
1324 1324 msgstr "Ler a fila de um arquivo"
1325 1325  
1326   -#: config.c:430
  1326 +#: config.c:423
1327 1327 #, c-format
1328 1328 msgid "Loading %s"
1329 1329 msgstr "Carregando %s"
... ... @@ -1337,11 +1337,11 @@ msgstr &quot;Arquivo _local:&quot;
1337 1337 msgid "Local:"
1338 1338 msgstr "Local:"
1339 1339  
1340   -#: main.c:375
  1340 +#: main.c:374
1341 1341 msgid "Log to file"
1342 1342 msgstr "Enviar log para arquivo"
1343 1343  
1344   -#: main.c:366
  1344 +#: main.c:365
1345 1345 msgid "Minutes for auto-disconnect"
1346 1346 msgstr "Minutos para desconexão automática"
1347 1347  
... ... @@ -1608,7 +1608,7 @@ msgstr &quot;PF8&quot;
1608 1608 msgid "PF9"
1609 1609 msgstr "PF9"
1610 1610  
1611   -#: main.c:398
  1611 +#: main.c:397
1612 1612 msgid "Parse error"
1613 1613 msgstr "Erro de interpretação"
1614 1614  
... ... @@ -1637,7 +1637,7 @@ msgstr &quot;Colar com margem esquerda&quot;
1637 1637 msgid "Path and name of the local file"
1638 1638 msgstr "Caminho e nome do arquivo local"
1639 1639  
1640   -#: main.c:367
  1640 +#: main.c:366
1641 1641 msgid "Path for plugin files"
1642 1642 msgstr "Caminho para os arquivos de plugin"
1643 1643  
... ... @@ -1841,7 +1841,7 @@ msgstr &quot;Recarregar conteúdo do buffer&quot;
1841 1841 msgid "Remap Failed"
1842 1842 msgstr "Remapeamento falhou"
1843 1843  
1844   -#: main.c:364
  1844 +#: main.c:363
1845 1845 msgid "Remap charset from xml file"
1846 1846 msgstr "Remapear caracteres por um arquivo xml"
1847 1847  
... ... @@ -2113,7 +2113,7 @@ msgstr &quot;Certificado auto assinado na cadeia de certificados&quot;
2113 2113 msgid "Send file"
2114 2114 msgstr "Enviar arquivo"
2115 2115  
2116   -#: main.c:372
  2116 +#: main.c:371
2117 2117 msgid "Send messages to syslog"
2118 2118 msgstr "Enviar mensagens para o log do sistema"
2119 2119  
... ... @@ -2129,11 +2129,11 @@ msgstr &quot;Enviar/Receber&quot;
2129 2129 msgid "Sending file"
2130 2130 msgstr "Enviando arquivo"
2131 2131  
2132   -#: main.c:353 main.c:355
  2132 +#: main.c:352 main.c:354
2133 2133 msgid "Session name"
2134 2134 msgstr "Nome da sessão"
2135 2135  
2136   -#: main.c:363
  2136 +#: main.c:362
2137 2137 msgid "Set host charset"
2138 2138 msgstr "Define página de código do host"
2139 2139  
... ... @@ -2141,19 +2141,19 @@ msgstr &quot;Define página de código do host&quot;
2141 2141 msgid "Set insert mode"
2142 2142 msgstr "Set insert mode"
2143 2143  
2144   -#: main.c:359
  2144 +#: main.c:358
2145 2145 msgid "Set reported colors (8/16)"
2146 2146 msgstr "Define número de cores informadas (8/16)"
2147 2147  
2148   -#: main.c:362
  2148 +#: main.c:361
2149 2149 msgid "Set toggles OFF"
2150 2150 msgstr "Desativa toggles"
2151 2151  
2152   -#: main.c:361
  2152 +#: main.c:360
2153 2153 msgid "Set toggles ON"
2154 2154 msgstr "Ativa toggles"
2155 2155  
2156   -#: main.c:374
  2156 +#: main.c:373
2157 2157 msgid "Set trace filename"
2158 2158 msgstr "Define o nome do arquivo de trace"
2159 2159  
... ... @@ -2523,7 +2523,7 @@ msgstr &quot;Os tipos conhecidos são %s&quot;
2523 2523 msgid "The model number"
2524 2524 msgstr "Nº do modelo"
2525 2525  
2526   -#: main.c:365
  2526 +#: main.c:364
2527 2527 msgid "The model of 3270 display to be emulated"
2528 2528 msgstr "Modelo de tela 3270 a ser emulada"
2529 2529  
... ... @@ -2632,7 +2632,7 @@ msgstr &quot;&quot;
2632 2632 "programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple "
2633 2633 "Place, Suite 330, Boston, MA, 02111-1307, USA"
2634 2634  
2635   -#: main.c:472
  2635 +#: main.c:471
2636 2636 #, c-format
2637 2637 msgid "This program requires GTK version %d.%d.%d"
2638 2638 msgstr "Este programa precisa do GTK versão %d.%d.%d"
... ... @@ -2830,7 +2830,7 @@ msgstr &quot;O resultado da verificação TLS/SSL foi inesperado&quot;
2830 2830 msgid "Unexpected or invalid attribute value \"%s\""
2831 2831 msgstr "Valor de attributo inesperado ou inválido: \"%s\""
2832 2832  
2833   -#: main.c:157
  2833 +#: main.c:156
2834 2834 #, c-format
2835 2835 msgid "Unexpected or invalid color value \"%s\""
2836 2836 msgstr "Valor de cor inválido ou inesperado: \"%s\""
... ...
locale/pw3270.pot
  Diff comments   View file @2e6471e
... ... @@ -9,7 +9,7 @@ msgstr &quot;&quot;
9 9 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 10 "Project-Id-Version: PACKAGE VERSION\n"
11 11 "Report-Msgid-Bugs-To: \n"
12   -"POT-Creation-Date: 2019-02-25 17:37-0300\n"
  12 +"POT-Creation-Date: 2019-02-25 20:07-0300\n"
13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 15 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 20 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 21 "Project-Id-Version: PACKAGE VERSION\n"
22 22 "Report-Msgid-Bugs-To: \n"
23   -"POT-Creation-Date: 2019-02-22 14:46+0000\n"
  23 +"POT-Creation-Date: 2019-02-25 21:25+0000\n"
24 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 26 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -31,7 +31,7 @@ msgstr &quot;&quot;
31 31 "#-#-#-#-# libv3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
32 32 "Project-Id-Version: PACKAGE VERSION\n"
33 33 "Report-Msgid-Bugs-To: \n"
34   -"POT-Creation-Date: 2019-02-22 14:48+0000\n"
  34 +"POT-Creation-Date: 2019-02-25 21:45+0000\n"
35 35 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
36 36 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
37 37 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -87,7 +87,7 @@ msgstr &quot;&quot;
87 87 msgid "%s action needs src attribute"
88 88 msgstr ""
89 89  
90   -#: main.c:97
  90 +#: main.c:96
91 91 #, c-format
92 92 msgid "%s requires GTK version %d.%d.%d"
93 93 msgstr ""
... ... @@ -127,7 +127,7 @@ msgstr &quot;&quot;
127 127 msgid "%s<b>%s</b> for %s"
128 128 msgstr ""
129 129  
130   -#: main.c:380
  130 +#: main.c:379
131 131 msgid "- 3270 Emulator for Gtk"
132 132 msgstr ""
133 133  
... ... @@ -198,7 +198,7 @@ msgstr &quot;&quot;
198 198 msgid "<b>Text options</b>"
199 199 msgstr ""
200 200  
201   -#: main.c:400
  201 +#: main.c:399
202 202 msgid ""
203 203 "<b>Valid options:</b>\n"
204 204 "\n"
... ... @@ -284,7 +284,7 @@ msgstr &quot;&quot;
284 284 msgid "Appends the source file to the destination file."
285 285 msgstr ""
286 286  
287   -#: main.c:369
  287 +#: main.c:368
288 288 msgid "Application name"
289 289 msgstr ""
290 290  
... ... @@ -1033,7 +1033,7 @@ msgstr &quot;&quot;
1033 1033 msgid "Function bar"
1034 1034 msgstr ""
1035 1035  
1036   -#: main.c:101 main.c:476
  1036 +#: main.c:100 main.c:475
1037 1037 msgid "GTK Version mismatch"
1038 1038 msgstr ""
1039 1039  
... ... @@ -1093,11 +1093,11 @@ msgstr &quot;&quot;
1093 1093 msgid "Host rejected resource(s)"
1094 1094 msgstr ""
1095 1095  
1096   -#: main.c:360
  1096 +#: main.c:359
1097 1097 msgid "Host system type"
1098 1098 msgstr ""
1099 1099  
1100   -#: main.c:358
  1100 +#: main.c:357
1101 1101 msgid "Host to connect"
1102 1102 msgstr ""
1103 1103  
... ... @@ -1293,7 +1293,7 @@ msgstr &quot;&quot;
1293 1293 msgid "Load queue from file"
1294 1294 msgstr ""
1295 1295  
1296   -#: config.c:430
  1296 +#: config.c:423
1297 1297 #, c-format
1298 1298 msgid "Loading %s"
1299 1299 msgstr ""
... ... @@ -1306,11 +1306,11 @@ msgstr &quot;&quot;
1306 1306 msgid "Local:"
1307 1307 msgstr ""
1308 1308  
1309   -#: main.c:375
  1309 +#: main.c:374
1310 1310 msgid "Log to file"
1311 1311 msgstr ""
1312 1312  
1313   -#: main.c:366
  1313 +#: main.c:365
1314 1314 msgid "Minutes for auto-disconnect"
1315 1315 msgstr ""
1316 1316  
... ... @@ -1574,7 +1574,7 @@ msgstr &quot;&quot;
1574 1574 msgid "PF9"
1575 1575 msgstr ""
1576 1576  
1577   -#: main.c:398
  1577 +#: main.c:397
1578 1578 msgid "Parse error"
1579 1579 msgstr ""
1580 1580  
... ... @@ -1603,7 +1603,7 @@ msgstr &quot;&quot;
1603 1603 msgid "Path and name of the local file"
1604 1604 msgstr ""
1605 1605  
1606   -#: main.c:367
  1606 +#: main.c:366
1607 1607 msgid "Path for plugin files"
1608 1608 msgstr ""
1609 1609  
... ... @@ -1805,7 +1805,7 @@ msgstr &quot;&quot;
1805 1805 msgid "Remap Failed"
1806 1806 msgstr ""
1807 1807  
1808   -#: main.c:364
  1808 +#: main.c:363
1809 1809 msgid "Remap charset from xml file"
1810 1810 msgstr ""
1811 1811  
... ... @@ -2063,7 +2063,7 @@ msgstr &quot;&quot;
2063 2063 msgid "Send file"
2064 2064 msgstr ""
2065 2065  
2066   -#: main.c:372
  2066 +#: main.c:371
2067 2067 msgid "Send messages to syslog"
2068 2068 msgstr ""
2069 2069  
... ... @@ -2079,11 +2079,11 @@ msgstr &quot;&quot;
2079 2079 msgid "Sending file"
2080 2080 msgstr ""
2081 2081  
2082   -#: main.c:353 main.c:355
  2082 +#: main.c:352 main.c:354
2083 2083 msgid "Session name"
2084 2084 msgstr ""
2085 2085  
2086   -#: main.c:363
  2086 +#: main.c:362
2087 2087 msgid "Set host charset"
2088 2088 msgstr ""
2089 2089  
... ... @@ -2091,19 +2091,19 @@ msgstr &quot;&quot;
2091 2091 msgid "Set insert mode"
2092 2092 msgstr ""
2093 2093  
2094   -#: main.c:359
  2094 +#: main.c:358
2095 2095 msgid "Set reported colors (8/16)"
2096 2096 msgstr ""
2097 2097  
2098   -#: main.c:362
  2098 +#: main.c:361
2099 2099 msgid "Set toggles OFF"
2100 2100 msgstr ""
2101 2101  
2102   -#: main.c:361
  2102 +#: main.c:360
2103 2103 msgid "Set toggles ON"
2104 2104 msgstr ""
2105 2105  
2106   -#: main.c:374
  2106 +#: main.c:373
2107 2107 msgid "Set trace filename"
2108 2108 msgstr ""
2109 2109  
... ... @@ -2421,7 +2421,7 @@ msgstr &quot;&quot;
2421 2421 msgid "The model number"
2422 2422 msgstr ""
2423 2423  
2424   -#: main.c:365
  2424 +#: main.c:364
2425 2425 msgid "The model of 3270 display to be emulated"
2426 2426 msgstr ""
2427 2427  
... ... @@ -2508,7 +2508,7 @@ msgid &quot;&quot;
2508 2508 "Franklin St, Fifth Floor, Boston, MA 02111-1307 USA"
2509 2509 msgstr ""
2510 2510  
2511   -#: main.c:472
  2511 +#: main.c:471
2512 2512 #, c-format
2513 2513 msgid "This program requires GTK version %d.%d.%d"
2514 2514 msgstr ""
... ... @@ -2703,7 +2703,7 @@ msgstr &quot;&quot;
2703 2703 msgid "Unexpected or invalid attribute value \"%s\""
2704 2704 msgstr ""
2705 2705  
2706   -#: main.c:157
  2706 +#: main.c:156
2707 2707 #, c-format
2708 2708 msgid "Unexpected or invalid color value \"%s\""
2709 2709 msgstr ""
... ...
sdk/Makefile.in
  Diff comments   View file @2e6471e
... ... @@ -83,8 +83,14 @@ install: \
83 83 $(LIBNAME).@PACKAGE_MAJOR_VERSION@ \
84 84 $(DESTDIR)$(libdir)/$(LIBNAME)
85 85  
86   - @$(MKDIR) $(DESTDIR)$(libdir)/pkgconfig
87   - @$(INSTALL_DATA) pw3270.pc $(DESTDIR)$(libdir)/pkgconfig/$(PACKAGE_TARNAME).pc
  86 + # Install PKG-CONFIG files
  87 +
  88 + @mkdir -p $(DESTDIR)$(libdir)/pkgconfig
  89 +
  90 + @$(INSTALL_DATA) \
  91 + $(BASEDIR)/sdk/*.pc \
  92 + $(DESTDIR)$(libdir)/pkgconfig
  93 +
88 94  
89 95 $(SRCDIR)/sdk: \
90 96 $(foreach SRC, $(notdir $(wildcard $(BASEDIR)/src/include/lib3270/*.h)), $(SRCDIR)/src/include/lib3270/$(SRC)) \
... ... @@ -96,7 +102,9 @@ $(SRCDIR)/sdk: \
96 102 @$(MKDIR) $@
97 103 @$(INSTALL_DATA) *.in $@
98 104  
99   - @$(INSTALL_DATA) $(BASEDIR)/src/include/*.in $(SRCDIR)/src/include
  105 + @$(INSTALL_DATA) \
  106 + $(BASEDIR)/src/include/*.in \
  107 + $(SRCDIR)/src/include
100 108  
101 109  
102 110  
... ...
src/pw3270/Makefile.in
  Diff comments   View file @2e6471e
... ... @@ -266,8 +266,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
266 266 $(LIBS)
267 267  
268 268 install: \
269   - $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
270   - install-devel
  269 + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@
271 270  
272 271 @$(MKDIR) $(DESTDIR)$(libdir)
273 272  
... ... @@ -281,26 +280,6 @@ install: \
281 280 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
282 281 $(DESTDIR)$(bindir)
283 282  
284   -
285   -install-devel:
286   -
287   - @mkdir -p $(DESTDIR)$(libdir)/pkgconfig
288   - @mkdir -p $(DESTDIR)$(includedir)/pw3270
289   -
290   - # Install includes
291   - @$(INSTALL_DATA) \
292   - $(BASEDIR)/src/include/pw3270/*.h \
293   - $(DESTDIR)$(includedir)/pw3270
294   -
295   - @$(INSTALL_DATA) \
296   - $(BASEDIR)/src/include/pw3270.h \
297   - $(DESTDIR)$(includedir)
298   -
299   - # Install PKG-CONFIG files
300   - @$(INSTALL_DATA) \
301   - $(BASEDIR)/sdk/*.pc \
302   - $(DESTDIR)$(libdir)/pkgconfig
303   -
304 283 $(SRCDIR): \
305 284 clean \
306 285 $(foreach MOD, $(MODULES), $(SRCDIR)/$(MOD))
... ...