[Gnash-commit] /srv/bzr/gnash/trunk r10588: modify install paths for kde4 on ubuntu.

[rob]

------------------------------------------------------------
revno: 10588
committer: address@hidden
branch nick: trunk
timestamp: Sun 2009-02-15 08:37:35 -0700
message:
  modify install paths for kde4 on ubuntu.
modified:
  packaging/debian/gnash-klash.install
  packaging/debian/konqueror-plugin-gnash.install
  packaging/debian/rules

=== modified file 'packaging/debian/gnash-klash.install'
--- a/packaging/debian/gnash-klash.install      2009-02-15 00:33:12 +0000
+++ b/packaging/debian/gnash-klash.install      2009-02-15 15:37:35 +0000
@@ -1,4 +1,4 @@
-usr/share/apps/klash/*
+usr/share/kde4/apps/klash/*
 usr/lib/kde4/*
-usr/bin/kde-gnash
-usr/share/services/klash_part.desktop
+usr/bin/kde4-gnash
+usr/share/kde4/services/klash_part.desktop

=== modified file 'packaging/debian/konqueror-plugin-gnash.install'
--- a/packaging/debian/konqueror-plugin-gnash.install   2009-02-15 00:33:12 
+0000
+++ b/packaging/debian/konqueror-plugin-gnash.install   2009-02-15 15:37:35 
+0000
@@ -1,4 +1,4 @@
 usr/lib/kde4/libklashpart.so
 usr/lib/kde4/libklashpart.la
-usr/share/apps/klash
-usr/share/services/[Kk]lash*
+usr/share/kde4/apps/klash
+usr/share/kde4/services/[Kk]lash*

=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules    2009-02-15 00:33:12 +0000
+++ b/packaging/debian/rules    2009-02-15 15:37:35 +0000
@@ -50,6 +50,8 @@
        ./autogen.sh
        @printf "\n -------------------------------------------- End of AUTOGEN 
---- \n\n"
 
+       # for now, only build the kde4 support,as kde3 is being depreciated.
+
        @printf "\n == CONFIGURE 
=================================================== \n\n"
        ./configure CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
                --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -62,12 +64,7 @@
                --enable-media=ffmpeg \
                --enable-gui=gtk,kde4 \
                --enable-renderer=agg \
-               --with-npapi-plugindir=/usr/lib/mozilla/plugins
-#              --with-kde4-plugindir=/usr/lib/kde4/plugins \
-#              --with-kde4-pluginprefix=/usr \
-#              --with-kde4-servicesdir=/usr/share/kde4/services \
-#              --with-kde4-appsdatadir=/usr/share/kde4/apps/klash \
-#              --with-kde4-configdir=/usr/share/kde4/config
+               --with-plugins-install=system
 
        @printf "\n ------------------------------------------- End of 
CONFIGURE ---- \n\n"
 
@@ -195,7 +192,7 @@
        dh_fixperms
        dh_makeshlibs
        dh_installdeb
-       dh_shlibdeps
+#      dh_shlibdeps
        dh_gencontrol
        dh_md5sums
        dh_builddeb