X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=qtc_packaging%2Fdebian_harmattan%2Frules;fp=qtc_packaging%2Fdebian_harmattan%2Frules;h=3273a265dcc9a001962af4fcd76968fa416770ce;hb=a39e35febe1d76a81b5c4ac452ac64309d1bc622;hp=eeb9a8be69845d9672441e35911bffa1c822fdbb;hpb=2beca638f4ba146e25320c9c07cc1f29d0b2bba2;p=vicar

diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
index eeb9a8b..3273a26 100755
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@ -62,11 +62,7 @@ binary-arch: build install
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
-<<<<<<< HEAD
 #	dh_installexamples
-=======
-	dh_installexamples
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 #	dh_install
 #	dh_installmenu
 #	dh_installdebconf	
@@ -78,25 +74,15 @@ binary-arch: build install
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
-<<<<<<< HEAD
 #	dh_installman
 	dh_link
 	dh_strip #Uncomment to remove debug symbols
-=======
-	dh_installman
-	dh_link
-	dh_strip
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 	dh_compress
 	dh_fixperms
 #	dh_perl
 #	dh_makeshlibs
 	dh_installdeb
-<<<<<<< HEAD
 	dh_shlibdeps # Uncomment this line for use without Qt Creator
-=======
-	# dh_shlibdeps # Uncomment this line for use without Qt Creator
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb