summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2014-12-30 20:13:14 +0100
committerSlávek Banko <[email protected]>2014-12-30 20:13:14 +0100
commit10a22740c47a6733e8c4adfe82732e18f4fb66d0 (patch)
tree798f8bce66af56f2572db794aca7fc1777e0ee0c
parent3ff70de1e86e5cfc64dc30ed53616bc0490ace13 (diff)
downloadtde-packaging-10a22740c47a6733e8c4adfe82732e18f4fb66d0.tar.gz
tde-packaging-10a22740c47a6733e8c4adfe82732e18f4fb66d0.zip
Switch libr to cmake on Debian and Ubuntu
Signed-off-by: Slávek Banko <[email protected]>
-rw-r--r--debian/lenny/dependencies/libr/debian/control2
-rw-r--r--debian/lenny/dependencies/libr/debian/libr.doc-base.EX20
-rwxr-xr-xdebian/lenny/dependencies/libr/debian/rules127
-rw-r--r--debian/lenny/dependencies/libr/debian/shlibs.local.ex1
-rw-r--r--debian/squeeze/dependencies/libr/debian/control2
-rw-r--r--debian/squeeze/dependencies/libr/debian/libr.doc-base.EX20
-rwxr-xr-xdebian/squeeze/dependencies/libr/debian/rules127
-rw-r--r--debian/squeeze/dependencies/libr/debian/shlibs.local.ex1
-rw-r--r--ubuntu/maverick/dependencies/libr/debian/control2
-rw-r--r--ubuntu/maverick/dependencies/libr/debian/libr.doc-base.EX20
-rwxr-xr-xubuntu/maverick/dependencies/libr/debian/rules127
-rw-r--r--ubuntu/maverick/dependencies/libr/debian/shlibs.local.ex1
12 files changed, 45 insertions, 405 deletions
diff --git a/debian/lenny/dependencies/libr/debian/control b/debian/lenny/dependencies/libr/debian/control
index b5451ebd0..94892ab35 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 <[email protected]>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, gettext (< 0.18) | autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7), cdbs, cmake, quilt, pkg-config, libglade2-dev, binutils-dev, doxygen
Standards-Version: 3.8.4
Section: libs
Homepage: http://www.compholio.com/elficon/
diff --git a/debian/lenny/dependencies/libr/debian/libr.doc-base.EX b/debian/lenny/dependencies/libr/debian/libr.doc-base.EX
deleted file mode 100644
index a879d94eb..000000000
--- a/debian/lenny/dependencies/libr/debian/libr.doc-base.EX
+++ /dev/null
@@ -1,20 +0,0 @@
-Document: libr
-Title: Debian libr Manual
-Author: <insert document author here>
-Abstract: This manual describes what libr is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/libr/libr.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/libr/libr.ps.gz
-
-Format: text
-Files: /usr/share/doc/libr/libr.text.gz
-
-Format: HTML
-Index: /usr/share/doc/libr/html/index.html
-Files: /usr/share/doc/libr/html/*.html
diff --git a/debian/lenny/dependencies/libr/debian/rules b/debian/lenny/dependencies/libr/debian/rules
index f27016309..1b6b94b3e 100755
--- a/debian/lenny/dependencies/libr/debian/rules
+++ b/debian/lenny/dependencies/libr/debian/rules
@@ -1,119 +1,20 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+#! /usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/utils.mk
+DEB_BUILD_PARALLEL = true
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+# Build options
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-configure:
- cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in
- cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh
- cp -Rp /usr/share/libtool/libltdl/aclocal.m4 aclocal.m4
- ./autogen.sh
-
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch $@
-
-clean:
+clean::
dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+ rm -fr man/man3
diff --git a/debian/lenny/dependencies/libr/debian/shlibs.local.ex b/debian/lenny/dependencies/libr/debian/shlibs.local.ex
deleted file mode 100644
index 0e2f5fd3d..000000000
--- a/debian/lenny/dependencies/libr/debian/shlibs.local.ex
+++ /dev/null
@@ -1 +0,0 @@
-liblibr 0 libr (>> 0-0), libr (<< 0-99)
diff --git a/debian/squeeze/dependencies/libr/debian/control b/debian/squeeze/dependencies/libr/debian/control
index b5451ebd0..94892ab35 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 <[email protected]>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, gettext (< 0.18) | autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7), cdbs, cmake, quilt, pkg-config, libglade2-dev, binutils-dev, doxygen
Standards-Version: 3.8.4
Section: libs
Homepage: http://www.compholio.com/elficon/
diff --git a/debian/squeeze/dependencies/libr/debian/libr.doc-base.EX b/debian/squeeze/dependencies/libr/debian/libr.doc-base.EX
deleted file mode 100644
index a879d94eb..000000000
--- a/debian/squeeze/dependencies/libr/debian/libr.doc-base.EX
+++ /dev/null
@@ -1,20 +0,0 @@
-Document: libr
-Title: Debian libr Manual
-Author: <insert document author here>
-Abstract: This manual describes what libr is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/libr/libr.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/libr/libr.ps.gz
-
-Format: text
-Files: /usr/share/doc/libr/libr.text.gz
-
-Format: HTML
-Index: /usr/share/doc/libr/html/index.html
-Files: /usr/share/doc/libr/html/*.html
diff --git a/debian/squeeze/dependencies/libr/debian/rules b/debian/squeeze/dependencies/libr/debian/rules
index f27016309..1b6b94b3e 100755
--- a/debian/squeeze/dependencies/libr/debian/rules
+++ b/debian/squeeze/dependencies/libr/debian/rules
@@ -1,119 +1,20 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+#! /usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/utils.mk
+DEB_BUILD_PARALLEL = true
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+# Build options
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-configure:
- cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in
- cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh
- cp -Rp /usr/share/libtool/libltdl/aclocal.m4 aclocal.m4
- ./autogen.sh
-
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch $@
-
-clean:
+clean::
dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+ rm -fr man/man3
diff --git a/debian/squeeze/dependencies/libr/debian/shlibs.local.ex b/debian/squeeze/dependencies/libr/debian/shlibs.local.ex
deleted file mode 100644
index 0e2f5fd3d..000000000
--- a/debian/squeeze/dependencies/libr/debian/shlibs.local.ex
+++ /dev/null
@@ -1 +0,0 @@
-liblibr 0 libr (>> 0-0), libr (<< 0-99)
diff --git a/ubuntu/maverick/dependencies/libr/debian/control b/ubuntu/maverick/dependencies/libr/debian/control
index b5451ebd0..94892ab35 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 <[email protected]>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, gettext (< 0.18) | autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7), cdbs, cmake, quilt, pkg-config, libglade2-dev, binutils-dev, doxygen
Standards-Version: 3.8.4
Section: libs
Homepage: http://www.compholio.com/elficon/
diff --git a/ubuntu/maverick/dependencies/libr/debian/libr.doc-base.EX b/ubuntu/maverick/dependencies/libr/debian/libr.doc-base.EX
deleted file mode 100644
index a879d94eb..000000000
--- a/ubuntu/maverick/dependencies/libr/debian/libr.doc-base.EX
+++ /dev/null
@@ -1,20 +0,0 @@
-Document: libr
-Title: Debian libr Manual
-Author: <insert document author here>
-Abstract: This manual describes what libr is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/libr/libr.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/libr/libr.ps.gz
-
-Format: text
-Files: /usr/share/doc/libr/libr.text.gz
-
-Format: HTML
-Index: /usr/share/doc/libr/html/index.html
-Files: /usr/share/doc/libr/html/*.html
diff --git a/ubuntu/maverick/dependencies/libr/debian/rules b/ubuntu/maverick/dependencies/libr/debian/rules
index f27016309..1b6b94b3e 100755
--- a/ubuntu/maverick/dependencies/libr/debian/rules
+++ b/ubuntu/maverick/dependencies/libr/debian/rules
@@ -1,119 +1,20 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+#! /usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/utils.mk
+DEB_BUILD_PARALLEL = true
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+# Build options
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-configure:
- cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in
- cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh
- cp -Rp /usr/share/libtool/libltdl/aclocal.m4 aclocal.m4
- ./autogen.sh
-
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch $@
-
-clean:
+clean::
dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+ rm -fr man/man3
diff --git a/ubuntu/maverick/dependencies/libr/debian/shlibs.local.ex b/ubuntu/maverick/dependencies/libr/debian/shlibs.local.ex
deleted file mode 100644
index 0e2f5fd3d..000000000
--- a/ubuntu/maverick/dependencies/libr/debian/shlibs.local.ex
+++ /dev/null
@@ -1 +0,0 @@
-liblibr 0 libr (>> 0-0), libr (<< 0-99)