[Gnash-commit] /srv/bzr/gnash/trunk r11911: correctly install the sysconf files, gnashrc, gnashpluginrc, and cygnalrc.

[Rob Savoye]

------------------------------------------------------------
revno: 11911
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Fri 2010-02-05 10:50:01 -0700
message:
  correctly install the sysconf files, gnashrc, gnashpluginrc, and cygnalrc.
modified:
  packaging/debian/gnash-cygnal.install
  packaging/debian/gnash.install
  packaging/debian/mozilla-plugin-gnash.dirs
  packaging/debian/mozilla-plugin-gnash.install
  packaging/debian/rules

=== modified file 'packaging/debian/gnash-cygnal.install'
--- a/packaging/debian/gnash-cygnal.install     2010-02-02 23:55:38 +0000
+++ b/packaging/debian/gnash-cygnal.install     2010-02-05 17:50:01 +0000
@@ -1,3 +1,4 @@
+/etc/cygnalrc
 usr/bin/cygnal
 usr/lib/cygnal/plugins/*.so
 usr/share/man/man1/cygnal.1

=== modified file 'packaging/debian/gnash.install'
--- a/packaging/debian/gnash.install    2010-02-05 01:44:54 +0000
+++ b/packaging/debian/gnash.install    2010-02-05 17:50:01 +0000
@@ -1,4 +1,4 @@
 usr/bin/gtk-gnash
 usr/share/man/man1/gtk-gnash.1*
 usr/share/applications/gnash.desktop
-usr/etc/gnashrc /etc/
\ No newline at end of file
+etc/gnashrc

=== modified file 'packaging/debian/mozilla-plugin-gnash.dirs'
--- a/packaging/debian/mozilla-plugin-gnash.dirs        2010-02-05 01:44:54 
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.dirs        2010-02-05 17:50:01 
+0000
@@ -1,2 +1,2 @@
-usr/etc
-usr/lib/mozilla/plugins
\ No newline at end of file
+usr/lib/mozilla/plugins
+etc

=== modified file 'packaging/debian/mozilla-plugin-gnash.install'
--- a/packaging/debian/mozilla-plugin-gnash.install     2010-02-05 01:44:54 
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.install     2010-02-05 17:50:01 
+0000
@@ -1,2 +1,2 @@
 usr/lib*/*/plugins/libgnashplugin.so
-usr/etc/gnashpluginrc /etc/
+etc/gnashpluginrc

=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules    2010-02-05 01:44:54 +0000
+++ b/packaging/debian/rules    2010-02-05 17:50:01 +0000
@@ -21,7 +21,6 @@
        CXXFLAGS += -O0
 else
        CFLAGS += -O2
-       CXXFLAGS += -O2
 endif
 
 DEB_DH_SHLIBDEPS_ARGS_ALL := -X* /usr/lib/gnash
@@ -52,12 +51,13 @@
        cp -f /usr/share/misc/config.guess config.guess
 endif
 
-       # for now, only build the kde4 support,as kde3 is being depreciated.
+       # for now, 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) \
                --prefix=/usr \
+               --sysconfdir=/etc \
                --mandir=/usr/share/man \
                --infodir=/usr/share/info \
                --disable-dependency-tracking \
@@ -69,7 +69,6 @@
                --enable-sdkinstall \
                --disable-testsuite \
                --enable-media=gst \
-               --enable-docbook \
                --enable-gui=gtk,kde4 \
                --enable-renderer=agg \
                --with-plugins-install=system
@@ -175,6 +174,7 @@
 #      dh_installmime
        dh_installman
        dh_desktop
+       dh_lintian
        dh_link
        dh_strip --dbg-package=gnash-dbg
        dh_compress