[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11907: more changes to get document
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11907: more changes to get documentation installing and packaging correctly. |
|
Date: |
Thu, 04 Feb 2010 18:44:54 -0700 |
|
User-agent: |
Bazaar (2.0.2) |
------------------------------------------------------------
revno: 11907
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Thu 2010-02-04 18:44:54 -0700
message:
more changes to get documentation installing and packaging correctly.
added:
packaging/debian/gnash-cygnal.lintian-overrides
packaging/debian/gnash-tools.lintian-overrides
packaging/debian/gtk-plugin-gnash.lintian-overrides
packaging/debian/klash.lintian-overrides
modified:
packaging/debian/control
packaging/debian/gnash.dirs
packaging/debian/gnash.install
packaging/debian/klash.install
packaging/debian/mozilla-plugin-gnash.dirs
packaging/debian/mozilla-plugin-gnash.install
packaging/debian/rules
=== modified file 'packaging/debian/control'
--- a/packaging/debian/control 2010-02-04 16:39:09 +0000
+++ b/packaging/debian/control 2010-02-05 01:44:54 +0000
@@ -1,36 +1,16 @@
Source: gnash
Priority: optional
Maintainer: Rob Savoye (Rollinsville, CO) <address@hidden>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), autoconf,
automake, libtool, libltdl3-dev, libxmu-dev, dejagnu, autotools-dev,
libjpeg-dev, libpng12-dev | libpng-dev, libagg-dev, libpango1.0-dev |
pango-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev |
libcurl3-openssl-dev, libboost1.40-dev | libboost1.39-dev | libboost1.38.0-dev
| libboost1.37-dev | libboost1.36-dev | libboost1.35-dev | libboost1.34.1-dev |
libboost-dev, libboost-thread1.40-dev | libboost-thread1.39-dev |
libboost-thread1.38.0-dev | libboost-thread1.37-dev | libboost-thread1.36-dev |
libboost-thread1.35-dev | libboost-thread1.34.1-dev | libboost-thread-dev,
libboost-date-time1.40-dev | libboost-date-time1.39-dev |
libboost-date-time1.38.0-dev | libboost-date-time1.37-dev |
libboost-date-time1.36-dev | libboost-date-time1.35-dev |
libboost-date-time1.34.1-dev | libboost-date-time-dev, libgtk2.0-dev,
libpango1.0-dev, libatk1.0-dev, python2.6-dev | python2.5-dev | python2.4-dev,
kdelibs5-dev, python-gtk2-dev, qt4-qmake
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), autoconf,
automake, libtool, libltdl3-dev, libxmu-dev, dejagnu, autotools-dev,
libjpeg-dev, libpng12-dev | libpng-dev, libagg-dev, libpango1.0-dev |
pango-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev |
libcurl3-openssl-dev, libboost1.40-dev | libboost1.39-dev | libboost1.38.0-dev
| libboost1.37-dev | libboost1.36-dev | libboost1.35-dev | libboost1.34.1-dev |
libboost-dev, libboost-thread1.40-dev | libboost-thread1.39-dev |
libboost-thread1.38.0-dev | libboost-thread1.37-dev | libboost-thread1.36-dev |
libboost-thread1.35-dev | libboost-thread1.34.1-dev | libboost-thread-dev,
libboost-date-time1.40-dev | libboost-date-time1.39-dev |
libboost-date-time1.38.0-dev | libboost-date-time1.37-dev |
libboost-date-time1.36-dev | libboost-date-time1.35-dev |
libboost-date-time1.34.1-dev | libboost-date-time-dev, libgtk2.0-dev,
libpango1.0-dev, libatk1.0-dev, python2.6-dev | python2.5-dev | python2.4-dev,
kdelibs5-dev, python-gtk2-dev, qt4-qmake, docbook, docbook2x
Standards-Version: 3.8.4
Section: utils
Homepage: http://www.gnu.org/software/gnash/
-Package: gnash-dbg
-Architecture: any
-Section: libdevel
-Priority: extra
-Depends: ${shlibs:Depends}, , ${misc:Depends}, gnash-common (=
${binary:Version})
-Description: Debug symbols for Gnash
- Gnash is a free Flash movie player, which works either standalone, or as
- plugin for Firefox/Mozilla or Konqueror. Currently it is in a alpha state.
- The plugins are under heavy development at this time.
- .
- Gnash supports the majority of Flash opcodes up to SWF version 7, and
- a wide sampling of ActionScript classes for SWF version 8.5. All the
- core ones are implemented, and many of the newer ones work, but may be
- missing some of their methods.
- .
- Included in the Gnash is an XML based messaging system, as specified in
- the Flash specification. This lets a flash movie communicate over a TCP/IP
- socket, and parse the incoming XML message. This lets a movie be a remote
- control for other devices or applications.
-
Package: gnash-common
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libgstreamer-plugins-base0.10-0,
libgstreamer0.10-0, libxml2, libgif4, libfreetype6, zlib1g, libstdc++6,
libfontconfig1, libx11-6, libboost-thread1.40.0 | libboost-thread1.39 |
libboost-thread1.38.0 | libboost-thread1.37 | libboost-thread1.36 |
libboost-thread1.35.0 | libboost-thread1.34.1 | libboost-thread,
libboost-date-time1.40.0 | libboost-date-time1.39 | libboost-date-time1.38.0 |
libboost-date-time1.37 | libboost-date-time1.36 | libboost-date-time1.35.0 |
libboost-date-time1.34.1 | libboost-date-time, gstreamer0.10-plugins-bad,
gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
-Suggests: mozilla-plugin-gnash (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer-plugins-base |
libgstreamer-plugins-base0.10-0, gstreamer0.10-plugins-bad,
gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
+Suggests: mozilla-plugin-gnash (= ${binary:Version}), gstreamer0.10-alsa
Conflicts: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~),
gnash-common-opengl
Description: free SWF movie player - common files/libraries
Gnash is a free Flash movie player, which works either standalone, or as
@@ -42,10 +22,10 @@
Section: utils
Architecture: any
Conflicts: gnash-opengl
-Depends: ${shlibs:Depends}, gnash-common (= ${binary:Version}), ,
${misc:Depends}, libgtk2.0-0, libpango1.0-0, libatk1.0-0
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnash-common (= ${binary:Version})
Description: free SWF movie player
Gnash is a free Flash movie player, which works either standalone, or as
- plugin for Firefox/Mozilla or Konqueror. Currently it is in a alpha state.
+ plugin for Firefox/Mozilla or Konqueror. Currently it is in a beta state.
The plugins are under heavy development at this time.
.
Gnash supports the majority of Flash opcodes up to SWF version 8, and
@@ -60,10 +40,10 @@
Section: utils
Architecture: any
Conflicts: klash-opengl
-Depends: ${shlibs:Depends}, gnash-common (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnash-common (=
${binary:Version})
Description: free SWF movie player - standalone player for KDE
Gnash is a free Flash movie player, which works either standalone, or as
- plugin for Firefox/Mozilla or Konqueror. Currently it is in a alpha state.
+ plugin for Firefox/Mozilla or Konqueror. Currently it is in a beta state.
The plugins are under heavy development at this time.
.
Gnash supports the majority of Flash opcodes up to SWF version 7, and
@@ -81,10 +61,10 @@
Package: gnash-tools
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, gnash-common (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnash-common (= ${binary:Version})
Description: free SWF movie player - Command-line Tools
Gnash is a free Flash movie player, which works either standalone, or as
- plugin for Firefox/Mozilla or Konqueror. Currently it is in a alpha state.
+ plugin for Firefox/Mozilla or Konqueror. Currently it is in a beta state.
The plugins are under heavy development at this time.
.
Gnash supports the majority of Flash opcodes up to SWF version 7, and
@@ -102,10 +82,10 @@
Package: gnash-cygnal
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, gnash-common (= ${binary:Version}),
${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnash-common (= ${binary:Version})
Description: free SWF movie player - Media server
Gnash is a free Flash movie player, which works either standalone, or as
- plugin for Firefox/Mozilla or Konqueror. Currently it is in a alpha state.
+ plugin for Firefox/Mozilla or Konqueror. Currently it is in a beta state.
The plugins are under heavy development at this time.
.
Gnash supports the majority of Flash opcodes up to SWF version 7, and
@@ -123,7 +103,7 @@
Package: mozilla-plugin-gnash
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, gnash-common (= ${binary:Version}), gnash (=
${binary:Version}), ${misc:Depends}, libgtk2.0-0, libpango1.0-0, libatk1.0-0
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnash (= ${binary:Version})
Xb-Npp-Applications:
ec8030f7-c20a-464f-9b0e-13a3a9e97384,92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a,aa5ca914-c309-495d-91cf-3141bbb04115
Xb-Npp-MimeType: application/x-shockwave-flash
Xb-Npp-Name: Gnash SWF Player
@@ -136,7 +116,7 @@
Package: konqueror-plugin-gnash
Section: utils
Architecture: any
-Depends: gnash-common (= ${binary:Version}), klash (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, klash (= ${binary:Version})
Description: free SWF movie player - Plugin for Konqueror
Gnash is a free Flash movie player, which works either standalone, or as
plugin for Firefox/Mozilla or Konqueror.
@@ -146,10 +126,30 @@
Package: gtk-plugin-gnash
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, gnash-common (= ${binary:Version}),
${misc:Depends}, python2.6-dev | python2.5-dev | python2.4-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnash-common (=
${binary:Version})
Xb-Npp-Applications:
ec8030f7-c20a-464f-9b0e-13a3a9e97384,92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a,aa5ca914-c309-495d-91cf-3141bbb04115
Xb-Npp-MimeType: application/x-shockwave-flash
Xb-Npp-Name: Gnash SWF Player
Description: free SWF movie player - Plugin for Gtk and PyGtk donated by Sugar
Labs
.
This package includes the plugin for Gtk and PyGtk..
+
+Package: gnash-dbg
+Architecture: any
+Section: libdevel
+Priority: extra
+Depends: ${shlibs:Depends}, , ${misc:Depends}, gnash-common (=
${binary:Version})
+Description: Debug symbols for Gnash
+ Gnash is a free Flash movie player, which works either standalone, or as
+ plugin for Firefox/Mozilla or Konqueror. Currently it is in a beta state.
+ The plugins are under heavy development at this time.
+ .
+ Gnash supports the majority of Flash opcodes up to SWF version 7, and
+ a wide sampling of ActionScript classes for SWF version 8.5. All the
+ core ones are implemented, and many of the newer ones work, but may be
+ missing some of their methods.
+ .
+ Included in the Gnash is an XML based messaging system, as specified in
+ the Flash specification. This lets a flash movie communicate over a TCP/IP
+ socket, and parse the incoming XML message. This lets a movie be a remote
+ control for other devices or applications.
=== added file 'packaging/debian/gnash-cygnal.lintian-overrides'
--- a/packaging/debian/gnash-cygnal.lintian-overrides 1970-01-01 00:00:00
+0000
+++ b/packaging/debian/gnash-cygnal.lintian-overrides 2010-02-05 01:44:54
+0000
@@ -0,0 +1,3 @@
+gnash-cygnal: binary-or-shlib-defines-rpath ./usr/bin/cygnal /usr/lib/gnash
+gnash-cygnal: binary-or-shlib-defines-rpath ./usr/lib/cygnal/plugins/echo.so
/usr/lib/gnash
+gnash-cygnal: binary-or-shlib-defines-rpath
./usr/lib/cygnal/plugins/oflaDemo.so /usr/lib/gnash
=== added file 'packaging/debian/gnash-tools.lintian-overrides'
--- a/packaging/debian/gnash-tools.lintian-overrides 1970-01-01 00:00:00
+0000
+++ b/packaging/debian/gnash-tools.lintian-overrides 2010-02-05 01:44:54
+0000
@@ -0,0 +1,6 @@
+gnash-tools: binary-or-shlib-defines-rpath ./usr/bin/dumpshm /usr/lib/gnash
+gnash-tools: binary-or-shlib-defines-rpath ./usr/bin/findmicrophones
/usr/lib/gnash
+gnash-tools: binary-or-shlib-defines-rpath ./usr/bin/findwebcams /usr/lib/gnash
+gnash-tools: binary-or-shlib-defines-rpath ./usr/bin/flvdumper /usr/lib/gnash
+gnash-tools: binary-or-shlib-defines-rpath ./usr/bin/gprocessor /usr/lib/gnash
+gnash-tools: binary-or-shlib-defines-rpath ./usr/bin/soldumper /usr/lib/gnash
=== modified file 'packaging/debian/gnash.dirs'
--- a/packaging/debian/gnash.dirs 2006-04-08 03:09:44 +0000
+++ b/packaging/debian/gnash.dirs 2010-02-05 01:44:54 +0000
@@ -1,1 +1,2 @@
+etc
usr/bin
=== modified file 'packaging/debian/gnash.install'
--- a/packaging/debian/gnash.install 2010-02-03 20:09:17 +0000
+++ b/packaging/debian/gnash.install 2010-02-05 01:44:54 +0000
@@ -1,3 +1,4 @@
usr/bin/gtk-gnash
-usr/share/man/man1/gtk-gnash.1
+usr/share/man/man1/gtk-gnash.1*
usr/share/applications/gnash.desktop
+usr/etc/gnashrc /etc/
\ No newline at end of file
=== added file 'packaging/debian/gtk-plugin-gnash.lintian-overrides'
--- a/packaging/debian/gtk-plugin-gnash.lintian-overrides 1970-01-01
00:00:00 +0000
+++ b/packaging/debian/gtk-plugin-gnash.lintian-overrides 2010-02-05
01:44:54 +0000
@@ -0,0 +1,1 @@
+gtk-plugin-gnash: binary-or-shlib-defines-rpath
./usr/lib/python2.5/site-packages/gtk-2.0/gnash.so /usr/lib/gnash
=== modified file 'packaging/debian/klash.install'
--- a/packaging/debian/klash.install 2010-02-03 00:04:01 +0000
+++ b/packaging/debian/klash.install 2010-02-05 01:44:54 +0000
@@ -1,4 +1,4 @@
usr/bin/kde4-gnash
-usr/share/man/man1/kde4-gnash.1
+usr/share/man/man1/kde4-gnash.1*
usr/share/pixmaps/klash.xpm
usr/share/applications/klash.desktop
=== added file 'packaging/debian/klash.lintian-overrides'
--- a/packaging/debian/klash.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/packaging/debian/klash.lintian-overrides 2010-02-05 01:44:54 +0000
@@ -0,0 +1,1 @@
+klash: binary-or-shlib-defines-rpath ./usr/bin/kde4-gnash /usr/lib/gnash
=== modified file 'packaging/debian/mozilla-plugin-gnash.dirs'
--- a/packaging/debian/mozilla-plugin-gnash.dirs 2010-02-04 04:39:49
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.dirs 2010-02-05 01:44:54
+0000
@@ -1,1 +1,2 @@
-usr/lib/mozilla/plugins
+usr/etc
+usr/lib/mozilla/plugins
\ No newline at end of file
=== modified file 'packaging/debian/mozilla-plugin-gnash.install'
--- a/packaging/debian/mozilla-plugin-gnash.install 2010-02-03 02:14:27
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.install 2010-02-05 01:44:54
+0000
@@ -1,1 +1,2 @@
usr/lib*/*/plugins/libgnashplugin.so
+usr/etc/gnashpluginrc /etc/
=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules 2010-02-04 16:39:09 +0000
+++ b/packaging/debian/rules 2010-02-05 01:44:54 +0000
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
-# The template for this file was originally written by Joey Hess and Craig
Small.
-# Developed for Gnash by Miriam Ruiz
+# The template for this file was originally written by Joey Hess and
+# Craig Small. Then further work was done by Miriam Ruiz for Debian, and
+# Alexander Sack for Ubuntu.
+# Many more modifications were made by Rob Savoye for Gnash and Petter
+# Reinholdtsen for Debian Edu.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -15,8 +18,10 @@
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
+ CXXFLAGS += -O0
else
CFLAGS += -O2
+ CXXFLAGS += -O2
endif
DEB_DH_SHLIBDEPS_ARGS_ALL := -X* /usr/lib/gnash
@@ -35,10 +40,10 @@
config.status: configure
dh_testdir
- @printf "\n == APPLYING PATCHES
============================================ \n\n"
+ @printf "\n == APPLYING PATCHES == \n\n"
# we have no patches, we're the developers!
# $(MAKE) -f /usr/share/quilt/quilt.make patch
- @printf "\n ----------------------------------- End of APPLYING PATCHES
---- \n\n"
+ @printf "\n ---- End of APPLYING PATCHES ---- \n\n"
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -47,13 +52,9 @@
cp -f /usr/share/misc/config.guess config.guess
endif
-# @printf "\n == AUTOGEN
===================================================== \n\n"
-# ./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"
+ @printf "\n == CONFIGURE == \n\n"
./configure CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
@@ -73,7 +74,7 @@
--enable-renderer=agg \
--with-plugins-install=system
- @printf "\n ------------------------------------------- End of
CONFIGURE ---- \n\n"
+ @printf "\n ---- End of CONFIGURE ---- \n\n"
cp libamf/README README.amf
@@ -83,13 +84,13 @@
build-stamp: config.status
dh_testdir
- @printf "\n == MAKE
======================================================== \n\n"
+ @printf "\n == MAKE == \n\n"
$(MAKE)
- @printf "\n ----------------------------------------------- End of MAKE
---- \n\n"
+ @printf "\n ---- End of MAKE ---- \n\n"
-# @printf "\n == CHECK
======================================================= \n\n"
+# @printf "\n == CHECK ==\n\n"
# $(MAKE) -C debuild check
-# @printf "\n ---------------------------------------------- End of CHECK
---- \n\n"
+# @printf "\n ---- End of CHECK ---- \n\n"
touch build-stamp
@@ -106,10 +107,10 @@
rm -rf `find . -name ".libs"`
rm -rf `find . -name ".deps"`
- @printf "\n == CLEANING PATCHES
============================================ \n\n"
+ @printf "\n == CLEANING PATCHES ==\n\n"
# we have no patches, we're the developers!
# $(MAKE) -f /usr/share/quilt/quilt.make unpatch
- @printf "\n ----------------------------------- End of CLEANING PATCHES
---- \n\n"
+ @printf "\n ---- End of CLEANING PATCHES ---- \n\n"
# rm -rf debuild
dh_clean
@@ -129,10 +130,10 @@
install -d $(CURDIR)/debian/tmp/usr/lib/firefox/plugins/
install -d $(CURDIR)/debian/tmp/usr/include/gnash
- @printf "\n == INSTALL
===================================================== \n\n"
+ @printf "\n == INSTALL ==\n\n"
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
$(MAKE) install-plugins DESTDIR=$(CURDIR)/debian/tmp
- @printf "\n -------------------------------------------- End of INSTALL
---- \n\n"
+ @printf "\n ---- End of INSTALL ---- \n\n"
install -d $(CURDIR)/debian/tmp/usr/include/gnash/libbase/
cp libbase/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libbase/
@@ -153,6 +154,8 @@
cp packaging/*.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/
install -d $(CURDIR)/debian/tmp/usr/share/applications/
cp debian/*.desktop $(CURDIR)/debian/tmp/usr/share/applications/
+ gzip -9 $(CURDIR)/debian/tmp/usr/share/man/man1/gtk-gnash.1
+ gzip -9 $(CURDIR)/debian/tmp/usr/share/man/man1/kde4-gnash.1
# CREATE PACKAGES
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11907: more changes to get documentation installing and packaging correctly.,
Rob Savoye <=