Skip to content

Commit

Permalink
merge dev
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolaasuni committed Jan 2, 2020
2 parents 466a73b + f8ef3b8 commit a94f009
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -33,6 +33,7 @@ addons:
apt:
packages:
- devscripts
- fakeroot
- debhelper
- pkg-config
- alien
Expand Down
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
1.2.10
1.2.11
6 changes: 3 additions & 3 deletions composer.json
Expand Up @@ -23,9 +23,9 @@
"php": ">=5.4",
"ext-gd": "*",
"ext-zlib": "*",
"tecnickcom/tc-lib-file": "^1.6.13",
"tecnickcom/tc-lib-color": "^1.12.14",
"tecnickcom/tc-lib-pdf-encrypt": "^1.5.9"
"tecnickcom/tc-lib-file": "^1.6.14",
"tecnickcom/tc-lib-color": "^1.12.15",
"tecnickcom/tc-lib-pdf-encrypt": "^1.5.10"
},
"require-dev": {
"apigen/apigen": "^4.1.2",
Expand Down
2 changes: 1 addition & 1 deletion resources/debian/control
Expand Up @@ -10,6 +10,6 @@ Vcs-Git: https://github.com/~#VENDOR#~/~#PROJECT#~.git
Package: ~#PKGNAME#~
Provides: php-~#PROJECT#~
Architecture: all
Depends: php (>= 5.4.0), php-gd, php-zip, php-tecnickcom-tc-lib-file (<< 2.0.0), php-tecnickcom-tc-lib-file (>= 1.6.12), php-tecnickcom-tc-lib-color (<< 2.0.0), php-tecnickcom-tc-lib-color (>= 1.12.13), php-tecnickcom-tc-lib-pdf-encrypt (<< 2.0.0), php-tecnickcom-tc-lib-pdf-encrypt (>= 1.5.8), ${misc:Depends}
Depends: php (>= 5.4.0), php-gd, php-zip, php-tecnickcom-tc-lib-file (<< 2.0.0), php-tecnickcom-tc-lib-file (>= 1.6.14), php-tecnickcom-tc-lib-color (<< 2.0.0), php-tecnickcom-tc-lib-color (>= 1.12.15), php-tecnickcom-tc-lib-pdf-encrypt (<< 2.0.0), php-tecnickcom-tc-lib-pdf-encrypt (>= 1.5.10), ${misc:Depends}
Description: PHP PDF Image Library
PHP library containing PDF Image methods.
6 changes: 3 additions & 3 deletions resources/rpm/rpm.spec
Expand Up @@ -20,11 +20,11 @@ Requires: php(language) >= 5.4.0
Requires: php-gd
Requires: php-zlib
Requires: php-composer(%{c_vendor}/tc-lib-file) < 2.0.0
Requires: php-composer(%{c_vendor}/tc-lib-file) >= 1.6.12
Requires: php-composer(%{c_vendor}/tc-lib-file) >= 1.6.14
Requires: php-composer(%{c_vendor}/tc-lib-color) < 2.0.0
Requires: php-composer(%{c_vendor}/tc-lib-color) >= 1.12.13
Requires: php-composer(%{c_vendor}/tc-lib-color) >= 1.12.15
Requires: php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 2.0.0
Requires: php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.5.8
Requires: php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.5.10

Provides: php-composer(%{c_vendor}/%{gh_project}) = %{version}
Provides: php-%{gh_project} = %{version}
Expand Down

0 comments on commit a94f009

Please sign in to comment.