[Gnash-commit] /srv/bzr/gnash/trunk r11568: fix packaging files to build debug package, and fix the dependencies.

[Rob Savoye]

------------------------------------------------------------
revno: 11568
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Fri 2009-10-16 11:04:59 -0600
message:
  fix packaging files to build debug package, and fix the dependencies.
removed:
  packaging/debian/gnash-plugin.install
  packaging/debian/gnash-plugin.substvars
modified:
  packaging/debian/changelog
  packaging/debian/control
  packaging/debian/rules

=== modified file 'packaging/debian/changelog'
--- a/packaging/debian/changelog        2009-02-15 00:33:12 +0000
+++ b/packaging/debian/changelog        2009-10-16 17:04:59 +0000
@@ -1,13 +1,13 @@
 gnash (trunk) snapshot; urgency=low
 
-  * update so we can package our own binary snapshots in deb.
- 
- -- Rob Savoye <address@hidden>  Sun, 3 March 2008 04:20:00 +0100
+  * Add -dbg package so oprofile works out of the box.
+
+ -- Rob Savoye <address@hidden>  Thu, 15 Oct 2009 04:20:00 +0100
 
 gnash (0.8.2~cvs20080302t0056-0cvs) snapshot; 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

=== modified file 'packaging/debian/control'
--- a/packaging/debian/control  2009-09-07 23:27:55 +0000
+++ b/packaging/debian/control  2009-10-16 17:04:59 +0000
@@ -1,18 +1,24 @@
 Source: gnash
 Priority: optional
 Maintainer: Rob Savoye <address@hidden>
-XSBC-Original-Maintainer: Miriam Ruiz <address@hidden>, Alexander Sack 
<address@hidden>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), autoconf, 
automake1.9 | automake, libtool, libltdl3-dev, libxmu-dev, dejagnu, 
autotools-dev, libboost1.38-dev, libboost-thread1.38-dev, libjpeg-dev, 
libpng12-dev | libpng-dev, libagg-dev, libpango1.0-dev | pango-devel, 
libgtkglext1-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev | 
libcurl4-openssl-dev | libcurl3-openssl-dev, libboost-date-time1.38-dev, 
libavcodec-dev, libavformat-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, libboost-date-time1.38-dev | libboost-date-time1.35-dev | 
libboost-date-time1.34-dev, libboost1.38-dev | libboost1.37-dev | 
libboost1.36-dev | libboost1.35-dev | libboost1.34-dev, libboost-thread1.38-dev 
| libboost-thread1.37-dev | libboost-thread1.36-dev | libboost-thread1.35-dev | 
libboost-thread1.34-dev
 Standards-Version: 3.7.2
 Section: utils
 
+Package: gnash-dbg
+Architecture: any
+Section: libdevel
+Priority: extra
+Depends: gnash (= ${binary:Version})
+Description: Debug symbols for Gnash.
+
 Package: gnash-common
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-plugins-base, 
gstreamer0.10-alsa gstreamer0.10-ffmpeg
-# Suggests: gstreamer0.10-fluendo-mp3
-Conflicts: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~)
-Replaces: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~)
+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, libboost1.38-dev | libboost1.37-dev | 
libboost1.36-dev | libboost1.35-dev | libboost1.34-dev, libboost-thread1.38-dev 
| libboost-thread1.37-dev | libboost-thread1.36-dev | libboost-thread1.35-dev | 
libboost-thread1.34-dev
+#Suggests: gstreamer0.10-fluendo-mp3  gstreamer0.10-alsa gstreamer0.10-ffmpeg
+Conflicts: libgnash0 (<< 0.8.5~), gnash (<< 0.8.5~), libklash0 (<< 0.8.5~)
+Replaces: libgnash0 (<< 0.8.5~), gnash (<< 0.8.5~), libklash0 (<< 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.
@@ -24,30 +30,25 @@
 Package: gnash
 Section: utils
 Architecture: any
-Depends: gnash-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: gnash-common (= ${binary:Version}), libgtk2.0-0, libpango1.0-0, 
libatk1.0-0
 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.
  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
+ 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.
  .
- 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.
- .
- This package includes the standalone GTK+-based OpenGL player.
+ 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}), ${shlibs:Depends}, ${misc:Depends}
+Depends: gnash-common (= ${binary:Version}), ${misc:Depends}, 
libboost-thread1.38.0, libboost-date-time1.38.0, kdelibs5
 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.
@@ -70,7 +71,7 @@
 Package: gnash-tools
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: gnash-common (= ${binary:Version}), ${misc:Depends}, libboost1.38-dev 
| libboost1.37-dev | libboost1.36-dev | libboost1.35-dev | libboost1.34-dev, 
libboost-thread1.38-dev | libboost-thread1.37-dev | libboost-thread1.36-dev | 
libboost-thread1.35-dev | libboost-thread1.34-dev
 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.
@@ -93,7 +94,7 @@
 Package: gnash-cygnal
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: gnash-common (= ${binary:Version}), ${misc:Depends}, libboost1.38-dev 
| libboost1.37-dev | libboost1.36-dev | libboost1.35-dev | libboost1.34-dev, 
libboost-thread1.38-dev | libboost-thread1.37-dev | libboost-thread1.36-dev | 
libboost-thread1.35-dev | libboost-thread1.34-dev
 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.
@@ -116,7 +117,7 @@
 Package: mozilla-plugin-gnash
 Section: utils
 Architecture: any
-Depends: gnash (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: gnash (= ${binary:Version}), ${misc:Depends}, libgtk2.0-0, 
libpango1.0-0, libatk1.0-0
 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,7 +132,7 @@
 Package: konqueror-plugin-gnash
 Section: utils
 Architecture: any
-Depends: klash (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: klash (= ${binary:Version}), ${misc:Depends}, kdelibs5
 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.
@@ -143,7 +144,7 @@
 Package: gtk-plugin-gnash
 Section: libs
 Architecture: any
-Depends: gnash (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: gnash (= ${binary:Version}), ${misc:Depends}, python2.6-dev | 
python2.5-dev | python2.4-dev
 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

=== removed file 'packaging/debian/gnash-plugin.install'
--- a/packaging/debian/gnash-plugin.install     2006-04-08 03:09:44 +0000
+++ b/packaging/debian/gnash-plugin.install     1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/mozilla/plugins/*
-

=== removed file 'packaging/debian/gnash-plugin.substvars'
--- a/packaging/debian/gnash-plugin.substvars   2006-04-08 03:09:44 +0000
+++ b/packaging/debian/gnash-plugin.substvars   1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.5-1), libgcc1 (>= 1:4.0.2), libglu1-xorg | 
libglu1, libjpeg62, libogg0 (>= 1.1.3), libpng12-0 (>= 1.2.8rel), 
libsdl-mixer1.2 (>= 1.2.6), libsdl1.2debian (>> 1.2.7+1.2.8), libstdc++6 (>= 
4.0.2-4), libx11-6, libxi6, libxml2 (>= 2.6.23), libxmu6, xlibmesa-gl | libgl1, 
zlib1g (>= 1:1.2.1), libgtk2.0-dev, libgtkglext1-dev, libatk1.0-dev, 
libpango1.0-dev, libcairo2-dev

=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules    2009-09-07 22:00:37 +0000
+++ b/packaging/debian/rules    2009-10-16 17:04:59 +0000
@@ -192,12 +192,12 @@
 #      dh_installmime
        dh_installman
        dh_link
-       dh_strip
+       dh_strip --dbg-package=gnash-dbg
        dh_compress
        dh_fixperms
        dh_makeshlibs
        dh_installdeb
-#      dh_shlibdeps
+#      dh_shlibdeps debian/tmp/usr/bin/* debian/tmp/usr/sbin/* 
debian/tmp/usr/lib/*
        dh_gencontrol
        dh_md5sums
        dh_builddeb
@@ -207,7 +207,7 @@
 get-orig-source:
        echo Downloading gnash $(VERSION_ID) from CVS...
        #test -e gnashd && exit
-       export CVS_RSH="ssh"; cvs -z3 -d:pserver:address@hidden:/sources/gnash 
co gnash
+       bzr branch http://bzr.savannah.gnu.org/r/gnash/trunk/
        #cd gnash; rm -rf `find . -name CVS`
        tar cvfz "gnash_$(VERSION_ID).orig.tar.gz" gnash
        mv gnash "gnash-$(VERSION_ID)"