From 784405e8180ea3d82b9c983dc6980b395a10099b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 7 Feb 2012 13:25:53 -0600 Subject: Update Debian and Ubuntu packaging files for new TDE include directory name --- ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/libraries/kipi-plugins/debian/rules | 4 ++-- ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/libraries/libkdcraw/debian/rules | 2 +- ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/libraries/libkexiv2/debian/rules | 2 +- ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/libraries/libkipi/debian/rules | 2 +- ubuntu/maverick/libraries/libksquirrel/debian/rules | 2 +- ubuntu/maverick/libraries/mlt++/debian/rules | 2 +- ubuntu/maverick/libraries/mlt/debian/rules | 10 +++++----- .../pytdeextensions/debian/libpythonize0-trinity-dev.install | 2 +- ubuntu/maverick/libraries/pytdeextensions/debian/rules | 8 ++++---- 13 files changed, 21 insertions(+), 21 deletions(-) (limited to 'ubuntu/maverick/libraries') diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/rules b/ubuntu/maverick/libraries/kipi-plugins/debian/rules index ec3d9a4a3..e277fb614 100755 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/rules +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/rules @@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -18,7 +18,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde clean :: rm -f po/*/*.gmo diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk +++ b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/rules b/ubuntu/maverick/libraries/libkdcraw/debian/rules index 0606b98a9..7785e4bcc 100755 --- a/ubuntu/maverick/libraries/libkdcraw/debian/rules +++ b/ubuntu/maverick/libraries/libkdcraw/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk +++ b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/rules b/ubuntu/maverick/libraries/libkexiv2/debian/rules index dc80327f0..28a1c06e8 100755 --- a/ubuntu/maverick/libraries/libkexiv2/debian/rules +++ b/ubuntu/maverick/libraries/libkexiv2/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk +++ b/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/libraries/libkipi/debian/rules b/ubuntu/maverick/libraries/libkipi/debian/rules index 903f7c7b1..94eb41df3 100755 --- a/ubuntu/maverick/libraries/libkipi/debian/rules +++ b/ubuntu/maverick/libraries/libkipi/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/rules b/ubuntu/maverick/libraries/libksquirrel/debian/rules index fa3c9c335..fa07f7f8c 100755 --- a/ubuntu/maverick/libraries/libksquirrel/debian/rules +++ b/ubuntu/maverick/libraries/libksquirrel/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/libraries/mlt++/debian/rules b/ubuntu/maverick/libraries/mlt++/debian/rules index cf8cb1984..0232c83be 100755 --- a/ubuntu/maverick/libraries/mlt++/debian/rules +++ b/ubuntu/maverick/libraries/mlt++/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 diff --git a/ubuntu/maverick/libraries/mlt/debian/rules b/ubuntu/maverick/libraries/mlt/debian/rules index 771793fff..3889b6a3a 100755 --- a/ubuntu/maverick/libraries/mlt/debian/rules +++ b/ubuntu/maverick/libraries/mlt/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -47,10 +47,10 @@ configure-stamp: QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --enable-gpl \ + CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --enable-gpl \ --luma-compress --disable-mmx $(CONFIGURE_OPTS) \ --avformat-shared=/usr --avformat-swscale \ - --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde touch configure-stamp @@ -58,7 +58,7 @@ build: configure-stamp build-stamp build-stamp: dh_testdir - env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -j $(NCPUS) + env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -j $(NCPUS) touch build-stamp @@ -81,7 +81,7 @@ install: build dh_clean -k dh_installdirs opt/trinity/lib/mlt0.2.5/modules opt/trinity/share/mlt0.2.5 - env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # mkdir debian/tmp/opt/trinity # mv debian/tmp/opt/trinity/lib debian/tmp/opt/trinity/ diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install index f50fc4e15..d7e5bd651 100644 --- a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install @@ -1,4 +1,4 @@ -opt/trinity/include/kde/pythonize.h +opt/trinity/include/tde/pythonize.h opt/trinity/lib/libpythonize.a opt/trinity/lib/libpythonize.la opt/trinity/lib/libpythonize.so diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/rules b/ubuntu/maverick/libraries/pytdeextensions/debian/rules index 1acb32f7d..4dcfaaae8 100755 --- a/ubuntu/maverick/libraries/pytdeextensions/debian/rules +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/rules @@ -8,7 +8,7 @@ include debian/python-distutils-jaunty.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +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 @@ -16,7 +16,7 @@ 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_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde install/pytdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages @@ -45,8 +45,8 @@ install/libpythonize0-trinity:: # fix binary-or-shlib-defines-rpath chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.* # fix include directory location - mkdir -p debian/tmp/opt/trinity/include/kde - mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/kde + mkdir -p debian/tmp/opt/trinity/include/tde + mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde clean:: rm -rf build -- cgit v1.2.1