diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-03-11 18:35:08 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-03-11 18:35:38 +0100 |
| commit | 22ca7815b1f28d8a118da352a43e123ab4f386d9 (patch) | |
| tree | 36abf20d140dd33b92890d78e77ca803d1efad8e /ubuntu/maverick | |
| parent | fd9a4f909c4b8f5737fcd951d0cdb841a2d6f931 (diff) | |
| download | tde-packaging-22ca7815b1f28d8a118da352a43e123ab4f386d9.tar.gz tde-packaging-22ca7815b1f28d8a118da352a43e123ab4f386d9.zip | |
Fix regeneration of automake build system for libart-lgpl on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 42678713f1aa241ec6fc7e9ea059a746eee871a8)
Diffstat (limited to 'ubuntu/maverick')
3 files changed, 13 insertions, 5 deletions
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/control b/ubuntu/maverick/dependencies/libart-lgpl/debian/control index 2de98fddf..ef2b55918 100644 --- a/ubuntu/maverick/dependencies/libart-lgpl/debian/control +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 5), quilt, gnome-pkg-tools (>= 0.7), cdbs, dpkg-dev (>= 1.13.19), - automake, autoconf, libtool, libltdl-dev + automake, libtool, libltdl-dev Package: libart-2.0-2 Architecture: any diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in b/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in index e0b3f3a97..168168b28 100644 --- a/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in @@ -8,12 +8,14 @@ Build-Depends: debhelper (>= 5), quilt, gnome-pkg-tools (>= 0.7), cdbs, dpkg-dev (>= 1.13.19), - autotools-dev + automake, libtool, libltdl-dev Package: libart-2.0-2 Architecture: any Multi-Arch: same Section: libs +Replaces: libart-2.0-2 (<< 4:14.0.0~) +Breaks: libart-2.0-2 (<< 4:14.0.0~) Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} @@ -27,6 +29,8 @@ Description: Library of functions for 2D graphics - runtime files Package: libart-2.0-dev Architecture: any Section: libdevel +Replaces: libart-2.0-dev (<< 4:14.0.0~) +Breaks: libart-2.0-dev (<< 4:14.0.0~) Depends: ${misc:Depends}, ${shlibs:Depends}, libart-2.0-2 (= ${binary:Version}), diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/rules b/ubuntu/maverick/dependencies/libart-lgpl/debian/rules index ddd81783d..3ae4eb42c 100755 --- a/ubuntu/maverick/dependencies/libart-lgpl/debian/rules +++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/rules @@ -8,11 +8,15 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk -makebuilddir/kvpnc-trinity:: +debian/stamp-autoreconf: + dh_testdir cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh - autoconf - automake + autoreconf -vi && \ + touch $@ + +makebuilddir:: debian/stamp-autoreconf + dh_testdir libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control) |