Fix regeneration of automake build system on Debian and Ubuntu

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 47dff09e22)
pull/92/head
Slávek Banko 10 years ago
parent 81a56a94f7
commit bd43cd4696

@ -33,11 +33,8 @@ post-patches::
config.status: post-patches
dh_testdir
test -e config.sub -a -L config.sub || \
ln -sf /usr/share/misc/config.sub config.sub
test -e config.guess -a -L config.guess || \
ln -sf /usr/share/misc/config.guess config.guess
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
$(MAKE) -f admin/Makefile.common dist;

@ -48,14 +48,12 @@ debian/build-kde:
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
# automake
# autoconf
test -e config.sub -a -L config.sub || \
ln -sf /usr/share/misc/config.sub config.sub
test -e config.guess -a -L config.guess || \
ln -sf /usr/share/misc/config.guess config.guess
[ -d build-kde ] || mkdir build-kde
cd build-kde && ../configure CFLAGS="$(CFLAGS)" $(CONFIGURE_OPTIONS_TDE)

@ -49,22 +49,14 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Apply Debian specific patches
if test ! -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo APPLYING PATCH\: $${patch##*/};\
patch -p1 < $$patch ;\
done ;\
touch patch-stamp ;\
fi
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -101,16 +93,6 @@ clean:
dh_testroot
rm -f build-stamp configure-stamp
# Remove Debian specific patches
if test -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo REMOVING PATCH\: $${patch##*/};\
patch -p1 -R < $$patch ;\
done ;\
rm -f patch-stamp ;\
fi
# Remove build tree
rm -rf $(objdir)

@ -53,22 +53,14 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Apply Debian specific patches
if test ! -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo APPLYING PATCH\: $${patch##*/};\
patch -p1 < $$patch ;\
done ;\
touch patch-stamp ;\
fi
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -105,16 +97,6 @@ clean:
dh_testroot
rm -f build-stamp configure-stamp debian/debiandirs
# Remove Debian specific patches
if test -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo REMOVING PATCH\: $${patch##*/};\
patch -p1 -R < $$patch ;\
done ;\
rm -f patch-stamp ;\
fi
# Remove build tree
rm -rf $(objdir)

@ -40,7 +40,7 @@ endif
# perl -w admin/debianrules echodirs > debian/debiandirs
config.status: configure
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -48,17 +48,17 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
@ -75,16 +75,7 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f build-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean

@ -39,7 +39,7 @@ debian/knights.xpm: media/hi32-app-knights.png
convert $< $@
config.status: configure
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -47,6 +47,8 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -67,20 +69,11 @@ clean:
dh_testdir
dh_testroot
rm -f po/de.gmo
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
dh_clean
install: build
dh_testdir

@ -25,7 +25,7 @@ else
CFLAGS += -O2
endif
config.status: configure
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -33,6 +33,8 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -52,16 +54,7 @@ clean:
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-$(MAKE) distclean
[ ! -f Makefile ] || $(MAKE) distclean
-rm -R $(CURDIR)/admin/CVS
dh_clean

@ -32,15 +32,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
config.status: configure
dh_testdir
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-qt-includes=/usr/include/qt3/ --with-qt-libraries=/usr/lib/qt3/ --enable-mt --disable-rpath
build: build-stamp
build-stamp: config.status
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -48,10 +40,25 @@ build-stamp: config.status
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-qt-includes=/usr/include/qt3/ --with-qt-libraries=/usr/lib/qt3/ --enable-mt --disable-rpath
build: build-stamp
build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
$(MAKE)
#/usr/bin/docbook-to-man debian/knutclient.sgml > knutclient.1
@ -61,26 +68,10 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f build-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
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
dh_clean po/*gmo

@ -33,7 +33,7 @@ else
CFLAGS += -O2
endif
config.status: configure
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -41,7 +41,9 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -63,21 +65,12 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f build-stamp
# Add here commands to clean up after the build process.
-$(MAKE) distclean
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
dh_clean
rm -f config.log config.guess config.sub
install: build

@ -36,27 +36,7 @@ endif
debian/debiandirs: admin/debianrules
perl -w admin/debianrules echodirs > debian/debiandirs
patch-stamp:
# Apply Debian specific patches
if test ! -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo APPLYING PATCH\: $${patch##*/};\
patch -p1 < $$patch ;\
done ;\
touch patch-stamp ;\
fi
patch: patch-stamp
config.status: configure patch
dh_testdir
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build: build-stamp
build-stamp: config.status
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -64,9 +44,22 @@ build-stamp: config.status
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build: build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
@ -75,37 +68,11 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
rm -f build-stamp
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-$(MAKE) distclean
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
[ ! -f Makefile ] || $(MAKE) distclean
# Remove Debian specific patches
if test -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo REMOVING PATCH\: $${patch##*/};\
patch -p1 -R < $$patch ;\
done ;\
rm -f patch-stamp ;\
fi
dh_clean
dh_clean
install: build
dh_testdir

@ -37,17 +37,17 @@ configure:
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# 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
PKG_CONFIG_PATH='/opt/trinity/lib/pkgconfig' ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-rpath
# Tricks for Intrepid
#--disable-kexif --enable-mt --x-includes=/usr/include/qt4/Qt

@ -29,7 +29,7 @@ endif
debian/ktechlab.xpm: icons/hi32-app-ktechlab.png
convert $< $@
config.status: configure.in
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -37,26 +37,22 @@ config.status: configure.in
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity
build: build-stamp debian/ktechlab.xpm
build-stamp: config.status
dh_testdir
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
touch build-stamp
@ -65,20 +61,9 @@ clean:
dh_testroot
rm -f build-stamp
[ ! -f po/Makefile ] || $(MAKE) -C po clean
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
[ ! -f Makefile ] || $(MAKE) distclean
rm -f config.log debian/ktechlab.xpm config.sub config.guess
dh_clean
dh_clean
install: build
dh_testdir

@ -32,7 +32,7 @@ post-patches::
dh_testdir
config: post-patches config-stamp
config-stamp: configure
config-stamp:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -40,17 +40,16 @@ config-stamp: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \
@ -69,21 +68,12 @@ clean::
dh_testdir
dh_testroot
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f config-stamp build-stamp
rm -f config-stamp build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
rm -f po/*.gmo
rm -f src/common/global/svn_revision/svn_revision.h
rm -f config.sub config.guess config.status config.log
dh_clean
dh_clean
install: build-stamp
dh_testdir

@ -40,7 +40,13 @@ config.status:
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
dh_testdir
@ -61,16 +67,9 @@ clean:
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
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
rm -f po/*.gmo
dh_clean --exclude ./src/potracegui.cpp.orig
install: build

@ -36,8 +36,8 @@ debian/tderadio.xpm: tderadio3/icons/hi32-app-tderadio.png
configure:
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cat /usr/share/aclocal/libtool.m4 > admin/libtool.m4.in
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.sub admin/config.sub
cp -f /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common

@ -32,32 +32,7 @@ else
CXXFLAGS += -O2
endif
apply-patches:
#apply patches first
QUILT_PATCHES="debian/patches" quilt push -a -v
#regenerate the acinclude file with the "Debian" libtool
cp -a /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cat admin/acinclude.m4.in admin/libtool.m4.in >acinclude.m4
#this will update the config.{sub,guess} and ltmain.sh files
libtoolize -c -f
# then, autoreconf with some tde magic
autoreconf -v -i
perl -w admin/am_edit
update-autoconf:
cp -a /usr/share/misc/config.sub admin/
cp -a /usr/share/misc/config.guess admin/
svn-number:
sed -e "s/svn[^-]*-/svn`svn info | \
grep "^Revision" | \
sed -e "s/Revision: //"`-/" debian/changelog > new_changelog
mv new_changelog debian/changelog
config.status: configure
config.status:
dh_testdir
# this makes the file more recent than configure and avoid make calling
@ -68,6 +43,8 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
@ -102,14 +79,6 @@ clean:
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
rm -f libtool config.log
@ -131,9 +100,6 @@ install: build
admin/mkinstalldirs debian/tmp/opt/trinity/share/icons/hicolor/scalable/mimetypes
install -c -p -m 644 -T icons/tellico_mime.svg debian/tmp/opt/trinity/share/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
# Remove dead symlink from French translation
rm debian/tmp/opt/trinity/share/doc/tde/HTML/fr/tellico/common
# Build architecture-independent files here.
binary-indep: build install

@ -36,17 +36,17 @@ configure:
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-rpath
# Tricks for Intrepid
#--disable-kexif --enable-mt --x-includes=/usr/include/qt4/Qt

@ -33,11 +33,8 @@ post-patches::
config.status: post-patches
dh_testdir
test -e config.sub -a -L config.sub || \
ln -sf /usr/share/misc/config.sub config.sub
test -e config.guess -a -L config.guess || \
ln -sf /usr/share/misc/config.guess config.guess
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
$(MAKE) -f admin/Makefile.common dist;

@ -48,14 +48,12 @@ debian/build-kde:
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
# automake
# autoconf
test -e config.sub -a -L config.sub || \
ln -sf /usr/share/misc/config.sub config.sub
test -e config.guess -a -L config.guess || \
ln -sf /usr/share/misc/config.guess config.guess
[ -d build-kde ] || mkdir build-kde
cd build-kde && ../configure CFLAGS="$(CFLAGS)" $(CONFIGURE_OPTIONS_TDE)

@ -49,22 +49,14 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Apply Debian specific patches
if test ! -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo APPLYING PATCH\: $${patch##*/};\
patch -p1 < $$patch ;\
done ;\
touch patch-stamp ;\
fi
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -101,16 +93,6 @@ clean:
dh_testroot
rm -f build-stamp configure-stamp
# Remove Debian specific patches
if test -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo REMOVING PATCH\: $${patch##*/};\
patch -p1 -R < $$patch ;\
done ;\
rm -f patch-stamp ;\
fi
# Remove build tree
rm -rf $(objdir)

@ -53,22 +53,14 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Apply Debian specific patches
if test ! -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo APPLYING PATCH\: $${patch##*/};\
patch -p1 < $$patch ;\
done ;\
touch patch-stamp ;\
fi
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -105,16 +97,6 @@ clean:
dh_testroot
rm -f build-stamp configure-stamp debian/debiandirs
# Remove Debian specific patches
if test -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo REMOVING PATCH\: $${patch##*/};\
patch -p1 -R < $$patch ;\
done ;\
rm -f patch-stamp ;\
fi
# Remove build tree
rm -rf $(objdir)

@ -40,7 +40,7 @@ endif
# perl -w admin/debianrules echodirs > debian/debiandirs
config.status: configure
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -48,17 +48,17 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
@ -75,16 +75,7 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f build-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean

@ -39,7 +39,7 @@ debian/knights.xpm: media/hi32-app-knights.png
convert $< $@
config.status: configure
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -47,6 +47,8 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -67,20 +69,11 @@ clean:
dh_testdir
dh_testroot
rm -f po/de.gmo
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
dh_clean
install: build
dh_testdir

@ -25,7 +25,7 @@ else
CFLAGS += -O2
endif
config.status: configure
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -33,6 +33,8 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -52,16 +54,7 @@ clean:
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-$(MAKE) distclean
[ ! -f Makefile ] || $(MAKE) distclean
-rm -R $(CURDIR)/admin/CVS
dh_clean

@ -32,15 +32,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
config.status: configure
dh_testdir
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-qt-includes=/usr/include/qt3/ --with-qt-libraries=/usr/lib/qt3/ --enable-mt --disable-rpath
build: build-stamp
build-stamp: config.status
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -48,10 +40,25 @@ build-stamp: config.status
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-qt-includes=/usr/include/qt3/ --with-qt-libraries=/usr/lib/qt3/ --enable-mt --disable-rpath
build: build-stamp
build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
$(MAKE)
#/usr/bin/docbook-to-man debian/knutclient.sgml > knutclient.1
@ -61,26 +68,10 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f build-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
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
dh_clean po/*gmo

@ -33,7 +33,7 @@ else
CFLAGS += -O2
endif
config.status: configure
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -41,7 +41,9 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -63,21 +65,12 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f build-stamp
# Add here commands to clean up after the build process.
-$(MAKE) distclean
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
dh_clean
rm -f config.log config.guess config.sub
install: build

@ -36,27 +36,7 @@ endif
debian/debiandirs: admin/debianrules
perl -w admin/debianrules echodirs > debian/debiandirs
patch-stamp:
# Apply Debian specific patches
if test ! -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo APPLYING PATCH\: $${patch##*/};\
patch -p1 < $$patch ;\
done ;\
touch patch-stamp ;\
fi
patch: patch-stamp
config.status: configure patch
dh_testdir
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build: build-stamp
build-stamp: config.status
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -64,9 +44,22 @@ build-stamp: config.status
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build: build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
@ -75,37 +68,11 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
rm -f build-stamp
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-$(MAKE) distclean
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
[ ! -f Makefile ] || $(MAKE) distclean
# Remove Debian specific patches
if test -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo REMOVING PATCH\: $${patch##*/};\
patch -p1 -R < $$patch ;\
done ;\
rm -f patch-stamp ;\
fi
dh_clean
dh_clean
install: build
dh_testdir

@ -37,17 +37,17 @@ configure:
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# 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
PKG_CONFIG_PATH='/opt/trinity/lib/pkgconfig' ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-rpath
# Tricks for Intrepid
#--disable-kexif --enable-mt --x-includes=/usr/include/qt4/Qt

@ -29,7 +29,7 @@ endif
debian/ktechlab.xpm: icons/hi32-app-ktechlab.png
convert $< $@
config.status: configure.in
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -37,26 +37,22 @@ config.status: configure.in
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity
build: build-stamp debian/ktechlab.xpm
build-stamp: config.status
dh_testdir
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
touch build-stamp
@ -65,20 +61,9 @@ clean:
dh_testroot
rm -f build-stamp
[ ! -f po/Makefile ] || $(MAKE) -C po clean
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
[ ! -f Makefile ] || $(MAKE) distclean
rm -f config.log debian/ktechlab.xpm config.sub config.guess
dh_clean
dh_clean
install: build
dh_testdir

@ -32,7 +32,7 @@ post-patches::
dh_testdir
config: post-patches config-stamp
config-stamp: configure
config-stamp:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -40,17 +40,16 @@ config-stamp: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \
@ -69,21 +68,12 @@ clean::
dh_testdir
dh_testroot
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f config-stamp build-stamp
rm -f config-stamp build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
rm -f po/*.gmo
rm -f src/common/global/svn_revision/svn_revision.h
rm -f config.sub config.guess config.status config.log
dh_clean
dh_clean
install: build-stamp
dh_testdir

@ -40,7 +40,13 @@ config.status:
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
dh_testdir
@ -61,16 +67,9 @@ clean:
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
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
rm -f po/*.gmo
dh_clean --exclude ./src/potracegui.cpp.orig
install: build

@ -36,8 +36,8 @@ debian/tderadio.xpm: tderadio3/icons/hi32-app-tderadio.png
configure:
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cat /usr/share/aclocal/libtool.m4 > admin/libtool.m4.in
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.sub admin/config.sub
cp -f /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common

@ -32,32 +32,7 @@ else
CXXFLAGS += -O2
endif
apply-patches:
#apply patches first
QUILT_PATCHES="debian/patches" quilt push -a -v
#regenerate the acinclude file with the "Debian" libtool
cp -a /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cat admin/acinclude.m4.in admin/libtool.m4.in >acinclude.m4
#this will update the config.{sub,guess} and ltmain.sh files
libtoolize -c -f
# then, autoreconf with some tde magic
autoreconf -v -i
perl -w admin/am_edit
update-autoconf:
cp -a /usr/share/misc/config.sub admin/
cp -a /usr/share/misc/config.guess admin/
svn-number:
sed -e "s/svn[^-]*-/svn`svn info | \
grep "^Revision" | \
sed -e "s/Revision: //"`-/" debian/changelog > new_changelog
mv new_changelog debian/changelog
config.status: configure
config.status:
dh_testdir
# this makes the file more recent than configure and avoid make calling
@ -68,6 +43,8 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
@ -102,14 +79,6 @@ clean:
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
rm -f libtool config.log
@ -131,9 +100,6 @@ install: build
admin/mkinstalldirs debian/tmp/opt/trinity/share/icons/hicolor/scalable/mimetypes
install -c -p -m 644 -T icons/tellico_mime.svg debian/tmp/opt/trinity/share/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
# Remove dead symlink from French translation
rm debian/tmp/opt/trinity/share/doc/tde/HTML/fr/tellico/common
# Build architecture-independent files here.
binary-indep: build install

@ -36,17 +36,17 @@ configure:
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-rpath
# Tricks for Intrepid
#--disable-kexif --enable-mt --x-includes=/usr/include/qt4/Qt

@ -33,11 +33,8 @@ post-patches::
config.status: post-patches
dh_testdir
test -e config.sub -a -L config.sub || \
ln -sf /usr/share/misc/config.sub config.sub
test -e config.guess -a -L config.guess || \
ln -sf /usr/share/misc/config.guess config.guess
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
$(MAKE) -f admin/Makefile.common dist;

@ -48,14 +48,12 @@ debian/build-kde:
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
# automake
# autoconf
test -e config.sub -a -L config.sub || \
ln -sf /usr/share/misc/config.sub config.sub
test -e config.guess -a -L config.guess || \
ln -sf /usr/share/misc/config.guess config.guess
[ -d build-kde ] || mkdir build-kde
cd build-kde && ../configure CFLAGS="$(CFLAGS)" $(CONFIGURE_OPTIONS_TDE)

@ -49,22 +49,14 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Apply Debian specific patches
if test ! -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo APPLYING PATCH\: $${patch##*/};\
patch -p1 < $$patch ;\
done ;\
touch patch-stamp ;\
fi
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -101,16 +93,6 @@ clean:
dh_testroot
rm -f build-stamp configure-stamp
# Remove Debian specific patches
if test -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo REMOVING PATCH\: $${patch##*/};\
patch -p1 -R < $$patch ;\
done ;\
rm -f patch-stamp ;\
fi
# Remove build tree
rm -rf $(objdir)

@ -53,22 +53,14 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Apply Debian specific patches
if test ! -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo APPLYING PATCH\: $${patch##*/};\
patch -p1 < $$patch ;\
done ;\
touch patch-stamp ;\
fi
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -105,16 +97,6 @@ clean:
dh_testroot
rm -f build-stamp configure-stamp debian/debiandirs
# Remove Debian specific patches
if test -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo REMOVING PATCH\: $${patch##*/};\
patch -p1 -R < $$patch ;\
done ;\
rm -f patch-stamp ;\
fi
# Remove build tree
rm -rf $(objdir)

@ -40,7 +40,7 @@ endif
# perl -w admin/debianrules echodirs > debian/debiandirs
config.status: configure
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -48,17 +48,17 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
@ -75,16 +75,7 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f build-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean

@ -39,7 +39,7 @@ debian/knights.xpm: media/hi32-app-knights.png
convert $< $@
config.status: configure
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -47,6 +47,8 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -67,20 +69,11 @@ clean:
dh_testdir
dh_testroot
rm -f po/de.gmo
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
dh_clean
install: build
dh_testdir

@ -25,7 +25,7 @@ else
CFLAGS += -O2
endif
config.status: configure
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -33,6 +33,8 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -52,16 +54,7 @@ clean:
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-$(MAKE) distclean
[ ! -f Makefile ] || $(MAKE) distclean
-rm -R $(CURDIR)/admin/CVS
dh_clean

@ -32,15 +32,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
config.status: configure
dh_testdir
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-qt-includes=/usr/include/qt3/ --with-qt-libraries=/usr/lib/qt3/ --enable-mt --disable-rpath
build: build-stamp
build-stamp: config.status
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -48,10 +40,25 @@ build-stamp: config.status
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-qt-includes=/usr/include/qt3/ --with-qt-libraries=/usr/lib/qt3/ --enable-mt --disable-rpath
build: build-stamp
build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
$(MAKE)
#/usr/bin/docbook-to-man debian/knutclient.sgml > knutclient.1
@ -61,26 +68,10 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f build-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
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
dh_clean po/*gmo

@ -33,7 +33,7 @@ else
CFLAGS += -O2
endif
config.status: configure
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -41,7 +41,9 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@ -63,21 +65,12 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f build-stamp
# Add here commands to clean up after the build process.
-$(MAKE) distclean
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
dh_clean
rm -f config.log config.guess config.sub
install: build

@ -36,27 +36,7 @@ endif
debian/debiandirs: admin/debianrules
perl -w admin/debianrules echodirs > debian/debiandirs
patch-stamp:
# Apply Debian specific patches
if test ! -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo APPLYING PATCH\: $${patch##*/};\
patch -p1 < $$patch ;\
done ;\
touch patch-stamp ;\
fi
patch: patch-stamp
config.status: configure patch
dh_testdir
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build: build-stamp
build-stamp: config.status
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -64,9 +44,22 @@ build-stamp: config.status
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build: build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
@ -75,37 +68,11 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
rm -f build-stamp
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-$(MAKE) distclean
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
[ ! -f Makefile ] || $(MAKE) distclean
# Remove Debian specific patches
if test -f patch-stamp; then \
for patch in $(CURDIR)/debian/patches/*.diff ;\
do \
echo REMOVING PATCH\: $${patch##*/};\
patch -p1 -R < $$patch ;\
done ;\
rm -f patch-stamp ;\
fi
dh_clean
dh_clean
install: build
dh_testdir

@ -37,17 +37,17 @@ configure:
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# 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
PKG_CONFIG_PATH='/opt/trinity/lib/pkgconfig' ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-rpath
# Tricks for Intrepid
#--disable-kexif --enable-mt --x-includes=/usr/include/qt4/Qt

@ -29,7 +29,7 @@ endif
debian/ktechlab.xpm: icons/hi32-app-ktechlab.png
convert $< $@
config.status: configure.in
config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -37,26 +37,22 @@ config.status: configure.in
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity
build: build-stamp debian/ktechlab.xpm
build-stamp: config.status
dh_testdir
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
touch build-stamp
@ -65,20 +61,9 @@ clean:
dh_testroot
rm -f build-stamp
[ ! -f po/Makefile ] || $(MAKE) -C po clean
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
[ ! -f Makefile ] || $(MAKE) distclean
rm -f config.log debian/ktechlab.xpm config.sub config.guess
dh_clean
dh_clean
install: build
dh_testdir

@ -32,7 +32,7 @@ post-patches::
dh_testdir
config: post-patches config-stamp
config-stamp: configure
config-stamp:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@ -40,17 +40,16 @@ config-stamp: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \
@ -69,21 +68,12 @@ clean::
dh_testdir
dh_testroot
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
rm -f config-stamp build-stamp
rm -f config-stamp build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
rm -f po/*.gmo
rm -f src/common/global/svn_revision/svn_revision.h
rm -f config.sub config.guess config.status config.log
dh_clean
dh_clean
install: build-stamp
dh_testdir

@ -40,7 +40,13 @@ config.status:
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
dh_testdir
@ -61,16 +67,9 @@ clean:
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
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
rm -f po/*.gmo
dh_clean --exclude ./src/potracegui.cpp.orig
install: build

@ -36,8 +36,8 @@ debian/tderadio.xpm: tderadio3/icons/hi32-app-tderadio.png
configure:
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cat /usr/share/aclocal/libtool.m4 > admin/libtool.m4.in
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.sub admin/config.sub
cp -f /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common

@ -32,32 +32,7 @@ else
CXXFLAGS += -O2
endif
apply-patches:
#apply patches first
QUILT_PATCHES="debian/patches" quilt push -a -v
#regenerate the acinclude file with the "Debian" libtool
cp -a /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cat admin/acinclude.m4.in admin/libtool.m4.in >acinclude.m4
#this will update the config.{sub,guess} and ltmain.sh files
libtoolize -c -f
# then, autoreconf with some tde magic
autoreconf -v -i
perl -w admin/am_edit
update-autoconf:
cp -a /usr/share/misc/config.sub admin/
cp -a /usr/share/misc/config.guess admin/
svn-number:
sed -e "s/svn[^-]*-/svn`svn info | \
grep "^Revision" | \
sed -e "s/Revision: //"`-/" debian/changelog > new_changelog
mv new_changelog debian/changelog
config.status: configure
config.status:
dh_testdir
# this makes the file more recent than configure and avoid make calling
@ -68,6 +43,8 @@ config.status: configure
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -p /usr/share/misc/config.sub admin/config.sub
cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
@ -102,14 +79,6 @@ clean:
dh_testroot
rm -f build-stamp
! [ -f /usr/share/libtool/ltmain.sh ] || \
cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
rm -f libtool config.log
@ -131,9 +100,6 @@ install: build
admin/mkinstalldirs debian/tmp/opt/trinity/share/icons/hicolor/scalable/mimetypes
install -c -p -m 644 -T icons/tellico_mime.svg debian/tmp/opt/trinity/share/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
# Remove dead symlink from French translation
rm debian/tmp/opt/trinity/share/doc/tde/HTML/fr/tellico/common
# Build architecture-independent files here.
binary-indep: build install

@ -36,17 +36,17 @@ configure:
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.sub admin/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.guess admin/config.guess
endif
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-rpath
# Tricks for Intrepid
#--disable-kexif --enable-mt --x-includes=/usr/include/qt4/Qt

Loading…
Cancel
Save