summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdeedu
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2013-12-28 17:33:59 +0100
committerFrançois Andriot <[email protected]>2013-12-28 17:33:59 +0100
commitc55ee4f291ee28be12e57a83d59b050f3952258b (patch)
tree10117c9ac14def142e3fe5d08fa0398551bc3ed2 /ubuntu/maverick/tdeedu
parentf2b702ffebf729f632c9fe8dadd8fa06660832d7 (diff)
parent14678cd6ebf2082117de9d69854cd4f7b631f83b (diff)
downloadtde-packaging-c55ee4f291ee28be12e57a83d59b050f3952258b.tar.gz
tde-packaging-c55ee4f291ee28be12e57a83d59b050f3952258b.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdeedu')
-rwxr-xr-xubuntu/maverick/tdeedu/debian/rules2
-rw-r--r--ubuntu/maverick/tdeedu/debian/source/format2
2 files changed, 2 insertions, 2 deletions
diff --git a/ubuntu/maverick/tdeedu/debian/rules b/ubuntu/maverick/tdeedu/debian/rules
index c457b98e2..e141e830c 100755
--- a/ubuntu/maverick/tdeedu/debian/rules
+++ b/ubuntu/maverick/tdeedu/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/tdeedu/debian/source/format b/ubuntu/maverick/tdeedu/debian/source/format
index 89ae9db8f..163aaf8d8 100644
--- a/ubuntu/maverick/tdeedu/debian/source/format
+++ b/ubuntu/maverick/tdeedu/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)