summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-03-11 18:35:08 +0100
committerSlávek Banko <slavek.banko@axis.cz>2015-03-11 18:35:08 +0100
commit42678713f1aa241ec6fc7e9ea059a746eee871a8 (patch)
tree97abae4efe9165435065e33066e68df00f97a9de /ubuntu
parentcd601107f0ae1365a715d9aa6aaddc75bd3df127 (diff)
downloadtde-packaging-42678713f1aa241ec6fc7e9ea059a746eee871a8.tar.gz
tde-packaging-42678713f1aa241ec6fc7e9ea059a746eee871a8.zip
Fix regeneration of automake build system for libart-lgpl on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/dependencies/libart-lgpl/debian/control2
-rw-r--r--ubuntu/maverick/dependencies/libart-lgpl/debian/control.in6
-rwxr-xr-xubuntu/maverick/dependencies/libart-lgpl/debian/rules10
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)