[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 9e9c9aca293d218428dd
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 9e9c9aca293d218428dd8f3f1a096b5ce900e670 |
|
Date: |
Fri, 01 Oct 2010 15:46:56 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 9e9c9aca293d218428dd8f3f1a096b5ce900e670 (commit)
via 04bfa892dd3e501d2ee0d41e15df73e43d8121d9 (commit)
via d8e51a2b5ea62d6f8ca11984c06ce8465726c3be (commit)
via 9e38aaa34c79be0d3f05f039d594eba2be13d7f3 (commit)
via 4ab30f16fee0c2d0e9fbf7be47dcc7a34bf0b64b (commit)
via a15b0dea2c712d80e9b242e5ac1f9fa3c21a6fa0 (commit)
via 98379661e8b5cde0a37450a778ca24015fba3310 (commit)
via fb205841bd787b2309a52483942d74223828e229 (commit)
via 61138ff511e6c4b804f9a893ab0a12be7af846f9 (commit)
via 1b36ae6de134c4d5d20fc487c80787a4bf6aae83 (commit)
via 339221714e5e5db593571a6f2dbdf8745b839a49 (commit)
via 2e7254c0e683b3d7a01aebbe582760cce3f2411e (commit)
via ec463c3d51f36a4278dc38394917e84ed00b3d44 (commit)
via 4c3a2a586222d7ae78847952afecf816c308f52a (commit)
via 39e91cf9e8ab72d3988360d6de883e29ef15108b (commit)
via f57e89202cb59e07f87d0de0748460c4d7f9560f (commit)
via f951f1277044c7ceeb308d34b7528cfba144c7bc (commit)
via c73f277d2238d796ab39c48530fe0993b3b884e5 (commit)
via 74b6202fdccafa84c323a8dc8e0fd745f512b7d2 (commit)
via 64c63a7e2e383e9dbb78904ab824e2c9e4b47b62 (commit)
via dc28a79eaf329fb177481dec06078d9afaa36954 (commit)
via a5c4b768aab8b10eb8bcdd4a08915548dbc7d18d (commit)
via c3d67ab3a883f0a5234a8a2b501fa7a2cd5b5c93 (commit)
via 322ad39ee5690e8da18786260bd46f65c9e0e44c (commit)
via 7b98ced745e59f17a684c5e8499b34463e701659 (commit)
from ee91b0365076c50d865e6748b5ad2d42ad0f47d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=9e9c9aca293d218428dd8f3f1a096b5ce900e670
commit 9e9c9aca293d218428dd8f3f1a096b5ce900e670
Author: Rob Savoye <address@hidden>
Date: Fri Oct 1 09:43:51 2010 -0600
add the branch nick back in the final version string.
diff --git a/packaging/snapshot.am b/packaging/snapshot.am
index ea4d324..fe7005c 100644
--- a/packaging/snapshot.am
+++ b/packaging/snapshot.am
@@ -20,7 +20,7 @@ NOW := $(shell date "+%Y%m%d")
# this is used for Debian style naming conventions
NEXT_RELEASE = 0.8.9
#SNAPSHOT_VERSION := 0.8.8
-SNAPSHOT_VERSION := $(NEXT_RELEASE)~git.$(BRANCH_REVNO)
+SNAPSHOT_VERSION := $(NEXT_RELEASE)~git.$(BRANCH_NICK)$(BRANCH_REVNO)
# these is the directories where the snapshot gets built. Sources are
# in the top level, the build goes in a _build subdirectory
http://git.savannah.gnu.org/cgit//commit/?id=04bfa892dd3e501d2ee0d41e15df73e43d8121d9
commit 04bfa892dd3e501d2ee0d41e15df73e43d8121d9
Author: Rob Savoye <address@hidden>
Date: Fri Oct 1 09:43:17 2010 -0600
drop everything after the main index number so we don't confuse packaging
version numbering.
diff --git a/Makefile.am b/Makefile.am
index 8f315c3..aad6c55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -160,10 +160,9 @@ revno.h: Makefile.in
# The branch nickname and revision number must be set before including
# the other Makefile fragments used for package building, as they use
# these values.
-BRANCH_REVNO := $(shell grep "REVNO" revno.h | cut -d '"' -f 2)
+BRANCH_REVNO := $(shell grep "REVNO" revno.h | cut -d '"' -f 2 | cut -d '.'
-f 1)
BRANCH_NICK := $(shell grep "NICK" revno.h | cut -d '"' -f 2)
-
# Extract info from the repository to include in the build. If
# GIT (git) isn't installed, just print stubs, as this is only
# used for display purposes. It's primarily used by the testsuites
http://git.savannah.gnu.org/cgit//commit/?id=d8e51a2b5ea62d6f8ca11984c06ce8465726c3be
commit d8e51a2b5ea62d6f8ca11984c06ce8465726c3be
Author: Rob Savoye <address@hidden>
Date: Fri Oct 1 08:48:59 2010 -0600
fix the date for the current entry
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index a57132e..3896e27 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -7,7 +7,7 @@ gnash (master) distro; urgency=low
- add source/format file
- add gnash-dev package
- -- Rob Savoye (Rollinsville, CO) <address@hidden> Sun, 22 Aug 2010 04:20:00
+0100
+ -- Rob Savoye (Rollinsville, CO) <address@hidden> Wed, 29 Sep 2010 04:20:00
+0100
gnash (1855.g39e91cf) distro; urgency=low
http://git.savannah.gnu.org/cgit//commit/?id=9e38aaa34c79be0d3f05f039d594eba2be13d7f3
commit 9e38aaa34c79be0d3f05f039d594eba2be13d7f3
Merge: 4ab30f1 ee91b03
Author: Rob Savoye <address@hidden>
Date: Fri Oct 1 08:38:54 2010 -0600
Merge branch 'master' of git://git.sv.gnu.org/gnash
http://git.savannah.gnu.org/cgit//commit/?id=4ab30f16fee0c2d0e9fbf7be47dcc7a34bf0b64b
commit 4ab30f16fee0c2d0e9fbf7be47dcc7a34bf0b64b
Merge: a15b0de 003dc38
Author: Rob Savoye <address@hidden>
Date: Fri Oct 1 07:01:09 2010 -0600
Merge branch 'master' of git://git.sv.gnu.org/gnash
http://git.savannah.gnu.org/cgit//commit/?id=a15b0dea2c712d80e9b242e5ac1f9fa3c21a6fa0
commit a15b0dea2c712d80e9b242e5ac1f9fa3c21a6fa0
Merge: ecbfb67 9837966
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 13:35:54 2010 -0600
Merge branch 'deb'
http://git.savannah.gnu.org/cgit//commit/?id=98379661e8b5cde0a37450a778ca24015fba3310
commit 98379661e8b5cde0a37450a778ca24015fba3310
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 08:41:28 2010 -0600
change trunk to master for snapshot version
diff --git a/packaging/deb.am b/packaging/deb.am
index b35dc55..9057f26 100644
--- a/packaging/deb.am
+++ b/packaging/deb.am
@@ -101,7 +101,7 @@ PACKAGES := \
setup-deb: deb-copy-files deb-edit-changelog deb-edit-configure
deb-edit-control deb-edit-utilities deb-edit-python deb-edit-browser
# Rename the directory created by distdir to the snapshot. This is
-# usually something like "gnash-trunk" to "0.8.8~git.ogl.ffmpeg.trunk11977".
+# usually something like "gnash-master" to "0.8.8~git.ogl.ffmpeg.master11977".
# This requires distdir to be run first, but it's not a dependency as we
# don't want to always rebuild the source tree, just the dependencies.
deb-rename-build:
@@ -198,13 +198,13 @@ deb-edit-configure:
@echo "Editing configure.ac in $(BUILD_VERSION)..."
@if test ! -f $(BUILD_DIR)/configure.ac.orig; then \
mv -f $(BUILD_DIR)/configure.ac $(BUILD_DIR)/configure.ac.orig; \
- sed -e "s/AC_INIT(gnash, trunk)/AC_INIT(gnash, $(BUILD_VERSION))/" \
+ sed -e "s/AC_INIT(gnash, master)/AC_INIT(gnash, $(BUILD_VERSION))/" \
$(BUILD_DIR)/configure.ac.orig > $(BUILD_DIR)/configure.ac; \
fi
@echo "Editing configure in $(BUILD_VERSION)..."
@if test ! -f $(BUILD_DIR)/configure.orig; then \
mv -f $(BUILD_DIR)/configure $(BUILD_DIR)/configure.orig; \
- sed -e "s/ VERSION='trunk'/ VERSION='$(BUILD_VERSION)'/" \
+ sed -e "s/ VERSION='master'/ VERSION='$(BUILD_VERSION)'/" \
$(BUILD_DIR)/configure.orig > $(BUILD_DIR)/configure; \
chmod u+x $(BUILD_DIR)/configure; \
fi
@@ -250,6 +250,6 @@ deb-build-clean:
done
# these files are created when building packages
-CLEANFILES += *trunk*.deb *trunk*.gz *trunk*.bz2 *trunk*.changes deb-copy-stamp
+CLEANFILES += *master*.deb *.dsc *.gz *.bz2 *trunk*.changes deb-copy-stamp
.PHONY : deb debian snapshot-deb setup-deb deb-edit-control deb-edit-changelog
deb-copy-files deb-rename-build deb-edit-configure deb-edit-install
deb-edit-utilities deb-edit-python deb-edit-browser deb-build-clean
diff --git a/packaging/snapshot.am b/packaging/snapshot.am
index 8a29380..ea4d324 100644
--- a/packaging/snapshot.am
+++ b/packaging/snapshot.am
@@ -46,8 +46,8 @@ snapshot: snapshot-src snapshot-configure snapshot-build
snapshot-install snapsh
# start by creating the source tree using the distdir target,
# which builds a source tree only using what's in the DIST variables
# from Automake. This uses the default version for Gnash. which is
-# 'trunk'. Then it gets renamed from the default version from 'trunk'
-# to a branch-revno stamped version instead of trunk.
+# 'master'. Then it gets renamed from the default version from 'master'
+# to a branch-revno stamped version instead of master.
snapshot-src: revno.h distdir
snapshot-configure:
http://git.savannah.gnu.org/cgit//commit/?id=fb205841bd787b2309a52483942d74223828e229
commit fb205841bd787b2309a52483942d74223828e229
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 08:41:08 2010 -0600
change trunk to master for snapshot version
diff --git a/configure.ac b/configure.ac
index 0f648e8..aadf53c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301 USA
dnl
AC_PREREQ(2.50)
-AC_INIT(gnash, trunk)
+AC_INIT(gnash, master)
AC_CONFIG_SRCDIR([libcore/gnash.h])
AC_CONFIG_HEADERS([gnashconfig.h])
http://git.savannah.gnu.org/cgit//commit/?id=61138ff511e6c4b804f9a893ab0a12be7af846f9
commit 61138ff511e6c4b804f9a893ab0a12be7af846f9
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 08:40:31 2010 -0600
use git branch for the NICK instead of the directory path.
diff --git a/Makefile.am b/Makefile.am
index 22be1d4..8f315c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -147,7 +147,7 @@ revno.h: Makefile.in
echo "Generating revno.h"; \
$(RM) -f revno.h; \
revno="`(cd $(top_srcdir) && git describe --tags | cut -d '-' -f
2-3 | tr a- a.)`"; \
- nick="`basename $(top_srcdir) | tr a_ a.`"; \
+ nick="`(cd $(top_srcdir) && git branch | grep "\*" | cut -d ' '
-f 2)`"; \
fi; \
else \
revno="${NOW}"; \
http://git.savannah.gnu.org/cgit//commit/?id=1b36ae6de134c4d5d20fc487c80787a4bf6aae83
commit 1b36ae6de134c4d5d20fc487c80787a4bf6aae83
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 08:02:41 2010 -0600
drop Build-Depends from mysql extension package
diff --git a/packaging/debian/control b/packaging/debian/control
index 95cfe7d..2e63958 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -209,7 +209,6 @@ Package: gnash-mysql-extension
Architecture: any
Section: utils
Priority: extra
-Build-Depends: libmysqlclient-dev
Depends: gnash-common (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
Description: MySQL extension for Gnash
http://git.savannah.gnu.org/cgit//commit/?id=339221714e5e5db593571a6f2dbdf8745b839a49
commit 339221714e5e5db593571a6f2dbdf8745b839a49
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 07:53:48 2010 -0600
remove unnecessary files
diff --git a/packaging/debian/dirs b/packaging/debian/dirs
deleted file mode 100644
index ca882bb..0000000
--- a/packaging/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/packaging/debian/docs b/packaging/debian/docs
deleted file mode 100644
index e36e47f..0000000
--- a/packaging/debian/docs
+++ /dev/null
@@ -1,5 +0,0 @@
-NEWS
-README
-README.amf
-README.cygnal
-AUTHORS
diff --git a/packaging/debian/source/format b/packaging/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/packaging/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
http://git.savannah.gnu.org/cgit//commit/?id=2e7254c0e683b3d7a01aebbe582760cce3f2411e
commit 2e7254c0e683b3d7a01aebbe582760cce3f2411e
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 02:10:38 2010 +0200
sync up with debian
diff --git a/packaging/deb.am b/packaging/deb.am
index b526cf5..b35dc55 100644
--- a/packaging/deb.am
+++ b/packaging/deb.am
@@ -98,7 +98,7 @@ PACKAGES := \
# This gets more fun, as if we configure with ffmpeg, the two utilities that
# deal with Gstreamer based input devices, findwebcam and findmicrophone,
# don't get built. So we strip them out of the packages.
-setup-deb: deb-copy-files deb-edit-changelog deb-edit-configure
deb-edit-control deb-edit-utilities deb-edit-python deb-edit-mozilla
+setup-deb: deb-copy-files deb-edit-changelog deb-edit-configure
deb-edit-control deb-edit-utilities deb-edit-python deb-edit-browser
# Rename the directory created by distdir to the snapshot. This is
# usually something like "gnash-trunk" to "0.8.8~git.ogl.ffmpeg.trunk11977".
@@ -143,23 +143,23 @@ deb-edit-python:
@ubuntu=`uname -a | grep -ci ubuntu`; \
if test $${ubuntu} -eq 1; then \
echo "Editing $(BUILD_DIR)/debian/gtk-plugin-gnash.install for
Ubuntu"; \
- if test -e $(BUILD_DIR)/debian/gtk-plugin-gnash.install; then \
- mv -f $(BUILD_DIR)/debian/gtk-plugin-gnash.install
$(BUILD_DIR)/debian/gtk-plugin-gnash.install.orig; \
+ if test -e $(BUILD_DIR)/debian/python-gtk-gnash.install; then \
+ mv -f $(BUILD_DIR)/debian/python-gtk-gnash.install
$(BUILD_DIR)/debian/python-gtk-gnash.install.orig; \
fi; \
- sed -e 's:python2.5/site:python2.6/dist:'
$(BUILD_DIR)/debian/gtk-plugin-gnash.install.orig >
$(BUILD_DIR)/debian/gtk-plugin-gnash.install; \
- if test -e $(BUILD_DIR)/debian/gtk-plugin-gnash.dirs; then \
- mv -f $(BUILD_DIR)/debian/gtk-plugin-gnash.dirs
$(BUILD_DIR)/debian/gtk-plugin-gnash.dirs.orig; \
+ sed -e 's:python2.5/site:python2.6/dist:'
$(BUILD_DIR)/debian/python-gtk-gnash.install.orig >
$(BUILD_DIR)/debian/python-gtk-gnash.install; \
+ if test -e $(BUILD_DIR)/debian/python-gtk-gnash.dirs; then \
+ mv -f $(BUILD_DIR)/debian/python-gtk-gnash.dirs
$(BUILD_DIR)/debian/python-gtk-gnash.dirs.orig; \
fi; \
- sed -e "s:python2.5/site:python2.6/dist:"
$(BUILD_DIR)/debian/gtk-plugin-gnash.dirs.orig >
$(BUILD_DIR)/debian/gtk-plugin-gnash.dirs; \
+ sed -e "s:python2.5/site:python2.6/dist:"
$(BUILD_DIR)/debian/python-gtk-gnash.dirs.orig >
$(BUILD_DIR)/debian/python-gtk-gnash.dirs; \
fi;
-deb-edit-mozilla:
+deb-edit-browser:
@if test `echo $(FIREFOX_PLUGINS) | grep -c mozilla` -eq 0; then \
- echo "Adjusting plugin path for a Mozilla browser"; \
- if test -e $(BUILD_DIR)/debian/mozilla-plugin-gnash.dirs; then \
- mv -f $(BUILD_DIR)/debian/mozilla-plugin-gnash.dirs
$(BUILD_DIR)/debian/gtk-plugin-gnash.install.orig; \
+ echo "Adjusting plugin path for a NPAPI compliant browser"; \
+ if test -e $(BUILD_DIR)/debian/browser-plugin-gnash.dirs; then \
+ mv -f $(BUILD_DIR)/debian/browser-plugin-gnash.dirs
$(BUILD_DIR)/debian/python-gtk-gnash.install.orig; \
fi; \
- echo $(FIREFOX_PLUGINS) | sed -e 's:/::' >
$(BUILD_DIR)/debian/mozilla-plugin-gnash.dirs; \
+ echo $(FIREFOX_PLUGINS) | sed -e 's:/::' >
$(BUILD_DIR)/debian/browser-plugin-gnash.dirs; \
fi;
# Edit the debian/changelog file. This is because the version in the top level
@@ -187,9 +187,9 @@ deb-edit-changelog:
fi; \
if test -e $(BUILD_DIR)/debian/changelog; then \
mv -f $(BUILD_DIR)/debian/changelog
$(BUILD_DIR)/debian/changelog.orig; \
- sed -e "s:trunk:$(BUILD_VERSION):" -e "s/distro/$${dist}/"
$(srcdir)/packaging/debian/changelog > $(BUILD_DIR)/debian/changelog; \
+ sed -e "s:master:$(BUILD_VERSION):" -e "s/distro/$${dist}/"
$(srcdir)/packaging/debian/changelog > $(BUILD_DIR)/debian/changelog; \
else \
- sed -e "s:trunk:$(BUILD_VERSION):" -e "s/distro/$${dist}/"
$(srcdir)/packaging/debian/changelog > $(BUILD_DIR)/debian/changelog; \
+ sed -e "s:master:$(BUILD_VERSION):" -e "s/distro/$${dist}/"
$(srcdir)/packaging/debian/changelog > $(BUILD_DIR)/debian/changelog; \
fi
# Edit the configure scripts, so if somebody reconfigures from this tarball,
@@ -252,4 +252,4 @@ deb-build-clean:
# these files are created when building packages
CLEANFILES += *trunk*.deb *trunk*.gz *trunk*.bz2 *trunk*.changes deb-copy-stamp
-.PHONY : deb debian snapshot-deb setup-deb deb-edit-control deb-edit-changelog
deb-copy-files deb-rename-build deb-edit-configure deb-edit-install
deb-edit-utilities deb-edit-python deb-edit-mozilla deb-build-clean
+.PHONY : deb debian snapshot-deb setup-deb deb-edit-control deb-edit-changelog
deb-copy-files deb-rename-build deb-edit-configure deb-edit-install
deb-edit-utilities deb-edit-python deb-edit-browser deb-build-clean
diff --git a/packaging/debian/browser-plugin-gnash.dirs
b/packaging/debian/browser-plugin-gnash.dirs
index 252fabe..da9b503 100644
--- a/packaging/debian/browser-plugin-gnash.dirs
+++ b/packaging/debian/browser-plugin-gnash.dirs
@@ -1,2 +1,2 @@
etc
-usr/lib/mozilla/plugins
+usr/lib/*/plugins
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index b251df5..a57132e 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,4 +1,15 @@
-gnash (trunk) distro; urgency=low
+gnash (master) distro; urgency=low
+
+ * local package, sync up with debian.
+ - rename mozilla-plugin-gnash* to browser-plugin-gnash*
+ - renmame gtk-plugin-gnash to python-gtk-gnash
+ - move overrides to it's own directory
+ - add source/format file
+ - add gnash-dev package
+
+ -- Rob Savoye (Rollinsville, CO) <address@hidden> Sun, 22 Aug 2010 04:20:00
+0100
+
+gnash (1855.g39e91cf) distro; urgency=low
* local package, many tweaks to be more standards compliant.
- updated for the 0.8.8 release.
diff --git a/packaging/debian/control b/packaging/debian/control
index b11c5b3..95cfe7d 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -28,14 +28,15 @@ Build-Depends: dpkg-dev (>= 1.13.19),
intltool,
intltool-debian,
x11proto-video-dev,
- libxv-dev
-
+ libxv-dev,
+ libmysqlclient-dev
# OpenGL packages are disabled for now
# libgl1-mesa-dev, libglu1-mesa-dev, libgtkglext1-dev, libqt4-opengl-dev,
Standards-Version: 3.8.4
Section: utils
Homepage: http://www.gnu.org/software/gnash/
+
Package: gnash-common
Section: libs
Architecture: any
@@ -118,9 +119,10 @@ Description: free SWF movie player - Media server
.
Cygnal is Gnash's media server.
-Package: mozilla-plugin-gnash
+Package: browser-plugin-gnash
Section: utils
Architecture: any
+Conflicts: mozilla-plugin-gnash
Depends: gnash (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
Xb-Npp-Applications:
ec8030f7-c20a-464f-9b0e-13a3a9e97384,92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a,aa5ca914-c309-495d-91cf-3141bbb04115
@@ -130,7 +132,7 @@ Description: free SWF movie player - Plugin for Mozilla and
derivatives
Gnash is a free Flash movie player, which works either standalone, or as
plugin for Firefox/Mozilla, Konqueror, or Chromium.
.
- This package includes the plugin for Firefox/Mozilla Web Browser.
+ This package includes the plugin for Firefox/Mozilla/Chromium Web Browser.
Package: konqueror-plugin-gnash
Section: utils
@@ -143,9 +145,10 @@ Description: free SWF movie player - Plugin for Konqueror
.
This package includes the plugin for Konqueror.
-Package: gtk-plugin-gnash
+Package: python-gtk-gnash
Section: utils
Architecture: any
+Conflicts: gtk-plugin-gnash
Depends: gnash-common (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
Xb-Npp-Applications:
ec8030f7-c20a-464f-9b0e-13a3a9e97384,92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a,aa5ca914-c309-495d-91cf-3141bbb04115
@@ -208,7 +211,7 @@ Section: utils
Priority: extra
Build-Depends: libmysqlclient-dev
Depends: gnash-common (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}, libmysqlclient
+ ${shlibs:Depends}, ${misc:Depends}
Description: MySQL extension for Gnash
This extension allows SWF files being played within Gnash to have direct
access
to a MySQL database. The API is similar to the standard MySQL one.
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 0b6856a..51ed293 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -56,7 +56,7 @@ patch: patch-stamp
patch-stamp:
dh_testdir
printf "\n == APPLYING PATCHES == \n\n"
- printf "we have no patches, we're the developers!"
+# "we have no patches, we're the developers!"
# $(MAKE) -f /usr/share/quilt/quilt.make patch
printf "\n ---- End of APPLYING PATCHES ---- \n\n"
touch $@
http://git.savannah.gnu.org/cgit//commit/?id=ec463c3d51f36a4278dc38394917e84ed00b3d44
commit ec463c3d51f36a4278dc38394917e84ed00b3d44
Merge: 4c3a2a5 e94ed67
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 01:31:32 2010 +0200
Merge branch 'master' of git://git.sv.gnu.org/gnash
Conflicts:
cygnal/libnet/Makefile.am
diff --cc librender/Makefile.am
index 7a675c4,99d66bc..40bba03
--- a/librender/Makefile.am
+++ b/librender/Makefile.am
@@@ -68,7 -68,8 +68,7 @@@ noinst_HEADERS =
pkglib_LTLIBRARIES = libgnashrender.la
libgnashrender_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_X11_LIBS) $(LIBVA_GLX_LIBS)
libgnashrender_la_SOURCES = PathParser.cpp
- libgnashrender_la_LDFLAGS = -release $(VERSION) $(AM_LDFLAGS)
-
-libgnashrender_la_LDFLAGS = -release $(VERSION)
++libgnashrender_la_LDFLAGS = -release $(VERSION)
if BUILD_OGL_RENDERER
libgnashrender_la_SOURCES += Renderer_ogl.cpp
http://git.savannah.gnu.org/cgit//commit/?id=4c3a2a586222d7ae78847952afecf816c308f52a
commit 4c3a2a586222d7ae78847952afecf816c308f52a
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 01:03:07 2010 +0200
Sync up with Debian where possible.
diff --git a/packaging/debian/Makefile.am b/packaging/debian/Makefile.am
deleted file mode 100644
index 64a9907..0000000
--- a/packaging/debian/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-## Process this file with automake to generate Makefile.in
-#
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-SUBDIRS =
-
-EXTRA_DIST = changelog copyright docs gnash-klash.install \
- gnash-plugin.substvars libgnash0.install rules compat \
- gnash.dirs gnash-klash.substvars gnash.substvars \
- libgnash0.substvars source.lintian-overrides control dirs \
- gnash.install gnash-plugin.install libgnash0.dirs watch
diff --git a/packaging/debian/README.Debian b/packaging/debian/README.Debian
new file mode 100644
index 0000000..efe9a3a
--- /dev/null
+++ b/packaging/debian/README.Debian
@@ -0,0 +1,47 @@
+Gnash for Debian
+----------------
+
+Gnash supports the majority of Flash opcodes up to SWF version 7, and
+a wide sampling of ActionScript 2 classes for SWF version 8.5. Flash
+version 9 and ActionScript 3 support is being worked on. All the
+core ones are implemented, and many of the newer ones work, but may be
+missing some of their methods. If the browser only displays a blank
+window, it is likely because of an unimplemented feature. All
+unimplemented opcodes and ActionScript classes and methods print a
+warning when using -v with gnash or gprocessor. Using gprocessor -v is
+a quick way to see why a movie isn't playing correctly.
+
+ -- Miriam Ruiz <address@hidden> Thu, 12 Jun 2008 16:49:26 +0000
+
+Please make sure you have a URL handling gstreamer plugin, such as
+gnomevfssrc, neonhttpsrc or souphttpsrc for playing NetStream playback.
+
+Note that if you use neonhttpsrc you must install it from Gstreamer
+CVS; otherwise it won't be compatible with youtube.
+
+For a nonexhaustive list of modules you will need, please see
+http://bjacques.org/gst-plugins:
+
+gnomevfs *or* souphttpsrc *or* [neonhttpsrc from gstreamer svn] *or* giosrc
+
+ffmpegcolorspace
+capsfilter
+videoscale
+fakesink
+autoaudiosink
+alsasink (or your preferred audio sink)
+audioconvert
+
+For FLV playback (YouTube and friends):
+mpegvideoparse (plugins-ugly)
+gst-ffmpeg
+
+For MP3 playback (YouTube and friends):
+mpegaudioparse (plugins-ugly)
+mad (plugins-ugly) *or* flump3dec
+
+In addition or instead of the above, Gnash is compatible with any other
+streamer audio and/or video codecs Gstreamer supports, such as Ogg
+Theora-vorbis, dirac-vorbis etc.
+
+ -- Miriam Ruiz <address@hidden> Tue, 12 Feb 2008 11:33:29 +0000
diff --git a/packaging/debian/TODO.Debian b/packaging/debian/TODO.Debian
deleted file mode 100644
index 81769aa..0000000
--- a/packaging/debian/TODO.Debian
+++ /dev/null
@@ -1,4 +0,0 @@
-* Add a menu file and uncomment dh_installmenu in the debian/rules.
-* Create a better icon.
-* Find a way to generate man pages without $DISPLAY.
-* Add LDFLAGS="-Wl,-z,defs" to ./configure in rules.
diff --git a/packaging/debian/mozilla-plugin-gnash.dirs
b/packaging/debian/browser-plugin-gnash.dirs
similarity index 100%
rename from packaging/debian/mozilla-plugin-gnash.dirs
rename to packaging/debian/browser-plugin-gnash.dirs
diff --git a/packaging/debian/mozilla-plugin-gnash.install
b/packaging/debian/browser-plugin-gnash.install
similarity index 100%
rename from packaging/debian/mozilla-plugin-gnash.install
rename to packaging/debian/browser-plugin-gnash.install
diff --git a/packaging/debian/mozilla-plugin-gnash.postinst
b/packaging/debian/browser-plugin-gnash.postinst
similarity index 100%
rename from packaging/debian/mozilla-plugin-gnash.postinst
rename to packaging/debian/browser-plugin-gnash.postinst
diff --git a/packaging/debian/mozilla-plugin-gnash.prerm
b/packaging/debian/browser-plugin-gnash.prerm
similarity index 100%
rename from packaging/debian/mozilla-plugin-gnash.prerm
rename to packaging/debian/browser-plugin-gnash.prerm
diff --git a/packaging/debian/gnash-cygnal.lintian-overrides
b/packaging/debian/gnash-cygnal.lintian-overrides
deleted file mode 100644
index e41d32a..0000000
--- a/packaging/debian/gnash-cygnal.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/packaging/debian/gnash-tools.lintian-overrides
b/packaging/debian/gnash-tools.lintian-overrides
deleted file mode 100644
index 1da4d4e..0000000
--- a/packaging/debian/gnash-tools.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-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
diff --git a/packaging/debian/gnash.desktop b/packaging/debian/gnash.desktop.in
similarity index 100%
rename from packaging/debian/gnash.desktop
rename to packaging/debian/gnash.desktop.in
diff --git a/packaging/debian/gtk-plugin-gnash.lintian-overrides
b/packaging/debian/gtk-plugin-gnash.lintian-overrides
deleted file mode 100644
index 8b6a40c..0000000
--- a/packaging/debian/gtk-plugin-gnash.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-gtk-plugin-gnash: binary-or-shlib-defines-rpath
./usr/lib/python2.5/site-packages/gtk-2.0/gnash.so /usr/lib/gnash
diff --git a/packaging/debian/klash.desktop b/packaging/debian/klash.desktop.in
similarity index 100%
rename from packaging/debian/klash.desktop
rename to packaging/debian/klash.desktop.in
diff --git a/packaging/debian/mozilla-plugin-gnash.lintian-overrides
b/packaging/debian/overrides/mozilla-plugin-gnash
similarity index 100%
rename from packaging/debian/mozilla-plugin-gnash.lintian-overrides
rename to packaging/debian/overrides/mozilla-plugin-gnash
diff --git a/packaging/debian/source.lintian-overrides
b/packaging/debian/overrides/soure
similarity index 100%
rename from packaging/debian/source.lintian-overrides
rename to packaging/debian/overrides/soure
diff --git a/packaging/debian/gtk-plugin-gnash.dirs
b/packaging/debian/python-gtk-gnash.dirs
similarity index 100%
rename from packaging/debian/gtk-plugin-gnash.dirs
rename to packaging/debian/python-gtk-gnash.dirs
diff --git a/packaging/debian/gtk-plugin-gnash.install
b/packaging/debian/python-gtk-gnash.install
similarity index 100%
rename from packaging/debian/gtk-plugin-gnash.install
rename to packaging/debian/python-gtk-gnash.install
http://git.savannah.gnu.org/cgit//commit/?id=39e91cf9e8ab72d3988360d6de883e29ef15108b
commit 39e91cf9e8ab72d3988360d6de883e29ef15108b
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 00:13:32 2010 +0200
add gnash-dev package. Add Chromium to the list of supported browsers.
diff --git a/packaging/debian/control b/packaging/debian/control
index 67d79fd..b11c5b3 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -28,8 +28,8 @@ Build-Depends: dpkg-dev (>= 1.13.19),
intltool,
intltool-debian,
x11proto-video-dev,
- libxv-dev,
- libmysqlclient-dev
+ libxv-dev
+
# OpenGL packages are disabled for now
# libgl1-mesa-dev, libglu1-mesa-dev, libgtkglext1-dev, libqt4-opengl-dev,
Standards-Version: 3.8.4
@@ -47,7 +47,7 @@ Suggests: mozilla-plugin-gnash (= ${binary:Version}),
gnash-lirc-extension (= ${
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
- plugin for Firefox/Mozilla or Konqueror.
+ plugin for Firefox/Mozilla, Konqueror, or Chromium.
.
This package includes the common, gui-independent files/libraries
@@ -59,7 +59,7 @@ Depends: gnash-common (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
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 beta state.
+ plugin for Firefox/Mozilla, Konqueror, or Chromium. Currently it is in a beta
state.
.
Gnash supports the majority of Flash opcodes up to SWF version 8, and
a wide sampling of ActionScript classes for SWF version 9 and 10. All the
@@ -77,7 +77,7 @@ Depends: gnash-common (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
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 beta state.
+ plugin for Firefox/Mozilla, Konqueror, or Chromium. Currently it is in a beta
state.
.
Gnash supports the majority of Flash opcodes up to SWF version 8, and
a wide sampling of ActionScript classes for SWF version 9 and 10. All the
@@ -93,7 +93,7 @@ Depends: gnash-common (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
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 beta state.
+ plugin for Firefox/Mozilla, Konqueror, or Chromium. Currently it is in a beta
state.
.
Gnash supports the majority of Flash opcodes up to SWF version 8, and
a wide sampling of ActionScript classes for SWF version 9 and 10. All the
@@ -109,7 +109,7 @@ Depends: gnash-common (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
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 beta state.
+ plugin for Firefox/Mozilla, Konqueror, or Chromium. Currently it is in a beta
state.
.
Gnash supports the majority of Flash opcodes up to SWF version 8, and
a wide sampling of ActionScript classes for SWF version 9 and 10. All the
@@ -128,7 +128,7 @@ Xb-Npp-MimeType: application/x-shockwave-flash
Xb-Npp-Name: Gnash SWF Player
Description: free SWF movie player - Plugin for Mozilla and derivatives
Gnash is a free Flash movie player, which works either standalone, or as
- plugin for Firefox/Mozilla or Konqueror.
+ plugin for Firefox/Mozilla, Konqueror, or Chromium.
.
This package includes the plugin for Firefox/Mozilla Web Browser.
@@ -139,7 +139,7 @@ Depends: klash (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
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.
+ plugin for Firefox/Mozilla, Konqueror, or Chromium.
.
This package includes the plugin for Konqueror.
@@ -155,6 +155,22 @@ Description: free SWF movie player - Plugin for Gtk and
PyGtk donated by Sugar L
.
This package includes the plugin for Gtk and PyGtk..
+Package: gnash-dev
+Section: utils
+Architecture: any
+Depends: gnash-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: free SWF movie player - Development files
+ Gnash is a free Flash movie player, which works either standalone, or as
+ plugin for Firefox/Mozilla, Konqueror, or Chromium. Currently it is in a beta
state.
+ .
+ Gnash supports the majority of Flash opcodes up to SWF version 8, and
+ a wide sampling of ActionScript classes for SWF version 9 and 10. All the
+ core ones are implemented, and many of the newer ones work, but may be
+ missing some of their methods.
+ .
+ This package includes the header files used for gnash development.
+
Package: gnash-dbg
Architecture: any
Section: debug
@@ -163,7 +179,7 @@ Depends: gnash-common (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
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.
+ plugin for Firefox/Mozilla, Konqueror, or Chromium. 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
@@ -190,6 +206,7 @@ Package: gnash-mysql-extension
Architecture: any
Section: utils
Priority: extra
+Build-Depends: libmysqlclient-dev
Depends: gnash-common (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}, libmysqlclient
Description: MySQL extension for Gnash
http://git.savannah.gnu.org/cgit//commit/?id=f57e89202cb59e07f87d0de0748460c4d7f9560f
commit f57e89202cb59e07f87d0de0748460c4d7f9560f
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 00:12:31 2010 +0200
look for lib and share for pkgconfig files.
diff --git a/packaging/debian/gnash-dev.install
b/packaging/debian/gnash-dev.install
index ec1835c..a9cfa74 100644
--- a/packaging/debian/gnash-dev.install
+++ b/packaging/debian/gnash-dev.install
@@ -1,5 +1,4 @@
usr/include/gnash
-usr/lib/gnash/lib*.a
+#usr/lib/gnash/lib*.a
usr/lib/gnash/*.la
-usr/lib/pkgconfig/*
-usr/share/pkgconfig/*
+usr/*/pkgconfig/*
http://git.savannah.gnu.org/cgit//commit/?id=f951f1277044c7ceeb308d34b7528cfba144c7bc
commit f951f1277044c7ceeb308d34b7528cfba144c7bc
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 00:12:02 2010 +0200
synced from old override files
diff --git a/packaging/debian/overrides/gnash-cygnal
b/packaging/debian/overrides/gnash-cygnal
index f8db1a7..e41d32a 100644
--- a/packaging/debian/overrides/gnash-cygnal
+++ b/packaging/debian/overrides/gnash-cygnal
@@ -1 +1,3 @@
-gnash-cygnal binary: binary-or-shlib-defines-rpath
+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
diff --git a/packaging/debian/overrides/gnash-tools
b/packaging/debian/overrides/gnash-tools
index f127f26..1da4d4e 100644
--- a/packaging/debian/overrides/gnash-tools
+++ b/packaging/debian/overrides/gnash-tools
@@ -1 +1,6 @@
-gnash-tools binary: binary-or-shlib-defines-rpath
+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
http://git.savannah.gnu.org/cgit//commit/?id=c73f277d2238d796ab39c48530fe0993b3b884e5
commit c73f277d2238d796ab39c48530fe0993b3b884e5
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 00:11:01 2010 +0200
change bzr to git
diff --git a/packaging/deb.am b/packaging/deb.am
index 17bc5ca..b526cf5 100644
--- a/packaging/deb.am
+++ b/packaging/deb.am
@@ -49,16 +49,16 @@ BUILD_DIR := $(shell \
snapshot_dir=$(SNAPSHOT_DIR); \
if test $(OGL) -eq 1 -o $(FFMPEG) -eq 1 -o $(VAAPI) -eq 1; then \
if test $(OGL) -eq 1 -a $(FFMPEG) -eq 1; then \
- snapshot_dir=$(subst bzr,bzr.ogl.ffmpeg,$(SNAPSHOT_DIR)); \
+ snapshot_dir=$(subst git,git.ogl.ffmpeg,$(SNAPSHOT_DIR)); \
fi; \
if test $(OGL) -eq 1 -a $(FFMPEG) -eq 0; then \
- snapshot_dir=$(subst bzr,bzr.ogl,$(SNAPSHOT_DIR)); \
+ snapshot_dir=$(subst git,git.ogl,$(SNAPSHOT_DIR)); \
fi; \
if test $(OGL) -eq 0 -a $(FFMPEG) -eq 1; then \
- snapshot_dir=$(subst bzr,bzr.ffmpeg,$(SNAPSHOT_DIR)); \
+ snapshot_dir=$(subst git,git.ffmpeg,$(SNAPSHOT_DIR)); \
fi; \
if test $(VAAPI) -eq 1; then \
- snapshot_dir=$(subst bzr,bzr.vaapi,$(SNAPSHOT_DIR)); \
+ snapshot_dir=$(subst git,git.vaapi,$(SNAPSHOT_DIR)); \
fi; \
fi; \
echo "$${snapshot_dir}")
@@ -69,16 +69,16 @@ BUILD_VERSION := $(shell \
snapshot_version=$(SNAPSHOT_VERSION); \
if test $(OGL) -eq 1 -o $(FFMPEG) -eq 1 -o $(VAAPI) -eq 1; then \
if test $(OGL) -eq 1 -a $(FFMPEG) -eq 1; then \
- snapshot_version=$(subst bzr,bzr.ogl.ffmpeg,$(SNAPSHOT_VERSION)); \
+ snapshot_version=$(subst git,git.ogl.ffmpeg,$(SNAPSHOT_VERSION)); \
fi; \
if test $(OGL) -eq 1 -a $(FFMPEG) -eq 0; then \
- snapshot_version=$(subst bzr,bzr.ogl,$(SNAPSHOT_VERSION)); \
+ snapshot_version=$(subst git,git.ogl,$(SNAPSHOT_VERSION)); \
fi; \
if test $(OGL) -eq 0 -a $(FFMPEG) -eq 1; then \
- snapshot_version=$(subst bzr,bzr.ffmpeg,$(SNAPSHOT_VERSION)); \
+ snapshot_version=$(subst git,git.ffmpeg,$(SNAPSHOT_VERSION)); \
fi; \
if test $(VAAPI) -eq 1; then \
- snapshot_version=$(subst bzr,bzr.vaapi,$(SNAPSHOT_VERSION)); \
+ snapshot_version=$(subst git,git.vaapi,$(SNAPSHOT_VERSION)); \
fi; \
fi; \
echo "$${snapshot_version}")
@@ -101,7 +101,7 @@ PACKAGES := \
setup-deb: deb-copy-files deb-edit-changelog deb-edit-configure
deb-edit-control deb-edit-utilities deb-edit-python deb-edit-mozilla
# Rename the directory created by distdir to the snapshot. This is
-# usually something like "gnash-trunk" to "0.8.8~bzr.ogl.ffmpeg.trunk11977".
+# usually something like "gnash-trunk" to "0.8.8~git.ogl.ffmpeg.trunk11977".
# This requires distdir to be run first, but it's not a dependency as we
# don't want to always rebuild the source tree, just the dependencies.
deb-rename-build:
http://git.savannah.gnu.org/cgit//commit/?id=74b6202fdccafa84c323a8dc8e0fd745f512b7d2
commit 74b6202fdccafa84c323a8dc8e0fd745f512b7d2
Author: Rob Savoye <address@hidden>
Date: Thu Sep 30 00:10:27 2010 +0200
change bzr to git
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 288b200..0b6856a 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -228,7 +228,7 @@ clean:
rm -fr $(BUILD_DIRECTORY)
@printf "\n == CLEANING PATCHES ==\n\n"
-# we have no patches, we're the developers!
+ echo " we have no patches, we're the developers!"
# $(MAKE) -f /usr/share/quilt/quilt.make unpatch
@printf "\n ---- End of CLEANING PATCHES ---- \n\n"
@@ -330,16 +330,15 @@ VERSION_DATE = $(shell /bin/date --utc +%0Y%0m%0d.%0k%0M)
BRANCH_NICK = `grep "NICK" $(BUILD_DIRECTORY)/revno.h | cut -d '"' -f 2`
BRANCH_REVNO = `grep "REVNO" $(BUILD_DIRECTORY)/revno.h | cut -d '"' -f 2`
#VERSION_ID = 0.8.8+bzr.trunk$(VERSION_DATE)
-VERSION_ID = 0.8.8+bzr.$(BRANCH_NICK)$(BRANCH_REVNO)
-get-bzr-source:
- echo Downloading gnash $(VERSION_ID) from bzr...
-# test -e gnashd && exit
- bzr branch http://bzr.savannah.gnu.org/r/gnash/$(BRANCH_NICK) gnash
-# cd gnash; rm -rf `find . -name CVS`
+VERSION_ID = 0.8.8+git.$(BRANCH_NICK)$(BRANCH_REVNO)
+get-git-source:
+ echo Downloading gnash $(VERSION_ID) from git...
+ git clone git://git.sv.gnu.org/gnash.git
+# cd gnash; rm -rf `find . -name .git`
tar cvfz "gnash_$(VERSION_ID).orig.tar.gz" gnash
mv gnash "gnash-$(VERSION_ID)"
cp debian "gnash-$(VERSION_ID)" -a
- cd "gnash-$(VERSION_ID)"; dch -v "$(VERSION_ID)-1" "New Upstream
Release. Downloaded from Bazaar."
+ cd "gnash-$(VERSION_ID)"; dch -v "$(VERSION_ID)-1" "New Upstream
Release. Downloaded from Git."
binary: binary-indep binary-arch
-.PHONY: config build clean binary-indep binary-arch binary install
get-bzr-source patch
+.PHONY: config build clean binary-indep binary-arch binary install
get-git-source patch
http://git.savannah.gnu.org/cgit//commit/?id=64c63a7e2e383e9dbb78904ab824e2c9e4b47b62
commit 64c63a7e2e383e9dbb78904ab824e2c9e4b47b62
Author: Rob Savoye <address@hidden>
Date: Tue Sep 28 11:08:11 2010 +0200
add translations of packing files from Debian
diff --git a/packaging/debian/po/ca.po b/packaging/debian/po/ca.po
new file mode 100644
index 0000000..ed127a3
--- /dev/null
+++ b/packaging/debian/po/ca.po
@@ -0,0 +1,24 @@
+# Copyright (C) 2009 Robert Millan
+# This file is distributed under the same license as the Gnash package.
+# Robert Millan <address@hidden>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Gnash 0.8.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Robert Millan <address@hidden>\n"
+"Language-Team: LANGUAGE <address@hidden>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../debian/gnash.desktop.in.h:1
+msgid "Gnash SWF Viewer"
+msgstr "Visualitzador d'SWF Gnash"
+
+#: ../../debian/klash.desktop.in.h:1
+msgid "Gnash SWF Viewer for KDE"
+msgstr "Visualitzador d'SWF Gnash per a KDE"
diff --git a/packaging/debian/po/cs.po b/packaging/debian/po/cs.po
new file mode 100644
index 0000000..e515480
--- /dev/null
+++ b/packaging/debian/po/cs.po
@@ -0,0 +1,25 @@
+# Czech translation of gnash.
+# Copyright (C) 2009 Michal Simunek
+# This file is distributed under the same license as the gnash package.
+# Michal Simunek <address@hidden>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnash\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
+"PO-Revision-Date: 2009-11-17 21:04+0100\n"
+"Last-Translator: Michal Simunek <address@hidden>\n"
+"Language-Team: Czech <address@hidden>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../debian/gnash.desktop.in.h:1
+msgid "Gnash SWF Viewer"
+msgstr "PÅehrávaÄ SWF souborů Gnash"
+
+#: ../../debian/klash.desktop.in.h:1
+msgid "Gnash SWF Viewer for KDE"
+msgstr "PÅehrávaÄ SWF souborů Gnash pro KDE"
diff --git a/packaging/debian/po/de.po b/packaging/debian/po/de.po
new file mode 100644
index 0000000..5e0f88f
--- /dev/null
+++ b/packaging/debian/po/de.po
@@ -0,0 +1,24 @@
+# gnash Desktop translation to German.
+# Copyright (C) 2009 Helge Kreutzmann.
+# This file is distributed under the same license as the gnash package.
+# Helge Kreutzmann <address@hidden>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnash\n"
+"Report-Msgid-Bugs-To: address@hidden"
+"POT-Creation-Date: 2009-11-16 14:35+0100\n"
+"PO-Revision-Date: 2009-11-19 17:17+0200\n"
+"Last-Translator: Helge Kreutzmann <address@hidden>\n"
+"Language-Team: de <address@hidden>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../debian/gnash.desktop.in.h:1
+msgid "Gnash SWF Viewer"
+msgstr "Gnash-SWF-Betrachter"
+
+#: ../../debian/klash.desktop.in.h:1
+msgid "Gnash SWF Viewer for KDE"
+msgstr "Gnash-SWF-Betrachter für KDE"
diff --git a/packaging/debian/po/es.po b/packaging/debian/po/es.po
new file mode 100644
index 0000000..ecc1d06
--- /dev/null
+++ b/packaging/debian/po/es.po
@@ -0,0 +1,24 @@
+# Copyright (C) 2009 Robert Millan
+# This file is distributed under the same license as the Gnash package.
+# Robert Millan <address@hidden>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Gnash 0.8.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Robert Millan <address@hidden>\n"
+"Language-Team: LANGUAGE <address@hidden>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../debian/gnash.desktop.in.h:1
+msgid "Gnash SWF Viewer"
+msgstr "Visualizador de SWF Gnash"
+
+#: ../../debian/klash.desktop.in.h:1
+msgid "Gnash SWF Viewer for KDE"
+msgstr "Visualizador de SWF Gnash para KDE"
diff --git a/packaging/debian/po/fi.po b/packaging/debian/po/fi.po
new file mode 100644
index 0000000..db82654
--- /dev/null
+++ b/packaging/debian/po/fi.po
@@ -0,0 +1,26 @@
+# Copyright (C) 2009
+# This file is distributed under the same license as the gnash package.
+#
+# Esko Arajärvi <address@hidden>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: gnash\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
+"PO-Revision-Date: 2009-11-17 23:02+0200\n"
+"Last-Translator: Esko Arajärvi <address@hidden>\n"
+"Language-Team: Finnish <address@hidden>\n"
+"Language: fi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../debian/gnash.desktop.in.h:1
+msgid "Gnash SWF Viewer"
+msgstr "Gnash SWF-katselin"
+
+#: ../../debian/klash.desktop.in.h:1
+msgid "Gnash SWF Viewer for KDE"
+msgstr "Gnash SWF-katselin KDE:lle"
diff --git a/packaging/debian/po/it.po b/packaging/debian/po/it.po
new file mode 100644
index 0000000..fa71e4b
--- /dev/null
+++ b/packaging/debian/po/it.po
@@ -0,0 +1,25 @@
+# ITALIAN TRANSLATION OF GNASH.
+# COPYRIGHT (C) 2009 THE GNASH'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gnash package.
+#
+# Vincenzo Campanella <address@hidden>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: gnash\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
+"PO-Revision-Date: 2009-11-16 17:44ora so\n"
+"Last-Translator: Vincenzo Campanella <address@hidden>\n"
+"Language-Team: it <mailto:address@hidden>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../debian/gnash.desktop.in.h:1
+msgid "Gnash SWF Viewer"
+msgstr "Visualizzatore di SWF Gnash"
+
+#: ../../debian/klash.desktop.in.h:1
+msgid "Gnash SWF Viewer for KDE"
+msgstr "Visualizzatore di SWF per KDE Gnash"
diff --git a/packaging/debian/po/ja.po b/packaging/debian/po/ja.po
new file mode 100644
index 0000000..5727764
--- /dev/null
+++ b/packaging/debian/po/ja.po
@@ -0,0 +1,24 @@
+# Copyright (C) 2009 Robert Millan <address@hidden>
+# This file is distributed under the same license as gnash package.
+# Hideki Yamane (Debian-JP) <address@hidden>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnash 0.8.6-2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-16 14:35+0100\n"
+"PO-Revision-Date: 2009-12-04 09:26+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <address@hidden>\n"
+"Language-Team: Japanese <address@hidden>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../debian/gnash.desktop.in.h:1
+msgid "Gnash SWF Viewer"
+msgstr "Gnash SWF ãã¥ã¼ã¢"
+
+#: ../../debian/klash.desktop.in.h:1
+msgid "Gnash SWF Viewer for KDE"
+msgstr "KDE ç¨ Gnash SWF ãã¥ã¼ã¢"
+
diff --git a/packaging/debian/po/pl.po b/packaging/debian/po/pl.po
new file mode 100644
index 0000000..7086166
--- /dev/null
+++ b/packaging/debian/po/pl.po
@@ -0,0 +1,26 @@
+# Polish translation of debian-specific Gnash desktop files.
+# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the Gnash package.
+# Translators:
+# Wiktor Wandachowicz <address@hidden>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Gnash\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
+"PO-Revision-Date: 2009-11-17 05:05+0100\n"
+"Last-Translator: Wiktor Wandachowicz <address@hidden>\n"
+"Language-Team: Polish <address@hidden>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../debian/gnash.desktop.in.h:1
+msgid "Gnash SWF Viewer"
+msgstr "PrzeglÄ
darka animacji SWF Gnash"
+
+#: ../../debian/klash.desktop.in.h:1
+msgid "Gnash SWF Viewer for KDE"
+msgstr "PrzeglÄ
darka animacji SWF Gnash do KDE"
diff --git a/packaging/debian/po/ru.po b/packaging/debian/po/ru.po
new file mode 100644
index 0000000..2a5ccdc
--- /dev/null
+++ b/packaging/debian/po/ru.po
@@ -0,0 +1,28 @@
+# translation of gnash-ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <address@hidden>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: gnash desktop\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
+"PO-Revision-Date: 2009-11-16 20:15+0300\n"
+"Last-Translator: Yuri Kozlov <address@hidden>\n"
+"Language-Team: Russian <address@hidden>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../../debian/gnash.desktop.in.h:1
+msgid "Gnash SWF Viewer"
+msgstr "ÐÑоÑмоÑÑÑик SWF Gnash"
+
+#: ../../debian/klash.desktop.in.h:1
+msgid "Gnash SWF Viewer for KDE"
+msgstr "ÐÑоÑмоÑÑÑик SWF Gnash Ð´Ð»Ñ KDE"
diff --git a/packaging/debian/po/sv.po b/packaging/debian/po/sv.po
new file mode 100644
index 0000000..e1e5723
--- /dev/null
+++ b/packaging/debian/po/sv.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <address@hidden>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
+"PO-Revision-Date: 2009-11-16 23:12+0100\n"
+"Last-Translator: Martin Bagge <address@hidden>\n"
+"Language-Team: Swedish <address@hidden>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"
+
+#: ../../debian/gnash.desktop.in.h:1
+msgid "Gnash SWF Viewer"
+msgstr "Gnash SWF-visare"
+
+#: ../../debian/klash.desktop.in.h:1
+msgid "Gnash SWF Viewer for KDE"
+msgstr "Gnash SWF-visare för KDE"
diff --git a/packaging/debian/po/vi.po b/packaging/debian/po/vi.po
new file mode 100644
index 0000000..1c4ad00
--- /dev/null
+++ b/packaging/debian/po/vi.po
@@ -0,0 +1,25 @@
+# Vietnamese translation for Gnash Debian desktop file.
+# Copyright © 2010 Free Software Foundation, Inc.
+# Clytie Siddall <address@hidden>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnash\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-16 14:35+0100\n"
+"PO-Revision-Date: 2010-04-01 18:05+1030\n"
+"Last-Translator: Clytie Siddall <address@hidden>\n"
+"Language-Team: Vietnamese <address@hidden>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.8\n"
+
+#: ../../debian/gnash.desktop.in.h:1
+msgid "Gnash SWF Viewer"
+msgstr "Bá» xem SWF Gnash"
+
+#: ../../debian/klash.desktop.in.h:1
+msgid "Gnash SWF Viewer for KDE"
+msgstr "Bá» xem SWF Gnash cho KDE"
diff --git a/packaging/debian/po/zh_CN.po b/packaging/debian/po/zh_CN.po
new file mode 100644
index 0000000..c64217d
--- /dev/null
+++ b/packaging/debian/po/zh_CN.po
@@ -0,0 +1,26 @@
+# Chinese translations for PACKAGE package
+# PACKAGE 软件å
çç®ä½ä¸æç¿»è¯.
+# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# syq <address@hidden>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
+"PO-Revision-Date: 2009-11-16 22:17+0800\n"
+"Last-Translator: èè¿å¼º <address@hidden>\n"
+"Language-Team: Chinese (simplified)\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../debian/gnash.desktop.in.h:1
+msgid "Gnash SWF Viewer"
+msgstr "Gnash SWF æ¥çå¨"
+
+#: ../../debian/klash.desktop.in.h:1
+msgid "Gnash SWF Viewer for KDE"
+msgstr "KDE ä¸çGnash SWF æ¥çå¨"
http://git.savannah.gnu.org/cgit//commit/?id=dc28a79eaf329fb177481dec06078d9afaa36954
commit dc28a79eaf329fb177481dec06078d9afaa36954
Author: Rob Savoye <address@hidden>
Date: Tue Sep 28 11:05:28 2010 +0200
add extrat texinfo stuff from Debian patches.
diff --git a/doc/C/gnashref.xml b/doc/C/gnashref.xml
index 9a944db..9e814c7 100644
--- a/doc/C/gnashref.xml
+++ b/doc/C/gnashref.xml
@@ -65,6 +65,12 @@
<year>2005, 2006, 2007, 2008, 2009, 2010</year>
<holder>Free Software Foundation</holder>
</copyright>
+ <abstract role="texinfo-node">
+ <para>Gnash Documentation</para>
+ </abstract>
+ <subjectset scheme="texinfo-directory">
+ <subject><subjectterm>Video</subjectterm></subject>
+ </subjectset>
<!-- TRANSLATOR NOTE: uncomment this section
diff --git a/doc/C/gnashuser.xml b/doc/C/gnashuser.xml
index 7da7b66..7421a63 100644
--- a/doc/C/gnashuser.xml
+++ b/doc/C/gnashuser.xml
@@ -43,6 +43,12 @@
<year>2005, 2006, 2007, 2008, 2009, 2010</year>
<holder>Free Software Foundation</holder>
</copyright>
+ <abstract role="texinfo-node">
+ <para>Gnash Documentation</para>
+ </abstract>
+ <subjectset scheme="texinfo-directory">
+ <subject><subjectterm>Video</subjectterm></subject>
+ </subjectset>
<!-- TRANSLATOR NOTE: uncomment this section
http://git.savannah.gnu.org/cgit//commit/?id=a5c4b768aab8b10eb8bcdd4a08915548dbc7d18d
commit a5c4b768aab8b10eb8bcdd4a08915548dbc7d18d
Author: Rob Savoye <address@hidden>
Date: Tue Sep 28 11:04:58 2010 +0200
remove extra parens from debug print, as it has too many
diff --git a/utilities/dumpshm.cpp b/utilities/dumpshm.cpp
index 968c022..5438906 100644
--- a/utilities/dumpshm.cpp
+++ b/utilities/dumpshm.cpp
@@ -319,9 +319,9 @@ list_lcs()
log_debug(_("Found it! \"set LCShmKey %s\" in your ~/.gnashrc"),
boost::io::group(hex, showbase,
shmseg.shm_perm.IPC_PERM_KEY));
- log_debug(_("Last changed on: %s"), ctime(&shmseg.shm_ctime))));
- log_debug(_("Last attached on: %s"), ctime(&shmseg.shm_atime))));
- log_debug(_("Last detached on: %s"), ctime(&shmseg.shm_dtime))));
+ log_debug(_("Last changed on: %s"), ctime(&shmseg.shm_ctime));
+ log_debug(_("Last attached on: %s"), ctime(&shmseg.shm_atime));
+ log_debug(_("Last detached on: %s"), ctime(&shmseg.shm_dtime));
return shmseg.shm_perm.IPC_PERM_KEY;
}
#endif // end of IPC_PERM_KEY
http://git.savannah.gnu.org/cgit//commit/?id=c3d67ab3a883f0a5234a8a2b501fa7a2cd5b5c93
commit c3d67ab3a883f0a5234a8a2b501fa7a2cd5b5c93
Author: Rob Savoye <address@hidden>
Date: Tue Sep 28 11:04:06 2010 +0200
add _LDFLAGS, from Debian patches
diff --git a/cygnal/libnet/Makefile.am b/cygnal/libnet/Makefile.am
index 1f9db71..d471e9f 100644
--- a/cygnal/libnet/Makefile.am
+++ b/cygnal/libnet/Makefile.am
@@ -34,6 +34,8 @@ AM_LDFLAGS = \
$(PTHREAD_LIBS) \
$(NULL)
+libgnashnet_la_LDFLAGS = -release $(VERSION) $(AM_LDFLAGS)
+
localedir = $(datadir)/locale
INCLUDES = \
diff --git a/librender/Makefile.am b/librender/Makefile.am
index fe11b0f..7a675c4 100644
--- a/librender/Makefile.am
+++ b/librender/Makefile.am
@@ -68,6 +68,7 @@ noinst_HEADERS = \
pkglib_LTLIBRARIES = libgnashrender.la
libgnashrender_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_X11_LIBS) $(LIBVA_GLX_LIBS)
libgnashrender_la_SOURCES = PathParser.cpp
+libgnashrender_la_LDFLAGS = -release $(VERSION) $(AM_LDFLAGS)
if BUILD_OGL_RENDERER
libgnashrender_la_SOURCES += Renderer_ogl.cpp
http://git.savannah.gnu.org/cgit//commit/?id=322ad39ee5690e8da18786260bd46f65c9e0e44c
commit 322ad39ee5690e8da18786260bd46f65c9e0e44c
Author: Rob Savoye <address@hidden>
Date: Tue Sep 28 11:03:31 2010 +0200
remove extra blank line
diff --git a/configure.ac b/configure.ac
index 60fe17b..0f648e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2760,7 +2760,6 @@ AC_DEFUN([CHECK_VISIBILITY_GCC_BUG],
CHECK_VISIBILITY_GCC_BUG
-
if test x$ac_cv_gcc_visibility_bug = xno; then
AC_LANG_PUSH(C++)
AC_MSG_CHECKING([whether $CXX supports -fvisibility=hidden])
http://git.savannah.gnu.org/cgit//commit/?id=7b98ced745e59f17a684c5e8499b34463e701659
commit 7b98ced745e59f17a684c5e8499b34463e701659
Author: Rob Savoye <address@hidden>
Date: Tue Sep 28 10:17:02 2010 +0200
migrate from debian packaging
diff --git a/packaging/debian/overrides/gnash-cygnal
b/packaging/debian/overrides/gnash-cygnal
new file mode 100644
index 0000000..f8db1a7
--- /dev/null
+++ b/packaging/debian/overrides/gnash-cygnal
@@ -0,0 +1 @@
+gnash-cygnal binary: binary-or-shlib-defines-rpath
diff --git a/packaging/debian/overrides/gnash-tools
b/packaging/debian/overrides/gnash-tools
new file mode 100644
index 0000000..f127f26
--- /dev/null
+++ b/packaging/debian/overrides/gnash-tools
@@ -0,0 +1 @@
+gnash-tools binary: binary-or-shlib-defines-rpath
diff --git a/packaging/debian/overrides/klash b/packaging/debian/overrides/klash
new file mode 100644
index 0000000..914dcc0
--- /dev/null
+++ b/packaging/debian/overrides/klash
@@ -0,0 +1 @@
+klash binary: binary-or-shlib-defines-rpath
diff --git a/packaging/debian/overrides/python-gtk-gnash
b/packaging/debian/overrides/python-gtk-gnash
new file mode 100644
index 0000000..9f9b007
--- /dev/null
+++ b/packaging/debian/overrides/python-gtk-gnash
@@ -0,0 +1 @@
+python-gtk-gnash binary: binary-or-shlib-defines-rpath
diff --git a/packaging/debian/source/format b/packaging/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/packaging/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 5 +-
configure.ac | 3 +-
doc/C/gnashref.xml | 6 ++
doc/C/gnashuser.xml | 6 ++
librender/Makefile.am | 3 +-
packaging/deb.am | 54 ++++++++++----------
packaging/debian/Makefile.am | 25 ---------
packaging/debian/README.Debian | 47 +++++++++++++++++
packaging/debian/TODO.Debian | 4 --
packaging/debian/browser-plugin-gnash.dirs | 2 +
...-gnash.install => browser-plugin-gnash.install} | 0
...nash.postinst => browser-plugin-gnash.postinst} | 0
...ugin-gnash.prerm => browser-plugin-gnash.prerm} | 0
packaging/debian/changelog | 13 ++++-
packaging/debian/control | 43 +++++++++++----
packaging/debian/dirs | 2 -
packaging/debian/docs | 5 --
packaging/debian/gnash-dev.install | 5 +-
.../debian/{gnash.desktop => gnash.desktop.in} | 0
.../debian/gtk-plugin-gnash.lintian-overrides | 1 -
.../debian/{klash.desktop => klash.desktop.in} | 0
packaging/debian/mozilla-plugin-gnash.dirs | 2 -
.../gnash-cygnal} | 0
.../gnash-tools} | 0
packaging/debian/overrides/klash | 1 +
.../mozilla-plugin-gnash} | 0
packaging/debian/overrides/python-gtk-gnash | 1 +
.../{source.lintian-overrides => overrides/soure} | 0
packaging/debian/po/ca.po | 24 +++++++++
packaging/debian/po/cs.po | 25 +++++++++
packaging/debian/po/de.po | 24 +++++++++
packaging/debian/po/es.po | 24 +++++++++
packaging/debian/po/fi.po | 26 +++++++++
packaging/debian/po/it.po | 25 +++++++++
packaging/debian/po/ja.po | 24 +++++++++
packaging/debian/po/pl.po | 26 +++++++++
packaging/debian/po/ru.po | 28 ++++++++++
packaging/debian/po/sv.po | 27 ++++++++++
packaging/debian/po/vi.po | 25 +++++++++
packaging/debian/po/zh_CN.po | 26 +++++++++
...gtk-plugin-gnash.dirs => python-gtk-gnash.dirs} | 0
...ugin-gnash.install => python-gtk-gnash.install} | 0
packaging/debian/rules | 19 +++----
packaging/snapshot.am | 6 +-
utilities/dumpshm.cpp | 6 +-
45 files changed, 458 insertions(+), 105 deletions(-)
delete mode 100644 packaging/debian/Makefile.am
create mode 100644 packaging/debian/README.Debian
delete mode 100644 packaging/debian/TODO.Debian
create mode 100644 packaging/debian/browser-plugin-gnash.dirs
rename packaging/debian/{mozilla-plugin-gnash.install =>
browser-plugin-gnash.install} (100%)
rename packaging/debian/{mozilla-plugin-gnash.postinst =>
browser-plugin-gnash.postinst} (100%)
rename packaging/debian/{mozilla-plugin-gnash.prerm =>
browser-plugin-gnash.prerm} (100%)
delete mode 100644 packaging/debian/dirs
delete mode 100644 packaging/debian/docs
rename packaging/debian/{gnash.desktop => gnash.desktop.in} (100%)
delete mode 100644 packaging/debian/gtk-plugin-gnash.lintian-overrides
rename packaging/debian/{klash.desktop => klash.desktop.in} (100%)
delete mode 100644 packaging/debian/mozilla-plugin-gnash.dirs
rename packaging/debian/{gnash-cygnal.lintian-overrides =>
overrides/gnash-cygnal} (100%)
rename packaging/debian/{gnash-tools.lintian-overrides =>
overrides/gnash-tools} (100%)
create mode 100644 packaging/debian/overrides/klash
rename packaging/debian/{mozilla-plugin-gnash.lintian-overrides =>
overrides/mozilla-plugin-gnash} (100%)
create mode 100644 packaging/debian/overrides/python-gtk-gnash
rename packaging/debian/{source.lintian-overrides => overrides/soure} (100%)
create mode 100644 packaging/debian/po/ca.po
create mode 100644 packaging/debian/po/cs.po
create mode 100644 packaging/debian/po/de.po
create mode 100644 packaging/debian/po/es.po
create mode 100644 packaging/debian/po/fi.po
create mode 100644 packaging/debian/po/it.po
create mode 100644 packaging/debian/po/ja.po
create mode 100644 packaging/debian/po/pl.po
create mode 100644 packaging/debian/po/ru.po
create mode 100644 packaging/debian/po/sv.po
create mode 100644 packaging/debian/po/vi.po
create mode 100644 packaging/debian/po/zh_CN.po
rename packaging/debian/{gtk-plugin-gnash.dirs => python-gtk-gnash.dirs} (100%)
rename packaging/debian/{gtk-plugin-gnash.install => python-gtk-gnash.install}
(100%)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 9e9c9aca293d218428dd8f3f1a096b5ce900e670,
Rob Savoye <=