[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11819: Various cleanups as identifi
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11819: Various cleanups as identified by lintian. |
|
Date: |
Wed, 27 Jan 2010 20:56:22 -0700 |
|
User-agent: |
Bazaar (2.0.2) |
------------------------------------------------------------
revno: 11819
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2010-01-27 20:56:22 -0700
message:
Various cleanups as identified by lintian.
modified:
packaging/debian/changelog
packaging/debian/control
packaging/debian/rules
=== modified file 'packaging/debian/changelog'
--- a/packaging/debian/changelog 2010-01-26 02:46:23 +0000
+++ b/packaging/debian/changelog 2010-01-28 03:56:22 +0000
@@ -1,16 +1,16 @@
-gnash (trunk) snapshot; urgency=low
+gnash (trunk) unstable; urgency=low
* Add -dbg package so oprofile works out of the box.
-- Rob Savoye (Rollinsville, CO) <address@hidden> Thu, 15 Oct 2009 04:20:00
+0100
-gnash (0.8.2~cvs20080302t0056-0cvs) snapshot; urgency=low
+gnash (0.8.2~cvs20080302t0056-0cvs) unstable; urgency=low
* be able to make our own deb packages.
-- Rob Savoye <address@hidden> Sun, 3 March 2008 04:20:00 +0100
-gnash (0.8.2~cvs20080223t0056-0ubuntu1) UNRELEASED; urgency=low
+gnash (0.8.2~cvs20080223t0056-0ubuntu1) unstable; urgency=low
* package 0.8.2 preview
* drop pkglibs that don't exist anymore from gnash-common.install
@@ -30,19 +30,19 @@
-- Alexander Sack <address@hidden> Sat, 23 Feb 2008 01:58:44 +0100
-gnash (0.8.1-0ubuntu3) gutsy; urgency=low
+gnash (0.8.1-0ubuntu3) unstable; urgency=low
* fix package description and use SWF instead of Flash
-- Michael Vogt <address@hidden> Wed, 10 Oct 2007 14:25:42 +0200
-gnash (0.8.1-0ubuntu2) gutsy; urgency=low
+gnash (0.8.1-0ubuntu2) unstable; urgency=low
* update gnash license to GPLv3 in debian/copyright. (LP: #147913)
-- Alexander Sack <address@hidden> Thu, 04 Oct 2007 11:22:21 +0200
-gnash (0.8.1-0ubuntu1) gutsy; urgency=low
+gnash (0.8.1-0ubuntu1) unstable; urgency=low
* New upstream version 0.8.1 final - UVFe acked in LP: #144396
@@ -67,19 +67,19 @@
-- Alexander Sack <address@hidden> Thu, 13 Sep 2007 10:10:38 +0200
-gnash (0.8.1~trunk.070802-0ubuntu5) gutsy; urgency=low
+gnash (0.8.1~trunk.070802-0ubuntu5) unstable; urgency=low
* Rebuild for boost 1.34.0 -> 1.34.1 transistion.
-- Steve Kowalik <address@hidden> Thu, 13 Sep 2007 11:05:21 +1000
-gnash (0.8.1~trunk.070802-0ubuntu4) gutsy; urgency=low
+gnash (0.8.1~trunk.070802-0ubuntu4) unstable; urgency=low
* Fixed postinst and prerm procedures
-- Mario Danic <address@hidden> Sun, 12 Aug 2007 00:56:48 +0200
-gnash (0.8.1~trunk.070802-0ubuntu3) gutsy; urgency=low
+gnash (0.8.1~trunk.070802-0ubuntu3) unstable; urgency=low
* debian/control: Addeed browsers ID's to mozilla-plugin-gnash
* debian/mozilla-plugin-gnash.postinst: cleanup of update-alternative
@@ -89,14 +89,14 @@
-- Mario Danic <address@hidden> Sat, 11 Aug 2007 15:29:52 +0200
-gnash (0.8.1~trunk.070802-0ubuntu2) gutsy; urgency=low
+gnash (0.8.1~trunk.070802-0ubuntu2) unstable; urgency=low
* debian/mozilla-plugin-gnash.postinst: use right path for alternative
* debian/mozilla-plugin-gnash.prerm: fix wrong path for alternatives
-- Alexander Sack <address@hidden> Fri, 3 Aug 2007 04:08:28 +0200
-gnash (0.8.1~trunk.070802-0ubuntu1) gutsy; urgency=low
+gnash (0.8.1~trunk.070802-0ubuntu1) unstable; urgency=low
Update source for trunk build 070802 aka preview 0.8.1:
bzr repo: https://code.launchpad.net/~vcs-imports/gnash/trunk
@@ -147,25 +147,25 @@
-- Alexander Sack <address@hidden> Thu, 02 Aug 2007 16:49:57 +0000
-gnash (0.8.0~cvs20070611.1016-1ubuntu3) gutsy; urgency=low
+gnash (0.8.0~cvs20070611.1016-1ubuntu3) unstable; urgency=low
* Rebuild for the libcurl transition mess.
-- Steve Kowalik <address@hidden> Thu, 5 Jul 2007 01:35:59 +1000
-gnash (0.8.0~cvs20070611.1016-1ubuntu2~mt1) feisty; urgency=low
+gnash (0.8.0~cvs20070611.1016-1ubuntu2~mt1) unstable; urgency=low
- * feisty backport for mozillateam preview archive
+ * unstable backport for mozillateam preview archive
-- Alexander Sack <address@hidden> Sun, 17 Jun 2007 17:37:00 +0200
-gnash (0.8.0~cvs20070611.1016-1ubuntu2) gutsy; urgency=low
+gnash (0.8.0~cvs20070611.1016-1ubuntu2) unstable; urgency=low
* debian/control: add libgstreamer-plugins-base0.10-dev to fix ftbfs
-- Alexander Sack <address@hidden> Wed, 13 Jun 2007 09:41:59 +0200
-gnash (0.8.0~cvs20070611.1016-1ubuntu1) gutsy; urgency=low
+gnash (0.8.0~cvs20070611.1016-1ubuntu1) unstable; urgency=low
* debian/patches/gnash_easy_codec_install: initial version of easy codec
install patch for gnash
=== modified file 'packaging/debian/control'
--- a/packaging/debian/control 2009-12-25 17:21:57 +0000
+++ b/packaging/debian/control 2010-01-28 03:56:22 +0000
@@ -1,36 +1,48 @@
Source: gnash
Priority: optional
Maintainer: Rob Savoye <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
+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
Standards-Version: 3.7.2
Section: utils
+Homepage: http://www.gnu.org/software/gnash/
Package: gnash-dbg
Architecture: any
Section: libdevel
Priority: extra
-Depends: gnash-common (= ${binary:Version})
+Depends: ${shlibs: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: ${misc:Depends}, libgstreamer-plugins-base0.10-0, libgstreamer0.10-0,
libxml2, libgif4, libfreetype6, zlib1g, libstdc++6, libcairo2, libexpat1,
libfontconfig1, libx11-6, libbz2-1.0, 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
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgstreamer-plugins-base0.10-0,
libgstreamer0.10-0, libxml2, libgif4, libfreetype6, zlib1g, libstdc++6,
libcairo2, libexpat1, libfontconfig1, libx11-6, libbz2-1.0,
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, libc6
Suggests: gstreamer0.10-fluendo-mp3, gstreamer0.10-alsa, gstreamer0.10-ffmpeg
-Replaces: gnash-common (<< 0.8.5~)
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.
.
This package includes the common, gui-independent files/libraries
.
- Homepage: http://www.gnu.org/software/gnash/
Package: gnash
Section: utils
Architecture: any
-Replaces: gnash (<< 0.8.5~)
-Depends: gnash-common (= ${binary:Version}), libgtk2.0-0, libpango1.0-0,
libatk1.0-0
+Depends: ${shlibs:Depends}, gnash-common (= ${binary:Version}), libgtk2.0-0,
libpango1.0-0, libatk1.0-0, libc6
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.
@@ -41,15 +53,14 @@
core ones are implemented, and many of the newer ones work, but may be
missing some of their methods.
.
- This package includes the standalone GTK+-based player that uses software
rendering.
+ This package includes the standalone GTK+-based player that uses software
+ rendering.
.
- Homepage: http://www.gnu.org/software/gnash/
Package: klash
Section: utils
Architecture: any
-Depends: gnash-common (= ${binary:Version}), ${misc:Depends}, kdelibs5
-Replaces: klash (<< 0.8.5~)
+Depends: ${shlibs:Depends}, gnash-common (= ${binary:Version}),
${misc:Depends}, kdelibs5, libc6
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.
@@ -67,13 +78,11 @@
.
Klash is a free standalone Flash movie player for KDE.
.
- Homepage: http://www.gnu.org/software/gnash/
Package: gnash-tools
Section: utils
Architecture: any
-Depends: gnash-common (= ${binary:Version}), ${misc:Depends}
-Replaces: gnash-tools (<< 0.8.5~)
+Depends: ${shlibs:Depends}, gnash-common (= ${binary:Version}),
${misc:Depends}, , libc6
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.
@@ -91,13 +100,11 @@
.
This package includes command-line utilities based in gnash.
.
- Homepage: http://www.gnu.org/software/gnash/
Package: gnash-cygnal
Section: utils
Architecture: any
-Replaces: gnash-cygnal (<< 0.8.5~)
-Depends: gnash-common (= ${binary:Version}), ${misc:Depends},
+Depends: ${shlibs:Depends}, gnash-common (= ${binary:Version}),
${misc:Depends},, libc6
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.
@@ -115,13 +122,11 @@
.
Cygnal is Gnash's media server.
.
- Homepage: http://www.gnu.org/software/gnash/
Package: mozilla-plugin-gnash
Section: utils
Architecture: any
-Replaces: mozilla-plugin-gnash (<< 0.8.5~)
-Depends: gnash-common (= ${binary:Version}), , gnash (= ${binary:Version}),
${misc:Depends}, libgtk2.0-0, libpango1.0-0, libatk1.0-0
+Depends: ${shlibs:Depends}, gnash-common (= ${binary:Version}), , gnash (=
${binary:Version}), ${misc:Depends}, libgtk2.0-0, libpango1.0-0, libatk1.0-0,
libc6
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
@@ -131,26 +136,22 @@
.
This package includes the plugin for Firefox/Mozilla Web Browser.
.
- Homepage: http://www.gnu.org/software/gnash/
Package: konqueror-plugin-gnash
Section: utils
Architecture: any
-Replaces: konqueror-plugin-gnash (<< 0.8.5~)
-Depends: gnash-common (= ${binary:Version}), klash (= ${binary:Version}),
${misc:Depends}, kdelibs5
+Depends: gnash-common (= ${binary:Version}), klash (= ${binary:Version}),
${misc:Depends}, kdelibs5, libc6
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.
.
This package includes the plugin for Konqueror.
.
- Homepage: http://www.gnu.org/software/gnash/
Package: gtk-plugin-gnash
Section: libs
Architecture: any
-Replaces: gtk-plugin-gnash (<< 0.8.5~)
-Depends: gnash-common (= ${binary:Version}), ${misc:Depends}, python2.6-dev |
python2.5-dev | python2.4-dev
+Depends: ${shlibs:Depends}, gnash-common (= ${binary:Version}),
${misc:Depends}, python2.6-dev | python2.5-dev | python2.4-dev, libc6
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
@@ -159,5 +160,3 @@
.
This package includes the plugin for Gtk and PyGtk..
.
- Homepage: http://www.gnu.org/software/gnash/
-
=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules 2009-10-16 17:04:59 +0000
+++ b/packaging/debian/rules 2010-01-28 03:56:22 +0000
@@ -11,7 +11,6 @@
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
MAIN_VERSION = $(shell head -n 1 debian/changelog | cut '-d ' -f 2 | sed
's/[()]//g')
-
CFLAGS = -Wall -g -Werror-implicit-function-declaration
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -20,6 +19,8 @@
CFLAGS += -O2
endif
+DEB_DH_SHLIBDEPS_ARGS_ALL := -X* /usr/lib/gnash
+
# shared library versions, option 1
#version=2.0.5
#major=2
@@ -46,9 +47,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"
+# @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.
@@ -97,33 +98,11 @@
dh_testdir
dh_testroot
rm -f build-stamp
-
-ifeq (Makefile,$(wildcard Makefile))
- -$(MAKE) maintainer-clean
- -$(MAKE) distclean
-endif
-
-ifneq ($(wildcard ${AUTO_JUNK}),)
- rm $(wildcard ${AUTO_JUNK})
-endif
-
- rm -f config.{sub,guess,log,status}
- rm -f libtool
rm -f `find . -name "Makefile"| grep -v "debian/"`
rm -f `find . -name "*.o"`
rm -rf `find . -name ".libs"`
rm -rf `find . -name ".deps"`
-
- rm -f configure aclocal.m4 config.h.in
- #-find . -name Makefile.in -exec rm {} \;
- -rm `find . -name Makefile.in`
-
- -rm -rf libltdl/autom4te.cache
- -rm -f libltdl/* ltmain.sh
-
- #cd debian/h2m; $(MAKE) clean
-
- -rm -f README.amf
+ rm -f config.h.in
@printf "\n == CLEANING PATCHES
============================================ \n\n"
# we have no patches, we're the developers!
@@ -152,8 +131,6 @@
$(MAKE) install-plugins DESTDIR=$(CURDIR)/debian/tmp
@printf "\n -------------------------------------------- End of INSTALL
---- \n\n"
- #cd debian/h2m; $(MAKE)
-
install -d $(CURDIR)/debian/tmp/usr/include/gnash/libbase/
cp libbase/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libbase/
install -d $(CURDIR)/debian/tmp/usr/include/gnash/libnet/
@@ -191,13 +168,14 @@
# dh_installmenu
# dh_installmime
dh_installman
+ dh_desktop
dh_link
dh_strip --dbg-package=gnash-dbg
dh_compress
dh_fixperms
dh_makeshlibs
dh_installdeb
-# dh_shlibdeps debian/tmp/usr/bin/* debian/tmp/usr/sbin/*
debian/tmp/usr/lib/*
+ dh_shlibdeps debian/tmp/usr/bin/* debian/tmp/usr/lib/gnash/*
dh_gencontrol
dh_md5sums
dh_builddeb
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11819: Various cleanups as identified by lintian.,
Rob Savoye <=