[Gnash-commit] gnash ./ChangeLog doc/C/Makefile.am packaging/d...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/21 22:55:06

Modified files:
        .              : ChangeLog 
        doc/C          : Makefile.am 
        packaging/debian: changelog rules 
        packaging/redhat: gnash.spec 

Log message:
        * doc/C/Makefile.am: Create the info dir if it doesn't exist.
        * packaging/debian/changelog: Add new entry and up the version.
        * packaging/redhat/gnash.spec: Up the minor version. Install the
        info file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.218&tr2=1.219&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/packaging/debian/changelog.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/packaging/debian/rules.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/packaging/redhat/gnash.spec.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.218 gnash/ChangeLog:1.219
--- gnash/ChangeLog:1.218       Fri Apr 21 17:20:55 2006
+++ gnash/ChangeLog     Fri Apr 21 22:55:04 2006
@@ -1,5 +1,17 @@
 2006-04-21  Rob Savoye  <address@hidden>
 
+       * doc/C/Makefile.am: Create the info dir if it doesn't exist.
+       * packaging/debian/changelog: Add new entry and up the version.
+       * packaging/redhat/gnash.spec: Up the minor version. Install the
+       info file.
+       
+       * packaging/debian/rules: Don't attempt to apply a patch that
+       doesn't exist. Install the info file.
+       * packaging/redhat/gnash.spec: Install the info file too.
+       * plugin/Makefile.am: Add npplat.h to the dist target.
+       * plugin/plugin.cpp: Don't include player.h, it's unused these
+       days.
+       
        * doc/xmldocs.make: Add the hook for installing and uninstalling
        the info file.
        * doc/C/Makefile.am: Install the info file.
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.20 gnash/doc/C/Makefile.am:1.21
--- gnash/doc/C/Makefile.am:1.20        Fri Apr 21 17:20:55 2006
+++ gnash/doc/C/Makefile.am     Fri Apr 21 22:55:04 2006
@@ -177,8 +177,13 @@
         gnash.html
 
 install-info-hook: gnash.info
-       $(INSTALL_DATA) gnash.info $(DESTDIR)$(infodir)/
-       install-info --menuentry="Gnash" --description="GNU Flash Player" 
--info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info
+       test -d "$(DESTDIR)$(infodir)" || $(mkinstalldirs) 
"$(DESTDIR)$(infodir)"
+       $(INSTALL_DATA) gnash.info $(DESTDIR)$(infodir)/gnash.info
+       if (install-info --version) >/dev/null 2>&1; then \
+          install-info --menuentry="Gnash" --description="GNU Flash Player" 
--info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info ; \
+       fi
+
+
 
 uninstall-info-hook:
        $(RM) $(DESTDIR)$(infodir)/gnash.info
Index: gnash/packaging/debian/changelog
diff -u gnash/packaging/debian/changelog:1.1 
gnash/packaging/debian/changelog:1.2
--- gnash/packaging/debian/changelog:1.1        Sat Apr  8 04:09:44 2006
+++ gnash/packaging/debian/changelog    Fri Apr 21 22:55:04 2006
@@ -1,4 +1,4 @@
-gnash (0.7-0) unstable; urgency=low
+gnash (0.7-1) unstable; urgency=low
 
   * Initial release Closes: #347352
 
@@ -8,3 +8,7 @@
 
  -- Rob Savoye <address@hidden>  Fri, 7 Apr 2006 4:20:00 +0600
 
+  * Revised to match how the plugin gets installed, and add klash.
+
+ -- Rob Savoye <address@hidden>  Fri, 21 Apr 2006 4:20:00 +0600
+
Index: gnash/packaging/debian/rules
diff -u gnash/packaging/debian/rules:1.1 gnash/packaging/debian/rules:1.2
--- gnash/packaging/debian/rules:1.1    Sat Apr  8 04:09:44 2006
+++ gnash/packaging/debian/rules        Fri Apr 21 22:55:05 2006
@@ -31,9 +31,9 @@
 
 configure: configure.ac
        dh_testdir
-       for i in debian/patches/*.diff; do \
-               test -e "$$i.stamp" || patch -p1 <"$$i" && touch "$$i.stamp"; \
-               done
+#      for i in debian/patches/*.diff; do \
+#              test -e "$$i.stamp" || patch -p1 <"$$i" && touch "$$i.stamp"; \
+#              done
        ./autogen.sh
 
 config.status: configure
@@ -126,7 +126,7 @@
 #      dh_installmime
 #      dh_installinit
 #      dh_installcron
-#      dh_installinfo
+       dh_installinfo
        dh_installman
        dh_link
        dh_strip
Index: gnash/packaging/redhat/gnash.spec
diff -u gnash/packaging/redhat/gnash.spec:1.3 
gnash/packaging/redhat/gnash.spec:1.4
--- gnash/packaging/redhat/gnash.spec:1.3       Thu Apr 20 17:21:40 2006
+++ gnash/packaging/redhat/gnash.spec   Fri Apr 21 22:55:05 2006
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.7
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Internet
@@ -30,6 +30,8 @@
 Requires(postun): scrollkeeper
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 Gnash is a GNU Flash movie player based on GameSWF,
@@ -64,10 +66,7 @@
 The gnash flash movie player plugin for Konqueror.
 
 %prep
-%setup -q -n %{name}-%{version}
-#%patch1 -p1 -b .1
-#%%patch2 -p1 -b .2
-#./autogen.sh
+%setup -q
 
 %build
 %configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
@@ -89,6 +88,12 @@
 %post 
 /sbin/ldconfig
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+/sbin/install-info  --menuentry="Gnash" --description="GNU Flash Player" 
%{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
 %postun
 /sbin/ldconfig
@@ -105,6 +110,7 @@
 %{_bindir}/gprocessor
 %{_libdir}/libgnash*.so.*
 %{_mandir}/man1/gnash*
+%{_infodir}/gnash*
 %{_datadir}/gnash/
 %{_datadir}/omf/gnash/