summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-03-23 03:42:36 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-03-23 03:42:36 +0100
commit7ecb22ecd5a9320b51df276743638755d1a27802 (patch)
treec3270d27d1934e6c619e0ae5c9fa768f9ef19142 /ubuntu
parentc95176b234c55c2783654c2d81dc7327b09fc15e (diff)
downloadtde-packaging-7ecb22ecd5a9320b51df276743638755d1a27802.tar.gz
tde-packaging-7ecb22ecd5a9320b51df276743638755d1a27802.zip
Fix potential kdiff3 FTBFS on Debian and Ubuntu
Diffstat (limited to 'ubuntu')
-rwxr-xr-xubuntu/maverick/applications/kdiff3/debian/rules6
-rwxr-xr-xubuntu/precise/applications/kdiff3/debian/rules6
-rwxr-xr-xubuntu/raring/applications/kdiff3/debian/rules6
3 files changed, 9 insertions, 9 deletions
diff --git a/ubuntu/maverick/applications/kdiff3/debian/rules b/ubuntu/maverick/applications/kdiff3/debian/rules
index 4217a45e3..0252d28f2 100755
--- a/ubuntu/maverick/applications/kdiff3/debian/rules
+++ b/ubuntu/maverick/applications/kdiff3/debian/rules
@@ -4,6 +4,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
@@ -12,9 +15,6 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
-
post-patches:: debian/stamp-bootstrap
debian/stamp-bootstrap:
diff --git a/ubuntu/precise/applications/kdiff3/debian/rules b/ubuntu/precise/applications/kdiff3/debian/rules
index 4217a45e3..0252d28f2 100755
--- a/ubuntu/precise/applications/kdiff3/debian/rules
+++ b/ubuntu/precise/applications/kdiff3/debian/rules
@@ -4,6 +4,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
@@ -12,9 +15,6 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
-
post-patches:: debian/stamp-bootstrap
debian/stamp-bootstrap:
diff --git a/ubuntu/raring/applications/kdiff3/debian/rules b/ubuntu/raring/applications/kdiff3/debian/rules
index 4217a45e3..0252d28f2 100755
--- a/ubuntu/raring/applications/kdiff3/debian/rules
+++ b/ubuntu/raring/applications/kdiff3/debian/rules
@@ -4,6 +4,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
@@ -12,9 +15,6 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
-
post-patches:: debian/stamp-bootstrap
debian/stamp-bootstrap: