diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2015-02-20 22:16:44 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-17 18:52:59 +0100 |
commit | 0da752f5e9f9413439b9e605bae0f545635794c2 (patch) | |
tree | f58485ccc0ba2257968c8b94e8e0f49a0b04ff0b | |
parent | 7b944939b7cb843469bc23fd74278f482941b914 (diff) | |
download | tde-packaging-0da752f5e9f9413439b9e605bae0f545635794c2.tar.gz tde-packaging-0da752f5e9f9413439b9e605bae0f545635794c2.zip |
Switch avahi-tqt to cmake on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3186c3943aea305c58774dc0d5f80aa9f78464fb)
-rw-r--r-- | debian/lenny/dependencies/avahi-tqt/debian/control | 10 | ||||
-rwxr-xr-x | debian/lenny/dependencies/avahi-tqt/debian/rules | 20 | ||||
-rw-r--r-- | debian/squeeze/dependencies/avahi-tqt/debian/control | 10 | ||||
-rwxr-xr-x | debian/squeeze/dependencies/avahi-tqt/debian/rules | 20 | ||||
-rw-r--r-- | ubuntu/maverick/dependencies/avahi-tqt/debian/control | 10 | ||||
-rwxr-xr-x | ubuntu/maverick/dependencies/avahi-tqt/debian/rules | 20 |
6 files changed, 21 insertions, 69 deletions
diff --git a/debian/lenny/dependencies/avahi-tqt/debian/control b/debian/lenny/dependencies/avahi-tqt/debian/control index c3e237031..8f1e46364 100644 --- a/debian/lenny/dependencies/avahi-tqt/debian/control +++ b/debian/lenny/dependencies/avahi-tqt/debian/control @@ -5,19 +5,11 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net> Build-Depends: debhelper, + cmake, gcc, cdbs, pkg-config, - python-support (>= 0.6), - libglib2.0-dev (>= 2.4), - libgtk2.0-dev (>= 2.14.0), - libexpat-dev, - libdbus-1-dev (>= 0.60), - python-gdbm (>= 2.4.3), - python-dbus, - python-gtk2 (>= 2.8.6-2), libtqtinterface-dev, - intltool (>= 0.35.0), libavahi-common-dev, libavahi-client-dev Standards-Version: 3.9.1 diff --git a/debian/lenny/dependencies/avahi-tqt/debian/rules b/debian/lenny/dependencies/avahi-tqt/debian/rules index ac6ff10f3..4929325df 100755 --- a/debian/lenny/dependencies/avahi-tqt/debian/rules +++ b/debian/lenny/dependencies/avahi-tqt/debian/rules @@ -1,25 +1,17 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/cmake.mk # Ensure at build time that the library has no dependencies on undefined # symbols, and speed up loading. export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 -DEB_CONFIGURE_EXTRA_FLAGS += \ - --prefix=/usr \ - --enable-compat-libdns_sd \ - --disable-mono --disable-monodoc \ - --disable-gtk3 \ - --with-systemdsystemunitdir=/lib/systemd/system +# Build options +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - ./autogen.sh --prefix=/usr - rm ./ChangeLog - touch debian/stamp-bootstrap diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/control b/debian/squeeze/dependencies/avahi-tqt/debian/control index 4b9b7809e..d46a1ac34 100644 --- a/debian/squeeze/dependencies/avahi-tqt/debian/control +++ b/debian/squeeze/dependencies/avahi-tqt/debian/control @@ -5,20 +5,12 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net> Build-Depends: debhelper, + cmake, gcc, cdbs, quilt, pkg-config, - python-support (>= 0.6), - libglib2.0-dev (>= 2.4), - libgtk2.0-dev (>= 2.14.0), - libexpat-dev, - libdbus-1-dev (>= 0.60), - python-gdbm (>= 2.4.3), - python-dbus, - python-gtk2 (>= 2.8.6-2), libtqtinterface-dev, - intltool (>= 0.35.0), libavahi-common-dev, libavahi-client-dev Standards-Version: 3.9.1 diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/rules b/debian/squeeze/dependencies/avahi-tqt/debian/rules index ac6ff10f3..4929325df 100755 --- a/debian/squeeze/dependencies/avahi-tqt/debian/rules +++ b/debian/squeeze/dependencies/avahi-tqt/debian/rules @@ -1,25 +1,17 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/cmake.mk # Ensure at build time that the library has no dependencies on undefined # symbols, and speed up loading. export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 -DEB_CONFIGURE_EXTRA_FLAGS += \ - --prefix=/usr \ - --enable-compat-libdns_sd \ - --disable-mono --disable-monodoc \ - --disable-gtk3 \ - --with-systemdsystemunitdir=/lib/systemd/system +# Build options +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - ./autogen.sh --prefix=/usr - rm ./ChangeLog - touch debian/stamp-bootstrap diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/control b/ubuntu/maverick/dependencies/avahi-tqt/debian/control index 4b9b7809e..d46a1ac34 100644 --- a/ubuntu/maverick/dependencies/avahi-tqt/debian/control +++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/control @@ -5,20 +5,12 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net> Build-Depends: debhelper, + cmake, gcc, cdbs, quilt, pkg-config, - python-support (>= 0.6), - libglib2.0-dev (>= 2.4), - libgtk2.0-dev (>= 2.14.0), - libexpat-dev, - libdbus-1-dev (>= 0.60), - python-gdbm (>= 2.4.3), - python-dbus, - python-gtk2 (>= 2.8.6-2), libtqtinterface-dev, - intltool (>= 0.35.0), libavahi-common-dev, libavahi-client-dev Standards-Version: 3.9.1 diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/rules b/ubuntu/maverick/dependencies/avahi-tqt/debian/rules index ac6ff10f3..4929325df 100755 --- a/ubuntu/maverick/dependencies/avahi-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/rules @@ -1,25 +1,17 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/cmake.mk # Ensure at build time that the library has no dependencies on undefined # symbols, and speed up loading. export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 -DEB_CONFIGURE_EXTRA_FLAGS += \ - --prefix=/usr \ - --enable-compat-libdns_sd \ - --disable-mono --disable-monodoc \ - --disable-gtk3 \ - --with-systemdsystemunitdir=/lib/systemd/system +# Build options +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - ./autogen.sh --prefix=/usr - rm ./ChangeLog - touch debian/stamp-bootstrap |