From b789b019b8e8bad22682a8acd70bdd167f74ed26 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 29 Dec 2014 12:59:25 -0600 Subject: [PATCH 1/5] Add libtool to libr build deps on Debian and Ubuntu --- debian/lenny/dependencies/libr/debian/control | 2 +- debian/squeeze/dependencies/libr/debian/control | 2 +- ubuntu/maverick/dependencies/libr/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/dependencies/libr/debian/control b/debian/lenny/dependencies/libr/debian/control index 0281e63f0..06631865e 100644 --- a/debian/lenny/dependencies/libr/debian/control +++ b/debian/lenny/dependencies/libr/debian/control @@ -1,7 +1,7 @@ Source: libr Priority: extra Maintainer: Erich E. Hoover -Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, +Build-Depends: debhelper (>= 7), quilt, autotools-dev, libtool, pkg-config, libglade2-dev, binutils-dev, doxygen Standards-Version: 3.8.4 Section: libs diff --git a/debian/squeeze/dependencies/libr/debian/control b/debian/squeeze/dependencies/libr/debian/control index 0281e63f0..06631865e 100644 --- a/debian/squeeze/dependencies/libr/debian/control +++ b/debian/squeeze/dependencies/libr/debian/control @@ -1,7 +1,7 @@ Source: libr Priority: extra Maintainer: Erich E. Hoover -Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, +Build-Depends: debhelper (>= 7), quilt, autotools-dev, libtool, pkg-config, libglade2-dev, binutils-dev, doxygen Standards-Version: 3.8.4 Section: libs diff --git a/ubuntu/maverick/dependencies/libr/debian/control b/ubuntu/maverick/dependencies/libr/debian/control index 0281e63f0..06631865e 100644 --- a/ubuntu/maverick/dependencies/libr/debian/control +++ b/ubuntu/maverick/dependencies/libr/debian/control @@ -1,7 +1,7 @@ Source: libr Priority: extra Maintainer: Erich E. Hoover -Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, +Build-Depends: debhelper (>= 7), quilt, autotools-dev, libtool, pkg-config, libglade2-dev, binutils-dev, doxygen Standards-Version: 3.8.4 Section: libs From 065633c37f102fbdbe361982709b669894784bf9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 29 Dec 2014 13:22:20 -0600 Subject: [PATCH 2/5] Fix libr build deps on Debian and Ubuntu --- debian/lenny/dependencies/libr/debian/control | 3 +-- debian/squeeze/dependencies/libr/debian/control | 3 +-- ubuntu/maverick/dependencies/libr/debian/control | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/lenny/dependencies/libr/debian/control b/debian/lenny/dependencies/libr/debian/control index 06631865e..a2ee1f0b3 100644 --- a/debian/lenny/dependencies/libr/debian/control +++ b/debian/lenny/dependencies/libr/debian/control @@ -1,8 +1,7 @@ Source: libr Priority: extra Maintainer: Erich E. Hoover -Build-Depends: debhelper (>= 7), quilt, autotools-dev, libtool, pkg-config, - libglade2-dev, binutils-dev, doxygen +Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, libglade2-dev, binutils-dev, doxygen, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Section: libs Homepage: http://www.compholio.com/elficon/ diff --git a/debian/squeeze/dependencies/libr/debian/control b/debian/squeeze/dependencies/libr/debian/control index 06631865e..a2ee1f0b3 100644 --- a/debian/squeeze/dependencies/libr/debian/control +++ b/debian/squeeze/dependencies/libr/debian/control @@ -1,8 +1,7 @@ Source: libr Priority: extra Maintainer: Erich E. Hoover -Build-Depends: debhelper (>= 7), quilt, autotools-dev, libtool, pkg-config, - libglade2-dev, binutils-dev, doxygen +Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, libglade2-dev, binutils-dev, doxygen, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Section: libs Homepage: http://www.compholio.com/elficon/ diff --git a/ubuntu/maverick/dependencies/libr/debian/control b/ubuntu/maverick/dependencies/libr/debian/control index 06631865e..a2ee1f0b3 100644 --- a/ubuntu/maverick/dependencies/libr/debian/control +++ b/ubuntu/maverick/dependencies/libr/debian/control @@ -1,8 +1,7 @@ Source: libr Priority: extra Maintainer: Erich E. Hoover -Build-Depends: debhelper (>= 7), quilt, autotools-dev, libtool, pkg-config, - libglade2-dev, binutils-dev, doxygen +Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, libglade2-dev, binutils-dev, doxygen, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Section: libs Homepage: http://www.compholio.com/elficon/ From 18d9503cea9c75f2952ae663bcc545e28e144c1b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 29 Dec 2014 13:51:15 -0600 Subject: [PATCH 3/5] Fix libr FTBFS due to autopoint requiring cvs --- debian/lenny/dependencies/libr/debian/control | 2 +- debian/squeeze/dependencies/libr/debian/control | 2 +- ubuntu/maverick/dependencies/libr/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/dependencies/libr/debian/control b/debian/lenny/dependencies/libr/debian/control index a2ee1f0b3..dc3f85b3f 100644 --- a/debian/lenny/dependencies/libr/debian/control +++ b/debian/lenny/dependencies/libr/debian/control @@ -1,7 +1,7 @@ Source: libr Priority: extra Maintainer: Erich E. Hoover -Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, libglade2-dev, binutils-dev, doxygen, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Section: libs Homepage: http://www.compholio.com/elficon/ diff --git a/debian/squeeze/dependencies/libr/debian/control b/debian/squeeze/dependencies/libr/debian/control index a2ee1f0b3..dc3f85b3f 100644 --- a/debian/squeeze/dependencies/libr/debian/control +++ b/debian/squeeze/dependencies/libr/debian/control @@ -1,7 +1,7 @@ Source: libr Priority: extra Maintainer: Erich E. Hoover -Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, libglade2-dev, binutils-dev, doxygen, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Section: libs Homepage: http://www.compholio.com/elficon/ diff --git a/ubuntu/maverick/dependencies/libr/debian/control b/ubuntu/maverick/dependencies/libr/debian/control index a2ee1f0b3..dc3f85b3f 100644 --- a/ubuntu/maverick/dependencies/libr/debian/control +++ b/ubuntu/maverick/dependencies/libr/debian/control @@ -1,7 +1,7 @@ Source: libr Priority: extra Maintainer: Erich E. Hoover -Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, libglade2-dev, binutils-dev, doxygen, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Section: libs Homepage: http://www.compholio.com/elficon/ From 9ccf74a89dc96be794ae48072dc4efcf060973ba Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 29 Dec 2014 14:34:15 -0600 Subject: [PATCH 4/5] Fix final libr FTBFS on Debian and Ubuntu --- debian/lenny/dependencies/libr/debian/docs | 1 - debian/squeeze/dependencies/libr/debian/docs | 1 - ubuntu/maverick/dependencies/libr/debian/docs | 1 - 3 files changed, 3 deletions(-) diff --git a/debian/lenny/dependencies/libr/debian/docs b/debian/lenny/dependencies/libr/debian/docs index 5b4436d64..50bd824bb 100644 --- a/debian/lenny/dependencies/libr/debian/docs +++ b/debian/lenny/dependencies/libr/debian/docs @@ -1,3 +1,2 @@ NEWS README -ChangeLog.debian diff --git a/debian/squeeze/dependencies/libr/debian/docs b/debian/squeeze/dependencies/libr/debian/docs index 5b4436d64..50bd824bb 100644 --- a/debian/squeeze/dependencies/libr/debian/docs +++ b/debian/squeeze/dependencies/libr/debian/docs @@ -1,3 +1,2 @@ NEWS README -ChangeLog.debian diff --git a/ubuntu/maverick/dependencies/libr/debian/docs b/ubuntu/maverick/dependencies/libr/debian/docs index 5b4436d64..50bd824bb 100644 --- a/ubuntu/maverick/dependencies/libr/debian/docs +++ b/ubuntu/maverick/dependencies/libr/debian/docs @@ -1,3 +1,2 @@ NEWS README -ChangeLog.debian From 5dc817ae5fdc38477942759eee3504f2dea307e3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 29 Dec 2014 16:34:22 -0600 Subject: [PATCH 5/5] libr autoreconf requires autopoint but the autoconf package of Precise and above does not depend on it --- debian/lenny/dependencies/libr/debian/control | 2 +- debian/squeeze/dependencies/libr/debian/control | 2 +- ubuntu/maverick/dependencies/libr/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/dependencies/libr/debian/control b/debian/lenny/dependencies/libr/debian/control index dc3f85b3f..64166704e 100644 --- a/debian/lenny/dependencies/libr/debian/control +++ b/debian/lenny/dependencies/libr/debian/control @@ -1,7 +1,7 @@ Source: libr Priority: extra Maintainer: Erich E. Hoover -Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7), quilt, autotools-dev, autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Section: libs Homepage: http://www.compholio.com/elficon/ diff --git a/debian/squeeze/dependencies/libr/debian/control b/debian/squeeze/dependencies/libr/debian/control index dc3f85b3f..64166704e 100644 --- a/debian/squeeze/dependencies/libr/debian/control +++ b/debian/squeeze/dependencies/libr/debian/control @@ -1,7 +1,7 @@ Source: libr Priority: extra Maintainer: Erich E. Hoover -Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7), quilt, autotools-dev, autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Section: libs Homepage: http://www.compholio.com/elficon/ diff --git a/ubuntu/maverick/dependencies/libr/debian/control b/ubuntu/maverick/dependencies/libr/debian/control index dc3f85b3f..64166704e 100644 --- a/ubuntu/maverick/dependencies/libr/debian/control +++ b/ubuntu/maverick/dependencies/libr/debian/control @@ -1,7 +1,7 @@ Source: libr Priority: extra Maintainer: Erich E. Hoover -Build-Depends: debhelper (>= 7), quilt, autotools-dev, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7), quilt, autotools-dev, autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Section: libs Homepage: http://www.compholio.com/elficon/