Ubuntu
php-defaults package

Merge ~bryce/ubuntu/+source/php-defaults:7.4-transition into ubuntu/+source/php-defaults:ubuntu/focal-devel

  1. Git
  2. lp:~bryce/ubuntu/+source/php-defaults
  3. 7.4-transition
  4. Merge into ubuntu/focal-devel
Proposed by Bryce Harrington
Status: Rejected
Rejected by: Bryce Harrington
Proposed branch: ~bryce/ubuntu/+source/php-defaults:7.4-transition
Merge into: ubuntu/+source/php-defaults:ubuntu/focal-devel
Diff against target: 1000 lines (+403/-0) (has conflicts)
4 files modified
debian/changelog (+30/-0)
debian/control (+277/-0)
debian/rules (+5/-0)
php-maintscript-helper (+91/-0)
Conflict in debian/changelog
Conflict in debian/control
Conflict in debian/rules
Conflict in php-maintscript-helper
Reviewer Review Type Date Requested Status
Andreas Hasenack Needs Fixing
Canonical Server packageset reviewers Pending
Review via email: mp+379430@code.launchpad.net

Description of the change

This shows the changes for the php-defaults update for initiating the transition to php7.4.

This MP is just for review purposes. We haven't typically maintained php-defaults in git ubuntu, and since this is pulling from Debian's git repo, it's a bit different than our usual package merges.

Before this can land, php7.4 will need to finish migration, and be seeded into main. A spreadsheet with status of php dependencies is at:

https://docs.google.com/spreadsheets/d/11E6f6MTs0eTN-Nskap6iYT3l8QxTEuhYPlhy_z8Hd5s/edit#gid=1663657511

PPA for testing:

https://launchpad.net/~bryce/+archive/ubuntu/php7.4-transition

Bug report for tracking purposes is at:

https://bugs.launchpad.net/ubuntu/+source/php-defaults/+bug/1855020

To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

This has conflicts, and I also see a "~ppa1" in d/changelog

review: Needs Fixing
~bryce/ubuntu/+source/php-defaults:7.4-transition updated
5640be4... by Bryce Harrington

  * Transition supported PHP version to php7.3

93611a1... by Bryce Harrington

  * Revert default and supported PHP version to 7.2

507fda6... by Bryce Harrington

merge-changelogs

d69fb6e... by Bryce Harrington

reconstruct-changelog

c9eb96f... by Bryce Harrington

update-maintainer

a8a4c70... by Bryce Harrington

  * Drop support for PHP 7.3

0060cb7... by Bryce Harrington

changelog

Revision history for this message
Bryce Harrington (bryce) wrote :

Yeah, like I mentioned, this hasn't been maintained in git ubuntu previously, and is against Debian's upstream git repo. Thus the messy diff.

However, I think I might know how to make `git ubuntu merge` to work against arbitrary git repos like this. (Either it'll work and we can maintain php-defaults via git ubuntu, or it won't work and I'll have a devel task for git ubuntu.)

Revision history for this message
Bryce Harrington (bryce) wrote :

Not sure if this will update properly, but I've done a git ubuntu style merge using Debian's git repository as source.

Usual tags should be present, but please doublecheck.

I've also pushed the new package to the PPA as ~ppa2:
  https://launchpad.net/~bryce/+archive/ubuntu/php7.4-transition

Unmerged commits

0060cb7... by Bryce Harrington

changelog

a8a4c70... by Bryce Harrington

  * Drop support for PHP 7.3

c9eb96f... by Bryce Harrington

update-maintainer

d69fb6e... by Bryce Harrington

reconstruct-changelog

507fda6... by Bryce Harrington

merge-changelogs

5640be4... by Bryce Harrington

  * Transition supported PHP version to php7.3

93611a1... by Bryce Harrington

  * Revert default and supported PHP version to 7.2

5f1073c... by Ondřej Surý

Update changelog for 72 release

c3ef50b... by Ondřej Surý

Fix porting error that prevented PHP SAPIs to be restarted on upgrade

Thanks goes to Stefan Schlesinger, who debugged the issue and noticed the
apache2->php porting error where $rcd_action was tested, but never set,
thus effectively disabling dpkg-trigger.

67a973b... by Ondřej Surý

Update changelog for 71 release

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 5863509..9af1a83 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,33 @@
6+<<<<<<< debian/changelog
7+=======
8+php-defaults (72ubuntu1) focal; urgency=medium
9+
10+ * Transition to PHP 7.4
11+ - Drop previous Ubuntu migrations
12+ - Merge with Debian's git repository
13+ - Drop support for PHP 7.3
14+
15+ -- Bryce Harrington <bryce@canonical.com> Wed, 19 Feb 2020 19:41:22 +0000
16+
17+php-defaults (72) unstable; urgency=medium
18+
19+ * Fix porting error that prevented PHP SAPIs to be restarted on upgrade
20+
21+ -- Ondřej Surý <ondrej@debian.org> Wed, 22 Jan 2020 13:25:56 +0100
22+
23+php-defaults (71) unstable; urgency=medium
24+
25+ * Switch default PHP to 7.4
26+
27+ -- Ondřej Surý <ondrej@debian.org> Wed, 18 Dec 2019 15:06:21 +0100
28+
29+php-defaults (70) unstable; urgency=medium
30+
31+ * Start soft transition to PHP 7.4
32+
33+ -- Ondřej Surý <ondrej@sury.org> Wed, 14 Aug 2019 08:50:10 +0200
34+
35+>>>>>>> debian/changelog
36 php-defaults (69ubuntu2) eoan; urgency=medium
37
38 [ Bryce Harrington ]
39diff --git a/debian/control b/debian/control
40index a17eeae..1db1b00 100644
41--- a/debian/control
42+++ b/debian/control
43@@ -13,7 +13,11 @@ Vcs-Browser: https://salsa.debian.org/php-team/php-defaults
44
45 Package: libapache2-mod-php
46 Architecture: all
47+<<<<<<< debian/control
48 Depends: libapache2-mod-php7.3,
49+=======
50+Depends: libapache2-mod-php7.4,
51+>>>>>>> debian/control
52 ${misc:Depends}
53 Description: server-side, HTML-embedded scripting language (Apache 2 module) (default)
54 This package provides the PHP module for the Apache 2 webserver.
55@@ -23,11 +27,19 @@ Description: server-side, HTML-embedded scripting language (Apache 2 module) (de
56 for web development and can be embedded into HTML.
57 .
58 This package is a dependency package, which depends on latest stable
59+<<<<<<< debian/control
60 PHP version (currently 7.3).
61
62 Package: libphp-embed
63 Architecture: all
64 Depends: libphp7.3-embed,
65+=======
66+ PHP version (currently 7.4).
67+
68+Package: libphp-embed
69+Architecture: all
70+Depends: libphp7.4-embed,
71+>>>>>>> debian/control
72 ${misc:Depends}
73 Description: HTML-embedded scripting language (Embedded SAPI library) (default)
74 This package provides the library /usr/lib/libphp.so which can
75@@ -38,11 +50,19 @@ Description: HTML-embedded scripting language (Embedded SAPI library) (default)
76 for web development and can be embedded into HTML.
77 .
78 This package is a dependency package, which depends on latest stable
79+<<<<<<< debian/control
80 PHP version (currently 7.3).
81
82 Package: php
83 Architecture: all
84 Depends: php7.3,
85+=======
86+ PHP version (currently 7.4).
87+
88+Package: php
89+Architecture: all
90+Depends: php7.4,
91+>>>>>>> debian/control
92 ${misc:Depends}
93 Description: server-side, HTML-embedded scripting language (default)
94 PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used
95@@ -50,12 +70,21 @@ Description: server-side, HTML-embedded scripting language (default)
96 for web development and can be embedded into HTML.
97 .
98 This package is a dependency package, which depends on latest stable
99+<<<<<<< debian/control
100 PHP version (currently 7.3).
101
102 Package: php-all-dev
103 Architecture: all
104 Depends: php7.3-dev,
105 php7.3-json,
106+=======
107+ PHP version (currently 7.4).
108+
109+Package: php-all-dev
110+Architecture: all
111+Depends: php7.4-dev,
112+ php7.4-json,
113+>>>>>>> debian/control
114 ${misc:Depends}
115 Description: package depending on all supported PHP development packages
116 This package is a dependency package used as a build dependency for other
117@@ -65,7 +94,11 @@ Description: package depending on all supported PHP development packages
118 Package: php-bcmath
119 Architecture: all
120 Depends: php-common,
121+<<<<<<< debian/control
122 php7.3-bcmath,
123+=======
124+ php7.4-bcmath,
125+>>>>>>> debian/control
126 ${misc:Depends}
127 Description: Bcmath module for PHP [default]
128 This package provides a Bcmath module for PHP.
129@@ -75,12 +108,20 @@ Description: Bcmath module for PHP [default]
130 for web development and can be embedded into HTML.
131 .
132 This package is a dependency package, which depends on Debian's default
133+<<<<<<< debian/control
134 PHP version (currently 7.3).
135+=======
136+ PHP version (currently 7.4).
137+>>>>>>> debian/control
138
139 Package: php-bz2
140 Architecture: all
141 Depends: php-common,
142+<<<<<<< debian/control
143 php7.3-bz2,
144+=======
145+ php7.4-bz2,
146+>>>>>>> debian/control
147 ${misc:Depends}
148 Description: bzip2 module for PHP [default]
149 This package provides a bzip2 module for PHP.
150@@ -90,11 +131,19 @@ Description: bzip2 module for PHP [default]
151 for web development and can be embedded into HTML.
152 .
153 This package is a dependency package, which depends on Debian's default
154+<<<<<<< debian/control
155 PHP version (currently 7.3).
156
157 Package: php-cgi
158 Architecture: all
159 Depends: php7.3-cgi,
160+=======
161+ PHP version (currently 7.4).
162+
163+Package: php-cgi
164+Architecture: all
165+Depends: php7.4-cgi,
166+>>>>>>> debian/control
167 ${misc:Depends}
168 Description: server-side, HTML-embedded scripting language (CGI binary) (default)
169 This package provides the /usr/lib/cgi-bin/php CGI interpreter built
170@@ -107,11 +156,19 @@ Description: server-side, HTML-embedded scripting language (CGI binary) (default
171 for web development and can be embedded into HTML.
172 .
173 This package is a dependency package, which depends on latest stable
174+<<<<<<< debian/control
175 PHP version (currently 7.3).
176
177 Package: php-cli
178 Architecture: all
179 Depends: php7.3-cli,
180+=======
181+ PHP version (currently 7.4).
182+
183+Package: php-cli
184+Architecture: all
185+Depends: php7.4-cli,
186+>>>>>>> debian/control
187 ${misc:Depends}
188 Description: command-line interpreter for the PHP scripting language (default)
189 This package provides the /usr/bin/php command interpreter, useful for
190@@ -122,7 +179,11 @@ Description: command-line interpreter for the PHP scripting language (default)
191 for web development and can be embedded into HTML.
192 .
193 This package is a dependency package, which depends on latest stable
194+<<<<<<< debian/control
195 PHP version (currently 7.3).
196+=======
197+ PHP version (currently 7.4).
198+>>>>>>> debian/control
199
200 Package: php-common
201 Architecture: all
202@@ -165,7 +226,11 @@ Description: Common files for PHP packages
203 Package: php-curl
204 Architecture: all
205 Depends: php-common,
206+<<<<<<< debian/control
207 php7.3-curl,
208+=======
209+ php7.4-curl,
210+>>>>>>> debian/control
211 ${misc:Depends}
212 Description: CURL module for PHP [default]
213 This package provides a CURL module for PHP.
214@@ -175,11 +240,19 @@ Description: CURL module for PHP [default]
215 for web development and can be embedded into HTML.
216 .
217 This package is a dependency package, which depends on Debian's default
218+<<<<<<< debian/control
219 PHP version (currently 7.3).
220
221 Package: php-dev
222 Architecture: all
223 Depends: php7.3-dev,
224+=======
225+ PHP version (currently 7.4).
226+
227+Package: php-dev
228+Architecture: all
229+Depends: php7.4-dev,
230+>>>>>>> debian/control
231 ${misc:Depends}
232 Description: Files for PHP module development (default)
233 Headers and other PHP needed for compiling additional modules.
234@@ -189,12 +262,20 @@ Description: Files for PHP module development (default)
235 for web development and can be embedded into HTML.
236 .
237 This package is a dependency package, which depends on latest stable
238+<<<<<<< debian/control
239 PHP version (currently 7.3).
240+=======
241+ PHP version (currently 7.4).
242+>>>>>>> debian/control
243
244 Package: php-enchant
245 Architecture: all
246 Depends: php-common,
247+<<<<<<< debian/control
248 php7.3-enchant,
249+=======
250+ php7.4-enchant,
251+>>>>>>> debian/control
252 ${misc:Depends}
253 Description: Enchant module for PHP [default]
254 This package provides a Enchant module for PHP.
255@@ -204,11 +285,19 @@ Description: Enchant module for PHP [default]
256 for web development and can be embedded into HTML.
257 .
258 This package is a dependency package, which depends on Debian's default
259+<<<<<<< debian/control
260 PHP version (currently 7.3).
261
262 Package: php-fpm
263 Architecture: all
264 Depends: php7.3-fpm,
265+=======
266+ PHP version (currently 7.4).
267+
268+Package: php-fpm
269+Architecture: all
270+Depends: php7.4-fpm,
271+>>>>>>> debian/control
272 ${misc:Depends}
273 Description: server-side, HTML-embedded scripting language (FPM-CGI binary) (default)
274 This package provides the Fast Process Manager interpreter that runs
275@@ -219,12 +308,20 @@ Description: server-side, HTML-embedded scripting language (FPM-CGI binary) (def
276 for web development and can be embedded into HTML.
277 .
278 This package is a dependency package, which depends on latest stable
279+<<<<<<< debian/control
280 PHP version (currently 7.3).
281+=======
282+ PHP version (currently 7.4).
283+>>>>>>> debian/control
284
285 Package: php-gd
286 Architecture: all
287 Depends: php-common,
288+<<<<<<< debian/control
289 php7.3-gd,
290+=======
291+ php7.4-gd,
292+>>>>>>> debian/control
293 ${misc:Depends}
294 Description: GD module for PHP [default]
295 This package provides a GD module for PHP.
296@@ -234,12 +331,20 @@ Description: GD module for PHP [default]
297 for web development and can be embedded into HTML.
298 .
299 This package is a dependency package, which depends on Debian's default
300+<<<<<<< debian/control
301 PHP version (currently 7.3).
302+=======
303+ PHP version (currently 7.4).
304+>>>>>>> debian/control
305
306 Package: php-gmp
307 Architecture: all
308 Depends: php-common,
309+<<<<<<< debian/control
310 php7.3-gmp,
311+=======
312+ php7.4-gmp,
313+>>>>>>> debian/control
314 ${misc:Depends}
315 Description: GMP module for PHP [default]
316 This package provides a GMP module for PHP.
317@@ -249,12 +354,20 @@ Description: GMP module for PHP [default]
318 for web development and can be embedded into HTML.
319 .
320 This package is a dependency package, which depends on Debian's default
321+<<<<<<< debian/control
322 PHP version (currently 7.3).
323+=======
324+ PHP version (currently 7.4).
325+>>>>>>> debian/control
326
327 Package: php-imap
328 Architecture: all
329 Depends: php-common,
330+<<<<<<< debian/control
331 php7.3-imap,
332+=======
333+ php7.4-imap,
334+>>>>>>> debian/control
335 ${misc:Depends}
336 Description: IMAP module for PHP [default]
337 This package provides a IMAP module for PHP.
338@@ -264,12 +377,20 @@ Description: IMAP module for PHP [default]
339 for web development and can be embedded into HTML.
340 .
341 This package is a dependency package, which depends on Debian's default
342+<<<<<<< debian/control
343 PHP version (currently 7.3).
344+=======
345+ PHP version (currently 7.4).
346+>>>>>>> debian/control
347
348 Package: php-interbase
349 Architecture: all
350 Depends: php-common,
351+<<<<<<< debian/control
352 php7.3-interbase,
353+=======
354+ php7.4-interbase,
355+>>>>>>> debian/control
356 ${misc:Depends}
357 Description: Interbase module for PHP [default]
358 This package provides a Interbase module for PHP.
359@@ -279,12 +400,20 @@ Description: Interbase module for PHP [default]
360 for web development and can be embedded into HTML.
361 .
362 This package is a dependency package, which depends on Debian's default
363+<<<<<<< debian/control
364 PHP version (currently 7.3).
365+=======
366+ PHP version (currently 7.4).
367+>>>>>>> debian/control
368
369 Package: php-intl
370 Architecture: all
371 Depends: php-common,
372+<<<<<<< debian/control
373 php7.3-intl,
374+=======
375+ php7.4-intl,
376+>>>>>>> debian/control
377 ${misc:Depends}
378 Description: Internationalisation module for PHP [default]
379 This package provides a Internationalisation module for PHP.
380@@ -294,12 +423,20 @@ Description: Internationalisation module for PHP [default]
381 for web development and can be embedded into HTML.
382 .
383 This package is a dependency package, which depends on Debian's default
384+<<<<<<< debian/control
385 PHP version (currently 7.3).
386+=======
387+ PHP version (currently 7.4).
388+>>>>>>> debian/control
389
390 Package: php-json
391 Architecture: all
392 Depends: php-common,
393+<<<<<<< debian/control
394 php7.3-json,
395+=======
396+ php7.4-json,
397+>>>>>>> debian/control
398 ${misc:Depends}
399 Description: JSON module for PHP [default]
400 This package provides a JSON module for PHP.
401@@ -309,12 +446,20 @@ Description: JSON module for PHP [default]
402 for web development and can be embedded into HTML.
403 .
404 This package is a dependency package, which depends on Debian's default
405+<<<<<<< debian/control
406 PHP version (currently 7.3).
407+=======
408+ PHP version (currently 7.4).
409+>>>>>>> debian/control
410
411 Package: php-ldap
412 Architecture: all
413 Depends: php-common,
414+<<<<<<< debian/control
415 php7.3-ldap,
416+=======
417+ php7.4-ldap,
418+>>>>>>> debian/control
419 ${misc:Depends}
420 Description: LDAP module for PHP [default]
421 This package provides a LDAP module for PHP.
422@@ -324,12 +469,20 @@ Description: LDAP module for PHP [default]
423 for web development and can be embedded into HTML.
424 .
425 This package is a dependency package, which depends on Debian's default
426+<<<<<<< debian/control
427 PHP version (currently 7.3).
428+=======
429+ PHP version (currently 7.4).
430+>>>>>>> debian/control
431
432 Package: php-mbstring
433 Architecture: all
434 Depends: php-common,
435+<<<<<<< debian/control
436 php7.3-mbstring,
437+=======
438+ php7.4-mbstring,
439+>>>>>>> debian/control
440 ${misc:Depends}
441 Description: MBSTRING module for PHP [default]
442 This package provides a MBSTRING module for PHP.
443@@ -339,12 +492,20 @@ Description: MBSTRING module for PHP [default]
444 for web development and can be embedded into HTML.
445 .
446 This package is a dependency package, which depends on Debian's default
447+<<<<<<< debian/control
448 PHP version (currently 7.3).
449+=======
450+ PHP version (currently 7.4).
451+>>>>>>> debian/control
452
453 Package: php-mysql
454 Architecture: all
455 Depends: php-common,
456+<<<<<<< debian/control
457 php7.3-mysql,
458+=======
459+ php7.4-mysql,
460+>>>>>>> debian/control
461 ${misc:Depends}
462 Description: MySQL module for PHP [default]
463 This package provides a MySQL module for PHP.
464@@ -354,12 +515,20 @@ Description: MySQL module for PHP [default]
465 for web development and can be embedded into HTML.
466 .
467 This package is a dependency package, which depends on Debian's default
468+<<<<<<< debian/control
469 PHP version (currently 7.3).
470+=======
471+ PHP version (currently 7.4).
472+>>>>>>> debian/control
473
474 Package: php-odbc
475 Architecture: all
476 Depends: php-common,
477+<<<<<<< debian/control
478 php7.3-odbc,
479+=======
480+ php7.4-odbc,
481+>>>>>>> debian/control
482 ${misc:Depends}
483 Description: ODBC module for PHP [default]
484 This package provides a ODBC module for PHP.
485@@ -369,12 +538,20 @@ Description: ODBC module for PHP [default]
486 for web development and can be embedded into HTML.
487 .
488 This package is a dependency package, which depends on Debian's default
489+<<<<<<< debian/control
490 PHP version (currently 7.3).
491+=======
492+ PHP version (currently 7.4).
493+>>>>>>> debian/control
494
495 Package: php-pgsql
496 Architecture: all
497 Depends: php-common,
498+<<<<<<< debian/control
499 php7.3-pgsql,
500+=======
501+ php7.4-pgsql,
502+>>>>>>> debian/control
503 ${misc:Depends}
504 Description: PostgreSQL module for PHP [default]
505 This package provides a PostgreSQL module for PHP.
506@@ -384,11 +561,19 @@ Description: PostgreSQL module for PHP [default]
507 for web development and can be embedded into HTML.
508 .
509 This package is a dependency package, which depends on Debian's default
510+<<<<<<< debian/control
511 PHP version (currently 7.3).
512
513 Package: php-phpdbg
514 Architecture: all
515 Depends: php7.3-phpdbg,
516+=======
517+ PHP version (currently 7.4).
518+
519+Package: php-phpdbg
520+Architecture: all
521+Depends: php7.4-phpdbg,
522+>>>>>>> debian/control
523 ${misc:Depends}
524 Description: server-side, HTML-embedded scripting language (PHPDBG binary) (default)
525 This package provides the /usr/bin/phpdbg command interpreter, useful for
526@@ -399,12 +584,20 @@ Description: server-side, HTML-embedded scripting language (PHPDBG binary) (defa
527 for web development and can be embedded into HTML.
528 .
529 This package is a dependency package, which depends on latest stable
530+<<<<<<< debian/control
531 PHP version (currently 7.3).
532+=======
533+ PHP version (currently 7.4).
534+>>>>>>> debian/control
535
536 Package: php-pspell
537 Architecture: all
538 Depends: php-common,
539+<<<<<<< debian/control
540 php7.3-pspell,
541+=======
542+ php7.4-pspell,
543+>>>>>>> debian/control
544 ${misc:Depends}
545 Description: pspell module for PHP [default]
546 This package provides a pspell module for PHP.
547@@ -414,12 +607,20 @@ Description: pspell module for PHP [default]
548 for web development and can be embedded into HTML.
549 .
550 This package is a dependency package, which depends on Debian's default
551+<<<<<<< debian/control
552 PHP version (currently 7.3).
553+=======
554+ PHP version (currently 7.4).
555+>>>>>>> debian/control
556
557 Package: php-readline
558 Architecture: all
559 Depends: php-common,
560+<<<<<<< debian/control
561 php7.3-readline,
562+=======
563+ php7.4-readline,
564+>>>>>>> debian/control
565 ${misc:Depends}
566 Description: readline module for PHP [default]
567 This package provides a readline module for PHP.
568@@ -429,12 +630,20 @@ Description: readline module for PHP [default]
569 for web development and can be embedded into HTML.
570 .
571 This package is a dependency package, which depends on Debian's default
572+<<<<<<< debian/control
573 PHP version (currently 7.3).
574+=======
575+ PHP version (currently 7.4).
576+>>>>>>> debian/control
577
578 Package: php-recode
579 Architecture: all
580 Depends: php-common,
581+<<<<<<< debian/control
582 php7.3-recode,
583+=======
584+ php7.4-recode,
585+>>>>>>> debian/control
586 ${misc:Depends}
587 Description: recode module for PHP [default]
588 This package provides a recode module for PHP.
589@@ -444,12 +653,20 @@ Description: recode module for PHP [default]
590 for web development and can be embedded into HTML.
591 .
592 This package is a dependency package, which depends on Debian's default
593+<<<<<<< debian/control
594 PHP version (currently 7.3).
595+=======
596+ PHP version (currently 7.4).
597+>>>>>>> debian/control
598
599 Package: php-snmp
600 Architecture: all
601 Depends: php-common,
602+<<<<<<< debian/control
603 php7.3-snmp,
604+=======
605+ php7.4-snmp,
606+>>>>>>> debian/control
607 ${misc:Depends}
608 Description: SNMP module for PHP [default]
609 This package provides a SNMP module for PHP.
610@@ -459,12 +676,20 @@ Description: SNMP module for PHP [default]
611 for web development and can be embedded into HTML.
612 .
613 This package is a dependency package, which depends on Debian's default
614+<<<<<<< debian/control
615 PHP version (currently 7.3).
616+=======
617+ PHP version (currently 7.4).
618+>>>>>>> debian/control
619
620 Package: php-soap
621 Architecture: all
622 Depends: php-common,
623+<<<<<<< debian/control
624 php7.3-soap,
625+=======
626+ php7.4-soap,
627+>>>>>>> debian/control
628 ${misc:Depends}
629 Description: SOAP module for PHP [default]
630 This package provides a SOAP module for PHP.
631@@ -474,12 +699,20 @@ Description: SOAP module for PHP [default]
632 for web development and can be embedded into HTML.
633 .
634 This package is a dependency package, which depends on Debian's default
635+<<<<<<< debian/control
636 PHP version (currently 7.3).
637+=======
638+ PHP version (currently 7.4).
639+>>>>>>> debian/control
640
641 Package: php-sqlite3
642 Architecture: all
643 Depends: php-common,
644+<<<<<<< debian/control
645 php7.3-sqlite3,
646+=======
647+ php7.4-sqlite3,
648+>>>>>>> debian/control
649 ${misc:Depends}
650 Description: SQLite3 module for PHP [default]
651 This package provides a SQLite3 module for PHP.
652@@ -489,12 +722,20 @@ Description: SQLite3 module for PHP [default]
653 for web development and can be embedded into HTML.
654 .
655 This package is a dependency package, which depends on Debian's default
656+<<<<<<< debian/control
657 PHP version (currently 7.3).
658+=======
659+ PHP version (currently 7.4).
660+>>>>>>> debian/control
661
662 Package: php-sybase
663 Architecture: all
664 Depends: php-common,
665+<<<<<<< debian/control
666 php7.3-sybase,
667+=======
668+ php7.4-sybase,
669+>>>>>>> debian/control
670 ${misc:Depends}
671 Description: Sybase module for PHP [default]
672 This package provides a Sybase module for PHP.
673@@ -504,12 +745,20 @@ Description: Sybase module for PHP [default]
674 for web development and can be embedded into HTML.
675 .
676 This package is a dependency package, which depends on Debian's default
677+<<<<<<< debian/control
678 PHP version (currently 7.3).
679+=======
680+ PHP version (currently 7.4).
681+>>>>>>> debian/control
682
683 Package: php-tidy
684 Architecture: all
685 Depends: php-common,
686+<<<<<<< debian/control
687 php7.3-tidy,
688+=======
689+ php7.4-tidy,
690+>>>>>>> debian/control
691 ${misc:Depends}
692 Description: tidy module for PHP [default]
693 This package provides a tidy module for PHP.
694@@ -519,12 +768,20 @@ Description: tidy module for PHP [default]
695 for web development and can be embedded into HTML.
696 .
697 This package is a dependency package, which depends on Debian's default
698+<<<<<<< debian/control
699 PHP version (currently 7.3).
700+=======
701+ PHP version (currently 7.4).
702+>>>>>>> debian/control
703
704 Package: php-xml
705 Architecture: all
706 Depends: php-common,
707+<<<<<<< debian/control
708 php7.3-xml,
709+=======
710+ php7.4-xml,
711+>>>>>>> debian/control
712 ${misc:Depends}
713 Description: DOM, SimpleXML, WDDX, XML, and XSL module for PHP [default]
714 This package provides a DOM, SimpleXML, WDDX, XML, and XSL module for PHP.
715@@ -534,12 +791,20 @@ Description: DOM, SimpleXML, WDDX, XML, and XSL module for PHP [default]
716 for web development and can be embedded into HTML.
717 .
718 This package is a dependency package, which depends on Debian's default
719+<<<<<<< debian/control
720 PHP version (currently 7.3).
721+=======
722+ PHP version (currently 7.4).
723+>>>>>>> debian/control
724
725 Package: php-xmlrpc
726 Architecture: all
727 Depends: php-common,
728+<<<<<<< debian/control
729 php7.3-xmlrpc,
730+=======
731+ php7.4-xmlrpc,
732+>>>>>>> debian/control
733 ${misc:Depends}
734 Description: XMLRPC-EPI module for PHP [default]
735 This package provides a XMLRPC-EPI module for PHP.
736@@ -549,12 +814,20 @@ Description: XMLRPC-EPI module for PHP [default]
737 for web development and can be embedded into HTML.
738 .
739 This package is a dependency package, which depends on Debian's default
740+<<<<<<< debian/control
741 PHP version (currently 7.3).
742+=======
743+ PHP version (currently 7.4).
744+>>>>>>> debian/control
745
746 Package: php-zip
747 Architecture: all
748 Depends: php-common,
749+<<<<<<< debian/control
750 php7.3-zip,
751+=======
752+ php7.4-zip,
753+>>>>>>> debian/control
754 ${misc:Depends}
755 Description: Zip module for PHP [default]
756 This package provides a Zip module for PHP.
757@@ -564,4 +837,8 @@ Description: Zip module for PHP [default]
758 for web development and can be embedded into HTML.
759 .
760 This package is a dependency package, which depends on Debian's default
761+<<<<<<< debian/control
762 PHP version (currently 7.3).
763+=======
764+ PHP version (currently 7.4).
765+>>>>>>> debian/control
766diff --git a/debian/rules b/debian/rules
767index b589119..976edbf 100755
768--- a/debian/rules
769+++ b/debian/rules
770@@ -9,8 +9,13 @@
771
772 include /usr/share/dpkg/default.mk
773
774+<<<<<<< debian/rules
775 PHP_DEFAULT_VERSION := 7.3
776 PHP_SUPPORTED_VERSIONS := 7.3
777+=======
778+PHP_DEFAULT_VERSION := 7.4
779+PHP_SUPPORTED_VERSIONS := 7.4
780+>>>>>>> debian/rules
781
782 , := ,
783 PHP_DEV_PACKAGES := $(addprefix php,$(addsuffix -dev$(,),$(PHP_SUPPORTED_VERSIONS))), $(addprefix php,$(addsuffix -json$(,),$(PHP_SUPPORTED_VERSIONS)))
784diff --git a/php-maintscript-helper b/php-maintscript-helper
785index 84818a7..25e61c6 100644
786--- a/php-maintscript-helper
787+++ b/php-maintscript-helper
788@@ -37,11 +37,14 @@
789 # will be defined by php-maintscript-helper
790 # to avoid inclusion loops. Do not set this
791 # variable manually
792+<<<<<<< php-maintscript-helper
793 # * PHP_NEED_ACTION:
794 # will be defined if a function call wants to
795 # override the behavior of php_needs_action.
796 # Do not rely on this variable. It is considered
797 # an implementation detail.
798+=======
799+>>>>>>> php-maintscript-helper
800 # * PHP_MAINTSCRIPT_NAME
801 # * PHP_MAINTSCRIPT_PACKAGE
802 # * PHP_MAINTSCRIPT_METHOD
803@@ -102,7 +105,11 @@ else
804 fi
805
806 case "$PHP_MAINTSCRIPT_METHOD" in
807+<<<<<<< php-maintscript-helper
808 install|upgrade|abort-upgrade|configure|abort-remove|abort-remove|abort-deconfigure|remove|failed-upgrade|purge|disappear|abort-install)
809+=======
810+ install|upgrade|abort-upgrade|configure|abort-remove|abort-deconfigure|remove|failed-upgrade|purge|disappear|abort-install)
811+>>>>>>> php-maintscript-helper
812 # yay - recognized script
813 ;;
814 *)
815@@ -141,9 +148,15 @@ fi
816 # this function always returns 0
817 # Since: 5.5.0+dfsg-7
818 php_msg()
819+<<<<<<< php-maintscript-helper
820 {
821 local PRIORITY="$1"
822 local MSG="$2"
823+=======
824+(
825+ PRIORITY="$1"
826+ MSG="$2"
827+>>>>>>> php-maintscript-helper
828 case "$PRIORITY" in
829 debug|info|notice|warning|err|crit|alert|emerg)
830 ;;
831@@ -151,11 +164,21 @@ php_msg()
832 PRIORITY="warning"
833 ;;
834 esac
835+<<<<<<< php-maintscript-helper
836 [ -z "$PHP_MAINTSCRIPT_HELPER_QUIET" ] && ( [ -n "${PHP_MAINTSCRIPT_DEBUG:-}" ] || [ "$PRIORITY" != "debug" ] ) && echo "$MSG" >&2
837 [ -x /usr/bin/logger ] || return 0
838 local LOGGER="/usr/bin/logger -p daemon.$PRIORITY -t $PHP_MAINTSCRIPT_PACKAGE "
839 $LOGGER "$MSG" || return 0
840 }
841+=======
842+ if [ -n "${PHP_MAINTSCRIPT_DEBUG:-}" ] || [ "$PRIORITY" != "debug" ]; then
843+ [ -z "$PHP_MAINTSCRIPT_HELPER_QUIET" ] && echo "$MSG" >&2
844+ fi
845+ [ -x /usr/bin/logger ] || return 0
846+ LOGGER="/usr/bin/logger -p daemon.$PRIORITY -t $PHP_MAINTSCRIPT_PACKAGE "
847+ $LOGGER "$MSG" || return 0
848+)
849+>>>>>>> php-maintscript-helper
850
851 #
852 # Function php_invoke
853@@ -181,6 +204,7 @@ php_msg()
854 # 1 otherwise
855 # Since: 5.5.0+dsfg-7
856 php_invoke()
857+<<<<<<< php-maintscript-helper
858 {
859 local CMD=$1
860 local VERSION=$2
861@@ -191,11 +215,20 @@ php_invoke()
862 local rcd_action=""
863 local rcd_scripts=""
864 local sapi_list=""
865+=======
866+(
867+ CMD=$1
868+ VERSION=$2
869+ SAPI=$3
870+ MOD=$4
871+ sapi_list=""
872+>>>>>>> php-maintscript-helper
873
874 [ -x "/usr/sbin/php$CMD" ] || return 1
875 [ -x "/usr/sbin/phpquery" ] || return 1
876
877 case "$VERSION" in
878+<<<<<<< php-maintscript-helper
879 ALL)
880 version_list=$(phpquery -V)
881 ;;
882@@ -216,6 +249,27 @@ php_invoke()
883 case "$CMD" in
884 enmod|dismod)
885 php$CMD -q -v "$version" -m -r "$MOD" || return 1
886+=======
887+ ALL)
888+ version_list=$(phpquery -V)
889+ ;;
890+ *)
891+ version_list="$VERSION"
892+ # FIXME - check if the version is supported
893+ ;;
894+ esac
895+
896+ for version in $version_list; do
897+ case "$SAPI" in
898+ apache2|apache2filter|fpm|cli|cgi|embed|phpdbg)
899+ sapi_list="$SAPI"
900+ ;;
901+ ALL)
902+ sapi_list=$(phpquery -S -v "$version")
903+ case "$CMD" in
904+ enmod|dismod)
905+ "php$CMD" -q -v "$version" -m -r "$MOD" || return 1
906+>>>>>>> php-maintscript-helper
907 ;;
908 *)
909 return 1
910@@ -230,11 +284,19 @@ php_invoke()
911 for sapi in $sapi_list; do
912 case "$CMD" in
913 enmod)
914+<<<<<<< php-maintscript-helper
915 local phpquery_ret=0
916 phpquery -v "$version" -s "$sapi" -m "$MOD" > /dev/null 2>&1 || phpquery_ret=$?
917 if [ "$phpquery_ret" -eq 0 ] ; then
918 # configuration is already enabled
919 php$CMD -m -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 || return 1
920+=======
921+ phpquery_ret=0
922+ phpquery -v "$version" -s "$sapi" -m "$MOD" > /dev/null 2>&1 || phpquery_ret=$?
923+ if [ "$phpquery_ret" -eq 0 ] ; then
924+ # configuration is already enabled
925+ "php$CMD" -m -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 || return 1
926+>>>>>>> php-maintscript-helper
927 php_msg "debug" "php_invoke $MOD: already enabled for PHP $version $sapi sapi"
928 PHP_NEED_ACTION=1
929 elif [ "$phpquery_ret" -eq 32 ] ; then
930@@ -246,21 +308,37 @@ php_invoke()
931 # a) we have no clue about the module (e.g. for upgrades prior to maintscript-helper
932 # b) it's a fresh install
933 PHP_NEED_ACTION=1
934+<<<<<<< php-maintscript-helper
935 php$CMD -m -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 || return 1
936+=======
937+ "php$CMD" -m -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 || return 1
938+>>>>>>> php-maintscript-helper
939 php_msg "debug" "php_invoke: Enabled module $MOD for $sapi sapi"
940 fi
941 ;;
942 dismod)
943+<<<<<<< php-maintscript-helper
944 local phpquery_ret=0
945 phpquery -v "$version" -s "$sapi" -m "$MOD" > /dev/null 2>&1 || phpquery_ret=$?
946 if [ "$phpquery_ret" -eq 0 ] ; then
947 if [ "$PHP_MAINTSCRIPT_NAME" = 'postrm' ] && [ "$PHP_MAINTSCRIPT_METHOD" = "purge" ] ; then
948 php$CMD -p -f -v "$version" -s "$sapi" -q "$MOD" || return 1
949+=======
950+ phpquery_ret=0
951+ phpquery -v "$version" -s "$sapi" -m "$MOD" > /dev/null 2>&1 || phpquery_ret=$?
952+ if [ "$phpquery_ret" -eq 0 ] ; then
953+ if [ "$PHP_MAINTSCRIPT_NAME" = 'postrm' ] && [ "$PHP_MAINTSCRIPT_METHOD" = "purge" ] ; then
954+ "php$CMD" -p -f -v "$version" -s "$sapi" -q "$MOD" || return 1
955+>>>>>>> php-maintscript-helper
956 php_msg "debug" "php_invoke $PHP_MAINTSCRIPT_NAME: Purging module $MOD for PHP $version $sapi sapi"
957 PHP_NEED_ACTION=1
958 elif [ "$PHP_MAINTSCRIPT_NAME" = 'postrm' ] || [ "$PHP_MAINTSCRIPT_NAME" = 'prerm' ] || [ "$PHP_MAINTSCRIPT_NAME" = 'preinst' ] ; then
959 if [ "$PHP_MAINTSCRIPT_METHOD" = "remove" ] || [ "$PHP_MAINTSCRIPT_METHOD" = "upgrade" ] ; then
960+<<<<<<< php-maintscript-helper
961 php$CMD -m -f -v "$version" -s "$sapi" -q "$MOD" || return 1
962+=======
963+ "php$CMD" -m -f -v "$version" -s "$sapi" -q "$MOD" || return 1
964+>>>>>>> php-maintscript-helper
965 php_msg "debug" "php_invoke $PHP_MAINTSCRIPT_NAME: Disabled module $MOD for PHP $version $sapi sapi"
966 PHP_NEED_ACTION=1
967 fi
968@@ -272,7 +350,11 @@ php_invoke()
969 if [ "$PHP_MAINTSCRIPT_NAME" = 'postrm' ] && [ "$PHP_MAINTSCRIPT_METHOD" = "purge" ] ; then
970 php_msg "debug" "php_invoke $PHP_MAINTSCRIPT_NAME: Purging state for $MOD for PHP $version $sapi sapi"
971 # this will return RC=1
972+<<<<<<< php-maintscript-helper
973 ( php$CMD -p -f -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 )
974+=======
975+ ( "php$CMD" -p -f -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 )
976+>>>>>>> php-maintscript-helper
977 else
978 php_msg "debug" "php_invoke $MOD $PHP_MAINTSCRIPT_NAME: No action required for PHP $version $sapi sapi"
979 fi
980@@ -284,11 +366,20 @@ php_invoke()
981 return 1
982 ;;
983 esac
984+<<<<<<< php-maintscript-helper
985 if [ -n "${PHP_NEED_ACTION:-}" -a -n "$rcd_action" ]; then
986 dpkg-trigger /etc/php/$version/$sapi/conf.d
987 fi
988 done
989 done
990 }
991+=======
992+ if [ -n "${PHP_NEED_ACTION:-}" ]; then
993+ dpkg-trigger "/etc/php/$version/$sapi/conf.d"
994+ fi
995+ done
996+ done
997+)
998+>>>>>>> php-maintscript-helper
999
1000 # vim: syntax=sh sw=8 sts=8 sr noet

Subscribers

People subscribed via source and target branches