From 42678713f1aa241ec6fc7e9ea059a746eee871a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 11 Mar 2015 18:35:08 +0100 Subject: [PATCH] Fix regeneration of automake build system for libart-lgpl on Debian and Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lenny/dependencies/libart-lgpl/debian/control | 5 ++--- .../lenny/dependencies/libart-lgpl/debian/control.in | 6 +++++- debian/lenny/dependencies/libart-lgpl/debian/rules | 10 +++++++--- debian/squeeze/dependencies/libart-lgpl/debian/control | 5 ++--- .../squeeze/dependencies/libart-lgpl/debian/control.in | 6 +++++- debian/squeeze/dependencies/libart-lgpl/debian/rules | 10 +++++++--- .../maverick/dependencies/libart-lgpl/debian/control | 2 +- .../dependencies/libart-lgpl/debian/control.in | 6 +++++- ubuntu/maverick/dependencies/libart-lgpl/debian/rules | 10 +++++++--- 9 files changed, 41 insertions(+), 19 deletions(-) diff --git a/debian/lenny/dependencies/libart-lgpl/debian/control b/debian/lenny/dependencies/libart-lgpl/debian/control index 9a8bb0e78..00a9b00c5 100644 --- a/debian/lenny/dependencies/libart-lgpl/debian/control +++ b/debian/lenny/dependencies/libart-lgpl/debian/control @@ -2,18 +2,17 @@ # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. - Source: libart-lgpl Section: devel Priority: optional Maintainer: Josselin Mouette -Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Drge , Sebastien Bacher +Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Dröge , Sebastien Bacher Standards-Version: 3.8.4 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/debian/lenny/dependencies/libart-lgpl/debian/control.in b/debian/lenny/dependencies/libart-lgpl/debian/control.in index 4dc153450..07d4eb5da 100644 --- a/debian/lenny/dependencies/libart-lgpl/debian/control.in +++ b/debian/lenny/dependencies/libart-lgpl/debian/control.in @@ -8,11 +8,13 @@ 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 Section: libs +Replaces: libart-2.0-2 (<< 4:14.0.0~) +Breaks: libart-2.0-2 (<< 4:14.0.0~) Depends: ${misc:Depends}, ${shlibs:Depends} Description: Library of functions for 2D graphics - runtime files @@ -25,6 +27,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/debian/lenny/dependencies/libart-lgpl/debian/rules b/debian/lenny/dependencies/libart-lgpl/debian/rules index add68d0c4..662ce7705 100755 --- a/debian/lenny/dependencies/libart-lgpl/debian/rules +++ b/debian/lenny/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) diff --git a/debian/squeeze/dependencies/libart-lgpl/debian/control b/debian/squeeze/dependencies/libart-lgpl/debian/control index f4b2021c4..1e45c1689 100644 --- a/debian/squeeze/dependencies/libart-lgpl/debian/control +++ b/debian/squeeze/dependencies/libart-lgpl/debian/control @@ -2,18 +2,17 @@ # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. - Source: libart-lgpl Section: devel Priority: optional Maintainer: Josselin Mouette -Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Drge , Sebastien Bacher +Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Dröge , Sebastien Bacher Standards-Version: 3.8.4 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/debian/squeeze/dependencies/libart-lgpl/debian/control.in b/debian/squeeze/dependencies/libart-lgpl/debian/control.in index e0b3f3a97..168168b28 100644 --- a/debian/squeeze/dependencies/libart-lgpl/debian/control.in +++ b/debian/squeeze/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/debian/squeeze/dependencies/libart-lgpl/debian/rules b/debian/squeeze/dependencies/libart-lgpl/debian/rules index ddd81783d..3ae4eb42c 100755 --- a/debian/squeeze/dependencies/libart-lgpl/debian/rules +++ b/debian/squeeze/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) 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)