X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=0d1abf8657771eaff10c260f9a9633a5c17e60b6;hb=484c83ff60fc5a427dd9e18be1c504d3dbb6e337;hp=7daedf5eaae4199be34a45b34b6ca361bcfedcb2;hpb=84699f73cf8f038a0bafeeab65a152a0b6dfa158;p=gosa.git

diff --git a/debian/rules b/debian/rules
index 7daedf5ea..0d1abf865 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Cristoph Lameter.
 
-SARGE_PACKAGE=`cat debian/changelog  | head -n1 | grep sarge`
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -88,21 +87,16 @@ install-stamp:
 	-cp -R debian/gosa-desktop.desktop debian/gosa-desktop/usr/share/applications/gosa.desktop
 	-rm -rf debian/gosa/usr/share/gosa/contrib
 	-rm -rf debian/gosa/usr/share/gosa/locale/en
-	-rm -rf debian/gosa/usr/share/gosa/gen_locale.sh
-	-rm -rf debian/gosa/usr/share/gosa/gen_pdf_help.sh
+	-rm -rf debian/gosa/usr/share/gosa/update-locale
+	-rm -rf debian/gosa/usr/share/gosa/update-pdf-help
 	-rm -rf debian/gosa/usr/share/gosa/patch-stamp
-	-rm -rf debian/gosa/usr/share/gosa/gen_locale_mo.sh
-	-rm -rf debian/gosa/usr/share/gosa/gen_online_help.sh
-	-rm -rf debian/gosa/usr/share/gosa/gen_function_list.php
-	-rm -rf debian/gosa/usr/share/gosa/update.sh
+	-rm -rf debian/gosa/usr/share/gosa/update-online-help
 	-rm -rf debian/gosa/usr/share/doc/gosa/guide*
 	sed 's%"CONFIG_TEMPLATE_DIR", "../contrib/"%"CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa/contrib/"%g' debian/gosa/usr/share/gosa/include/functions.inc > debian/gosa/usr/share/gosa/include/functions.inc.new; \
 	mv debian/gosa/usr/share/gosa/include/functions.inc.new debian/gosa/usr/share/gosa/include/functions.inc;
-	-if [ -z "${SARGE_PACKAGE}" ]; then \
-		rm -rf debian/gosa/usr/share/gosa/include/smarty; \
-		sed 's%require("smarty/Smarty.class.php");%require("/usr/share/php/smarty/libs/Smarty.class.php");%g' debian/gosa/usr/share/gosa/include/php_setup.inc > debian/gosa/usr/share/gosa/include/php_setup.inc.new; \
-		mv debian/gosa/usr/share/gosa/include/php_setup.inc.new debian/gosa/usr/share/gosa/include/php_setup.inc; \
-	fi
+	rm -rf debian/gosa/usr/share/gosa/include/smarty; \
+	sed 's%require("smarty/Smarty.class.php");%require("/usr/share/php/smarty/libs/Smarty.class.php");%g' debian/gosa/usr/share/gosa/include/php_setup.inc > debian/gosa/usr/share/gosa/include/php_setup.inc.new; \
+	mv debian/gosa/usr/share/gosa/include/php_setup.inc.new debian/gosa/usr/share/gosa/include/php_setup.inc; \
 	install -D -m 644 debian/overrides-lintian debian/gosa/usr/share/lintian/overrides/gosa
 	install -D -m 644 debian/overrides-linda debian/gosa/usr/share/linda/overrides/gosa
 	touch install-stamp
@@ -133,11 +127,7 @@ binary-indep: install
 	cd debian/gosa && find ./etc -type f -print | sed -e 's#^./#/#' > DEBIAN/conffiles
 	chmod 644 debian/gosa/DEBIAN/conffiles
 
-	-if [ -z "${SARGE_PACKAGE}" ]; then \
-		dh_gencontrol; \
-	else \
-		dh_gencontrol -- -cdebian/control.sarge; \
-	fi
+	dh_gencontrol
 	dh_md5sums
 	dh_builddeb