diff options
| author | Michele Calgaro <[email protected]> | 2014-03-13 15:27:22 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2014-03-13 15:27:22 +0900 |
| commit | c732fbd9c3af129ffbe748ec9edbba93a6013242 (patch) | |
| tree | 07a89134b30369621694ff5f7c7d00ed14bb4be5 /ubuntu/maverick | |
| parent | a66e9da55340fee89e3ae658e113a6cd08a92164 (diff) | |
| download | tde-packaging-c732fbd9c3af129ffbe748ec9edbba93a6013242.tar.gz tde-packaging-c732fbd9c3af129ffbe748ec9edbba93a6013242.zip | |
Remove duplicate code in debian/rules and unrecognized option --with-xinerama from Debian/Ubuntu distros
Diffstat (limited to 'ubuntu/maverick')
| -rw-r--r-- | ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk | 2 | ||||
| -rwxr-xr-x | ubuntu/maverick/applications/soundkonverter/debian/rules | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk index 765560c89..cebb2d01d 100644 --- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk @@ -56,7 +56,7 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) cdbs_kde_enable_debug = --enable-debug=full endif -cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" diff --git a/ubuntu/maverick/applications/soundkonverter/debian/rules b/ubuntu/maverick/applications/soundkonverter/debian/rules index 4729675e0..d50c37f2d 100755 --- a/ubuntu/maverick/applications/soundkonverter/debian/rules +++ b/ubuntu/maverick/applications/soundkonverter/debian/rules @@ -10,21 +10,11 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - DEB_CONFIGURE_EXTRA_FLAGS = --with-extra-libs=/opt/trinity/lib - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" && echo xz || echo bzip2) install/soundkonverter-trinity:: install -D -p -m0644 debian/soundkonverter-trinity.lintian-overrides \ |