Merge branch 'master' of ssh://drop.maemo.org/git/vicar

[vicar] / qtc_packaging / debian_harmattan / rules

diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
index 3273a26..eeb9a8b 100755 (executable)
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@ -62,7 +62,11 @@ binary-arch: build install
        dh_testroot
        dh_installchangelogs 
        dh_installdocs
+<<<<<<< HEAD
 #      dh_installexamples
+=======
+       dh_installexamples
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 #      dh_install
 #      dh_installmenu
 #      dh_installdebconf       
@@ -74,15 +78,25 @@ 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