summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-01-15 03:49:37 +0100
committerSlávek Banko <slavek.banko@axis.cz>2015-01-15 03:49:37 +0100
commit47dff09e22d601a9efe65b4e25b06d1d3a1f1926 (patch)
tree5be08ff36ed66d555d9de778d671c4832d1e10d7
parent463fd82feef90aef17b16b5b028b4e0b6eb32e5e (diff)
downloadtde-packaging-47dff09e22d601a9efe65b4e25b06d1d3a1f1926.tar.gz
tde-packaging-47dff09e22d601a9efe65b4e25b06d1d3a1f1926.zip
Fix regeneration of automake build system on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rwxr-xr-xdebian/lenny/applications/basket/debian/rules7
-rwxr-xr-xdebian/lenny/applications/kchmviewer/debian/rules8
-rwxr-xr-xdebian/lenny/applications/kcpuload/debian/rules24
-rwxr-xr-xdebian/lenny/applications/kdbusnotification/debian/rules24
-rwxr-xr-xdebian/lenny/applications/kmyfirewall/debian/rules27
-rwxr-xr-xdebian/lenny/applications/knights/debian/rules17
-rwxr-xr-xdebian/lenny/applications/knowit/debian/rules15
-rwxr-xr-xdebian/lenny/applications/knutclient/debian/rules45
-rwxr-xr-xdebian/lenny/applications/kpicosim/debian/rules21
-rwxr-xr-xdebian/lenny/applications/ksplash-engine-moodin/debian/rules67
-rwxr-xr-xdebian/lenny/applications/ksquirrel/debian/rules12
-rwxr-xr-xdebian/lenny/applications/ktechlab/debian/rules31
-rwxr-xr-xdebian/lenny/applications/piklab/debian/rules26
-rwxr-xr-xdebian/lenny/applications/potracegui/debian/rules15
-rwxr-xr-xdebian/lenny/applications/tderadio/debian/rules4
-rwxr-xr-xdebian/lenny/applications/tellico/debian/rules40
-rwxr-xr-xdebian/lenny/libraries/libksquirrel/debian/rules14
-rwxr-xr-xdebian/squeeze/applications/basket/debian/rules7
-rwxr-xr-xdebian/squeeze/applications/kchmviewer/debian/rules8
-rwxr-xr-xdebian/squeeze/applications/kcpuload/debian/rules24
-rwxr-xr-xdebian/squeeze/applications/kdbusnotification/debian/rules24
-rwxr-xr-xdebian/squeeze/applications/kmyfirewall/debian/rules27
-rwxr-xr-xdebian/squeeze/applications/knights/debian/rules17
-rwxr-xr-xdebian/squeeze/applications/knowit/debian/rules15
-rwxr-xr-xdebian/squeeze/applications/knutclient/debian/rules45
-rwxr-xr-xdebian/squeeze/applications/kpicosim/debian/rules21
-rwxr-xr-xdebian/squeeze/applications/ksplash-engine-moodin/debian/rules67
-rwxr-xr-xdebian/squeeze/applications/ksquirrel/debian/rules12
-rwxr-xr-xdebian/squeeze/applications/ktechlab/debian/rules31
-rwxr-xr-xdebian/squeeze/applications/piklab/debian/rules26
-rwxr-xr-xdebian/squeeze/applications/potracegui/debian/rules15
-rwxr-xr-xdebian/squeeze/applications/tderadio/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/tellico/debian/rules40
-rwxr-xr-xdebian/squeeze/libraries/libksquirrel/debian/rules14
-rwxr-xr-xubuntu/maverick/applications/basket/debian/rules7
-rwxr-xr-xubuntu/maverick/applications/kchmviewer/debian/rules8
-rwxr-xr-xubuntu/maverick/applications/kcpuload/debian/rules24
-rwxr-xr-xubuntu/maverick/applications/kdbusnotification/debian/rules24
-rwxr-xr-xubuntu/maverick/applications/kmyfirewall/debian/rules27
-rwxr-xr-xubuntu/maverick/applications/knights/debian/rules17
-rwxr-xr-xubuntu/maverick/applications/knowit/debian/rules15
-rwxr-xr-xubuntu/maverick/applications/knutclient/debian/rules45
-rwxr-xr-xubuntu/maverick/applications/kpicosim/debian/rules21
-rwxr-xr-xubuntu/maverick/applications/ksplash-engine-moodin/debian/rules67
-rwxr-xr-xubuntu/maverick/applications/ksquirrel/debian/rules12
-rwxr-xr-xubuntu/maverick/applications/ktechlab/debian/rules31
-rwxr-xr-xubuntu/maverick/applications/piklab/debian/rules26
-rwxr-xr-xubuntu/maverick/applications/potracegui/debian/rules15
-rwxr-xr-xubuntu/maverick/applications/tderadio/debian/rules4
-rwxr-xr-xubuntu/maverick/applications/tellico/debian/rules40
-rwxr-xr-xubuntu/maverick/libraries/libksquirrel/debian/rules14
51 files changed, 336 insertions, 855 deletions
diff --git a/debian/lenny/applications/basket/debian/rules b/debian/lenny/applications/basket/debian/rules
index 4e6833463..9513fe081 100755
--- a/debian/lenny/applications/basket/debian/rules
+++ b/debian/lenny/applications/basket/debian/rules
@@ -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;
diff --git a/debian/lenny/applications/kchmviewer/debian/rules b/debian/lenny/applications/kchmviewer/debian/rules
index f9da12f7f..75422d3a2 100755
--- a/debian/lenny/applications/kchmviewer/debian/rules
+++ b/debian/lenny/applications/kchmviewer/debian/rules
@@ -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)
diff --git a/debian/lenny/applications/kcpuload/debian/rules b/debian/lenny/applications/kcpuload/debian/rules
index 385c24313..83e0a5113 100755
--- a/debian/lenny/applications/kcpuload/debian/rules
+++ b/debian/lenny/applications/kcpuload/debian/rules
@@ -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)
diff --git a/debian/lenny/applications/kdbusnotification/debian/rules b/debian/lenny/applications/kdbusnotification/debian/rules
index 94d0ad5bd..842cf0eb8 100755
--- a/debian/lenny/applications/kdbusnotification/debian/rules
+++ b/debian/lenny/applications/kdbusnotification/debian/rules
@@ -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)
diff --git a/debian/lenny/applications/kmyfirewall/debian/rules b/debian/lenny/applications/kmyfirewall/debian/rules
index 28035c796..5894cdd46 100755
--- a/debian/lenny/applications/kmyfirewall/debian/rules
+++ b/debian/lenny/applications/kmyfirewall/debian/rules
@@ -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
diff --git a/debian/lenny/applications/knights/debian/rules b/debian/lenny/applications/knights/debian/rules
index f4f406c79..26d343f49 100755
--- a/debian/lenny/applications/knights/debian/rules
+++ b/debian/lenny/applications/knights/debian/rules
@@ -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
diff --git a/debian/lenny/applications/knowit/debian/rules b/debian/lenny/applications/knowit/debian/rules
index 0a090fdb6..07ea32c92 100755
--- a/debian/lenny/applications/knowit/debian/rules
+++ b/debian/lenny/applications/knowit/debian/rules
@@ -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
diff --git a/debian/lenny/applications/knutclient/debian/rules b/debian/lenny/applications/knutclient/debian/rules
index 0d07992cf..761c5e63c 100755
--- a/debian/lenny/applications/knutclient/debian/rules
+++ b/debian/lenny/applications/knutclient/debian/rules
@@ -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
diff --git a/debian/lenny/applications/kpicosim/debian/rules b/debian/lenny/applications/kpicosim/debian/rules
index 0a03f424b..41b9123f6 100755
--- a/debian/lenny/applications/kpicosim/debian/rules
+++ b/debian/lenny/applications/kpicosim/debian/rules
@@ -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
diff --git a/debian/lenny/applications/ksplash-engine-moodin/debian/rules b/debian/lenny/applications/ksplash-engine-moodin/debian/rules
index c41d87b76..4542a777a 100755
--- a/debian/lenny/applications/ksplash-engine-moodin/debian/rules
+++ b/debian/lenny/applications/ksplash-engine-moodin/debian/rules
@@ -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
diff --git a/debian/lenny/applications/ksquirrel/debian/rules b/debian/lenny/applications/ksquirrel/debian/rules
index f59e43351..910ff24b6 100755
--- a/debian/lenny/applications/ksquirrel/debian/rules
+++ b/debian/lenny/applications/ksquirrel/debian/rules
@@ -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
diff --git a/debian/lenny/applications/ktechlab/debian/rules b/debian/lenny/applications/ktechlab/debian/rules
index 227674f7f..f42172741 100755
--- a/debian/lenny/applications/ktechlab/debian/rules
+++ b/debian/lenny/applications/ktechlab/debian/rules
@@ -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
diff --git a/debian/lenny/applications/piklab/debian/rules b/debian/lenny/applications/piklab/debian/rules
index 347c2e51c..682577276 100755
--- a/debian/lenny/applications/piklab/debian/rules
+++ b/debian/lenny/applications/piklab/debian/rules
@@ -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
diff --git a/debian/lenny/applications/potracegui/debian/rules b/debian/lenny/applications/potracegui/debian/rules
index 4b268883c..2f8675d9f 100755
--- a/debian/lenny/applications/potracegui/debian/rules
+++ b/debian/lenny/applications/potracegui/debian/rules
@@ -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
diff --git a/debian/lenny/applications/tderadio/debian/rules b/debian/lenny/applications/tderadio/debian/rules
index faad3984a..424c44789 100755
--- a/debian/lenny/applications/tderadio/debian/rules
+++ b/debian/lenny/applications/tderadio/debian/rules
@@ -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
diff --git a/debian/lenny/applications/tellico/debian/rules b/debian/lenny/applications/tellico/debian/rules
index 72778a1fd..118fb52ac 100755
--- a/debian/lenny/applications/tellico/debian/rules
+++ b/debian/lenny/applications/tellico/debian/rules
@@ -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
diff --git a/debian/lenny/libraries/libksquirrel/debian/rules b/debian/lenny/libraries/libksquirrel/debian/rules
index f5bc572dc..3acf1adef 100755
--- a/debian/lenny/libraries/libksquirrel/debian/rules
+++ b/debian/lenny/libraries/libksquirrel/debian/rules
@@ -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
diff --git a/debian/squeeze/applications/basket/debian/rules b/debian/squeeze/applications/basket/debian/rules
index 323c98d9a..f1e6a0465 100755
--- a/debian/squeeze/applications/basket/debian/rules
+++ b/debian/squeeze/applications/basket/debian/rules
@@ -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;
diff --git a/debian/squeeze/applications/kchmviewer/debian/rules b/debian/squeeze/applications/kchmviewer/debian/rules
index f9da12f7f..75422d3a2 100755
--- a/debian/squeeze/applications/kchmviewer/debian/rules
+++ b/debian/squeeze/applications/kchmviewer/debian/rules
@@ -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)
diff --git a/debian/squeeze/applications/kcpuload/debian/rules b/debian/squeeze/applications/kcpuload/debian/rules
index 385c24313..83e0a5113 100755
--- a/debian/squeeze/applications/kcpuload/debian/rules
+++ b/debian/squeeze/applications/kcpuload/debian/rules
@@ -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)
diff --git a/debian/squeeze/applications/kdbusnotification/debian/rules b/debian/squeeze/applications/kdbusnotification/debian/rules
index 94d0ad5bd..842cf0eb8 100755
--- a/debian/squeeze/applications/kdbusnotification/debian/rules
+++ b/debian/squeeze/applications/kdbusnotification/debian/rules
@@ -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)
diff --git a/debian/squeeze/applications/kmyfirewall/debian/rules b/debian/squeeze/applications/kmyfirewall/debian/rules
index 28035c796..5894cdd46 100755
--- a/debian/squeeze/applications/kmyfirewall/debian/rules
+++ b/debian/squeeze/applications/kmyfirewall/debian/rules
@@ -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
diff --git a/debian/squeeze/applications/knights/debian/rules b/debian/squeeze/applications/knights/debian/rules
index f4f406c79..26d343f49 100755
--- a/debian/squeeze/applications/knights/debian/rules
+++ b/debian/squeeze/applications/knights/debian/rules
@@ -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
diff --git a/debian/squeeze/applications/knowit/debian/rules b/debian/squeeze/applications/knowit/debian/rules
index 0a090fdb6..07ea32c92 100755
--- a/debian/squeeze/applications/knowit/debian/rules
+++ b/debian/squeeze/applications/knowit/debian/rules
@@ -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
diff --git a/debian/squeeze/applications/knutclient/debian/rules b/debian/squeeze/applications/knutclient/debian/rules
index 0d07992cf..761c5e63c 100755
--- a/debian/squeeze/applications/knutclient/debian/rules
+++ b/debian/squeeze/applications/knutclient/debian/rules
@@ -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
diff --git a/debian/squeeze/applications/kpicosim/debian/rules b/debian/squeeze/applications/kpicosim/debian/rules
index 0a03f424b..41b9123f6 100755
--- a/debian/squeeze/applications/kpicosim/debian/rules
+++ b/debian/squeeze/applications/kpicosim/debian/rules
@@ -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
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/rules b/debian/squeeze/applications/ksplash-engine-moodin/debian/rules
index c41d87b76..4542a777a 100755
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/rules
+++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/rules
@@ -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
diff --git a/debian/squeeze/applications/ksquirrel/debian/rules b/debian/squeeze/applications/ksquirrel/debian/rules
index f59e43351..910ff24b6 100755
--- a/debian/squeeze/applications/ksquirrel/debian/rules
+++ b/debian/squeeze/applications/ksquirrel/debian/rules
@@ -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
diff --git a/debian/squeeze/applications/ktechlab/debian/rules b/debian/squeeze/applications/ktechlab/debian/rules
index 227674f7f..f42172741 100755
--- a/debian/squeeze/applications/ktechlab/debian/rules
+++ b/debian/squeeze/applications/ktechlab/debian/rules
@@ -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
diff --git a/debian/squeeze/applications/piklab/debian/rules b/debian/squeeze/applications/piklab/debian/rules
index bd2651dca..82134f449 100755
--- a/debian/squeeze/applications/piklab/debian/rules
+++ b/debian/squeeze/applications/piklab/debian/rules
@@ -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
diff --git a/debian/squeeze/applications/potracegui/debian/rules b/debian/squeeze/applications/potracegui/debian/rules
index 4b268883c..2f8675d9f 100755
--- a/debian/squeeze/applications/potracegui/debian/rules
+++ b/debian/squeeze/applications/potracegui/debian/rules
@@ -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
diff --git a/debian/squeeze/applications/tderadio/debian/rules b/debian/squeeze/applications/tderadio/debian/rules
index faad3984a..424c44789 100755
--- a/debian/squeeze/applications/tderadio/debian/rules
+++ b/debian/squeeze/applications/tderadio/debian/rules
@@ -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
diff --git a/debian/squeeze/applications/tellico/debian/rules b/debian/squeeze/applications/tellico/debian/rules
index 72778a1fd..118fb52ac 100755
--- a/debian/squeeze/applications/tellico/debian/rules
+++ b/debian/squeeze/applications/tellico/debian/rules
@@ -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
diff --git a/debian/squeeze/libraries/libksquirrel/debian/rules b/debian/squeeze/libraries/libksquirrel/debian/rules
index f5bc572dc..3acf1adef 100755
--- a/debian/squeeze/libraries/libksquirrel/debian/rules
+++ b/debian/squeeze/libraries/libksquirrel/debian/rules
@@ -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
diff --git a/ubuntu/maverick/applications/basket/debian/rules b/ubuntu/maverick/applications/basket/debian/rules
index 323c98d9a..f1e6a0465 100755
--- a/ubuntu/maverick/applications/basket/debian/rules
+++ b/ubuntu/maverick/applications/basket/debian/rules
@@ -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;
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/rules b/ubuntu/maverick/applications/kchmviewer/debian/rules
index f9da12f7f..75422d3a2 100755
--- a/ubuntu/maverick/applications/kchmviewer/debian/rules
+++ b/ubuntu/maverick/applications/kchmviewer/debian/rules
@@ -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)
diff --git a/ubuntu/maverick/applications/kcpuload/debian/rules b/ubuntu/maverick/applications/kcpuload/debian/rules
index 385c24313..83e0a5113 100755
--- a/ubuntu/maverick/applications/kcpuload/debian/rules
+++ b/ubuntu/maverick/applications/kcpuload/debian/rules
@@ -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)
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/rules b/ubuntu/maverick/applications/kdbusnotification/debian/rules
index 94d0ad5bd..842cf0eb8 100755
--- a/ubuntu/maverick/applications/kdbusnotification/debian/rules
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/rules
@@ -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)
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/rules b/ubuntu/maverick/applications/kmyfirewall/debian/rules
index 28035c796..5894cdd46 100755
--- a/ubuntu/maverick/applications/kmyfirewall/debian/rules
+++ b/ubuntu/maverick/applications/kmyfirewall/debian/rules
@@ -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
diff --git a/ubuntu/maverick/applications/knights/debian/rules b/ubuntu/maverick/applications/knights/debian/rules
index f4f406c79..26d343f49 100755
--- a/ubuntu/maverick/applications/knights/debian/rules
+++ b/ubuntu/maverick/applications/knights/debian/rules
@@ -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
diff --git a/ubuntu/maverick/applications/knowit/debian/rules b/ubuntu/maverick/applications/knowit/debian/rules
index 0a090fdb6..07ea32c92 100755
--- a/ubuntu/maverick/applications/knowit/debian/rules
+++ b/ubuntu/maverick/applications/knowit/debian/rules
@@ -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
diff --git a/ubuntu/maverick/applications/knutclient/debian/rules b/ubuntu/maverick/applications/knutclient/debian/rules
index 0d07992cf..761c5e63c 100755
--- a/ubuntu/maverick/applications/knutclient/debian/rules
+++ b/ubuntu/maverick/applications/knutclient/debian/rules
@@ -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
diff --git a/ubuntu/maverick/applications/kpicosim/debian/rules b/ubuntu/maverick/applications/kpicosim/debian/rules
index 0a03f424b..41b9123f6 100755
--- a/ubuntu/maverick/applications/kpicosim/debian/rules
+++ b/ubuntu/maverick/applications/kpicosim/debian/rules
@@ -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
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules
index c41d87b76..4542a777a 100755
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules
+++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules
@@ -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
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/rules b/ubuntu/maverick/applications/ksquirrel/debian/rules
index f59e43351..910ff24b6 100755
--- a/ubuntu/maverick/applications/ksquirrel/debian/rules
+++ b/ubuntu/maverick/applications/ksquirrel/debian/rules
@@ -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
diff --git a/ubuntu/maverick/applications/ktechlab/debian/rules b/ubuntu/maverick/applications/ktechlab/debian/rules
index 227674f7f..f42172741 100755
--- a/ubuntu/maverick/applications/ktechlab/debian/rules
+++ b/ubuntu/maverick/applications/ktechlab/debian/rules
@@ -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
diff --git a/ubuntu/maverick/applications/piklab/debian/rules b/ubuntu/maverick/applications/piklab/debian/rules
index bd2651dca..82134f449 100755
--- a/ubuntu/maverick/applications/piklab/debian/rules
+++ b/ubuntu/maverick/applications/piklab/debian/rules
@@ -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
diff --git a/ubuntu/maverick/applications/potracegui/debian/rules b/ubuntu/maverick/applications/potracegui/debian/rules
index 4b268883c..2f8675d9f 100755
--- a/ubuntu/maverick/applications/potracegui/debian/rules
+++ b/ubuntu/maverick/applications/potracegui/debian/rules
@@ -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
diff --git a/ubuntu/maverick/applications/tderadio/debian/rules b/ubuntu/maverick/applications/tderadio/debian/rules
index faad3984a..424c44789 100755
--- a/ubuntu/maverick/applications/tderadio/debian/rules
+++ b/ubuntu/maverick/applications/tderadio/debian/rules
@@ -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
diff --git a/ubuntu/maverick/applications/tellico/debian/rules b/ubuntu/maverick/applications/tellico/debian/rules
index 72778a1fd..118fb52ac 100755
--- a/ubuntu/maverick/applications/tellico/debian/rules
+++ b/ubuntu/maverick/applications/tellico/debian/rules
@@ -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
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/rules b/ubuntu/maverick/libraries/libksquirrel/debian/rules
index f5bc572dc..3acf1adef 100755
--- a/ubuntu/maverick/libraries/libksquirrel/debian/rules
+++ b/ubuntu/maverick/libraries/libksquirrel/debian/rules
@@ -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