Hi, On Sun, Mar 08, 2015 at 12:28:52PM -0400, David Prévot wrote: > Package: php-tcpdf > Version: 6.0.093+dfsg-1
> Please, find attached a simple patch to build and provide an > autoload.php file to ease class loading. Looks like I forgot the attachment, sorry about it, here it is. > Please, also consider using phpcomposer (from pkg-php-tools) in order to > at least provide the currently missing dependency on PHP The second patch addresses this. The binary debdiff, with those patches integrated, is just: Files in second .deb but not in first ------------------------------------- -rw-r--r-- root/root /usr/share/php/tcpdf/autoload.php Control files: lines which differ (wdiff format) ------------------------------------------------ {+Depends: php5-common (>= 5.3.0)+} Installed-Size: [-19663-] {+19664+} Regards David
From de7505de41fd0abdf6bc76413f8b4028ee8f64e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= <da...@tilapin.org> Date: Sun, 8 Mar 2015 12:05:43 -0400 Subject: [PATCH 1/2] Provide homemade autoload.php Work around the lack of proper autoload.php from Composer. --- debian/clean | 1 + debian/control | 2 +- debian/rules | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 debian/clean diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..6ee0b29 --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +autoload.php diff --git a/debian/control b/debian/control index 915f657..8f15041 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: tcpdf Priority: optional Maintainer: Laurent Destailleur (eldy) <e...@users.sourceforge.net> Uploaders: Raphaël Hertzog <hert...@debian.org> -Build-Depends: debhelper (>= 9) +Build-Depends: debhelper (>= 9), phpab Standards-Version: 3.9.6 Section: php Homepage: http://www.tcpdf.org/ diff --git a/debian/rules b/debian/rules index 3807a6d..e9c371b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,13 @@ %: dh $@ +override_dh_auto_build: + phpab \ + --blacklist mc_tcpdf \ + --blacklist mypdf \ + --blacklist toc_tcpdf \ + --output autoload.php . + override_dh_compress: dh_compress -X/examples/ -- 2.1.4
From 6df7296871bb17b96bc9a028e35917bdce3c74c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= <da...@tilapin.org> Date: Wed, 1 Apr 2015 14:40:46 -0400 Subject: [PATCH 2/2] Use pkg-php-tools for packaging --- debian/control | 11 +++++++---- debian/rules | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 8f15041..9ad3111 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: tcpdf Priority: optional Maintainer: Laurent Destailleur (eldy) <e...@users.sourceforge.net> Uploaders: Raphaël Hertzog <hert...@debian.org> -Build-Depends: debhelper (>= 9), phpab +Build-Depends: debhelper (>= 9), phpab, pkg-php-tools (>= 1.7~) Standards-Version: 3.9.6 Section: php Homepage: http://www.tcpdf.org/ @@ -11,9 +11,12 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/tcpdf.git Package: php-tcpdf Architecture: all -Depends: ${misc:Depends} -Recommends: php5-gd, php5-mcrypt -Suggests: php5-imagick +Depends: ${misc:Depends}, ${phpcomposer:Debian-require} +Recommends: php5-gd, php5-mcrypt, ${phpcomposer:Debian-recommend} +Suggests: php5-imagick, ${phpcomposer:Debian-suggest} +Replaces: ${phpcomposer:Debian-replace} +Breaks: ${phpcomposer:Debian-conflict}, ${phpcomposer:Debian-replace} +Provides: ${phpcomposer:Debian-provide} Description: PHP class for generating PDF files on-the-fly TCPDF is a library to generate PDF files that does not require external extensions. It also includes a class to extract data from existing PDF diff --git a/debian/rules b/debian/rules index e9c371b..e75bbed 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ --with phpcomposer override_dh_auto_build: phpab \ -- 2.1.4
signature.asc
Description: Digital signature