Update package for bookworm.

The package now installs and enables the module using the recommended
procedure for PHP in Debian bookworm. The installations paths are
determined by using the php-config util. Further alterations to the
packageing should may therefore only be required if the package is
effected by changes in external dependencies. The package has been
renamed to php-itkacl (from php7-itkacl) to reflect this.

diff --git a/php7-itkacl-2.0/debian/changelog b/php7-itkacl-2.0/debian/changelog
index 4dbb7c2b130615c9f1c7b6c549a4d5e396ffe2e9..dc020b385d751d7e669142ab260d4e467eb7b7bb 100644 (file)
--- a/php7-itkacl-2.0/debian/changelog
+++ b/php7-itkacl-2.0/debian/changelog
@@ -1,3 +1,9 @@
+php-itkacl (2.1.1) unstable; urgency=medium
+
+  * Port to PHP 8.
+
+ -- Sebastian Bugge <vsbugge@samfundet.no>  Thu, 06 Jun 2024 17:10:24 +0200
+
 php7-itkacl (2.1) unstable; urgency=medium
 
   * Port to PHP 7.

diff --git a/php7-itkacl-2.0/debian/compat b/php7-itkacl-2.0/debian/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 100644 (file)
--- a/php7-itkacl-2.0/debian/compat
+++ b/php7-itkacl-2.0/debian/compat
@@ -1 +1 @@
-7
+10

diff --git a/php7-itkacl-2.0/debian/control b/php7-itkacl-2.0/debian/control
index b7ce5e8e91416edf04a76a75fa2d739b53b93bc6..ac983b04b4c4cf28d572a9262ce7a9c4a0f48c1e 100644 (file)
--- a/php7-itkacl-2.0/debian/control
+++ b/php7-itkacl-2.0/debian/control
@@ -1,13 +1,13 @@
-Source: php7-itkacl
+Source: php-itkacl
 Priority: extra
 Maintainer: Steinar H. Gunderson <sesse@samfundet.no>
-Build-Depends: debhelper (>= 7.0.50~), libitkacl-dev, php7.3-dev
+Build-Depends: debhelper (>= 13.3.4~), libitkacl-dev, php-dev
 Standards-Version: 3.9.1
 Section: php
 
-Package: php7-itkacl
+Package: php-itkacl
 Section: php
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, libitkacl2
 Description: PHP bindings for ITKACL
  PHP module to interface to ITKACL.

diff --git a/php7-itkacl-2.0/debian/php7-itkacl.dirs b/php7-itkacl-2.0/debian/php7-itkacl.dirs
deleted file mode 100644 (file)
index db7d8a6..0000000
--- a/php7-itkacl-2.0/debian/php7-itkacl.dirs
+++ /dev/null
@@ -1 +0,0 @@
-etc/php7/conf.d

diff --git a/php7-itkacl-2.0/debian/postinst b/php7-itkacl-2.0/debian/postinst
new file mode 100644 (file)
index 0000000..ea21354
--- /dev/null
+++ b/php7-itkacl-2.0/debian/postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+phpenmod itkacl

diff --git a/php7-itkacl-2.0/debian/prerm b/php7-itkacl-2.0/debian/prerm
new file mode 100644 (file)
index 0000000..f2100e5
--- /dev/null
+++ b/php7-itkacl-2.0/debian/prerm
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+phpdismod itkacl

diff --git a/php7-itkacl-2.0/debian/rules b/php7-itkacl-2.0/debian/rules
index 84044520664cfeb98a1fa8b00e91aa842d047dc0..15673709f21e841fae923de9bea57e6f3093ebbb 100755 (executable)
--- a/php7-itkacl-2.0/debian/rules
+++ b/php7-itkacl-2.0/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+MODS_AVAILBALE=$(shell php-config --ini-path)/../mods-available
+DESTDIR=debian/php-itkacl
+
 clean:
        dh_testdir
        dh_clean
@@ -8,7 +11,7 @@ clean:
 
 build:
        dh_testdir
-       $(MAKE) 
+       $(MAKE)
 
 binary-indep:
 
@@ -16,8 +19,8 @@ binary-arch:
        dh_testroot
        dh_prep
        dh_installdirs
-       $(MAKE) install DESTDIR=debian/php7-itkacl
-       install -m 0644 -o root -g root debian/itkacl.ini debian/php7-itkacl/etc/php7/conf.d/
+       $(MAKE) install DESTDIR=$(DESTDIR)
+       install -D -m 644 -o root -g root debian/itkacl.ini $(DESTDIR)$(MODS_AVAILBALE)/itkacl.ini
        dh_installdocs
        dh_installchangelogs
        dh_compress
@@ -25,7 +28,7 @@ binary-arch:
        dh_strip
        dh_makeshlibs
        dh_shlibdeps
-       echo "php:Depends=phpapi-$(shell php-config --phpapi)" >> debian/php7-itkacl.substvars
+       echo "php:Depends=phpapi-$(shell php-config --phpapi)" >> debian/php-itkacl.substvars
        dh_installdeb
        dh_gencontrol
        dh_md5sums