[Gnash-commit] /srv/bzr/gnash/trunk r10585: building debs almost works again.

[rob]

------------------------------------------------------------
revno: 10585
committer: address@hidden
branch nick: trunk
timestamp: Sat 2009-02-14 17:33:12 -0700
message:
  building debs almost works again.
modified:
  packaging/deb.am
  packaging/debian/changelog
  packaging/debian/control
  packaging/debian/gnash-klash.install
  packaging/debian/klash.install
  packaging/debian/klash.links
  packaging/debian/konqueror-plugin-gnash.install
  packaging/debian/mozilla-plugin-gnash.install
  packaging/debian/mozilla-plugin-gnash.postinst
  packaging/debian/mozilla-plugin-gnash.prerm
  packaging/debian/rules
  packaging/rpm.am

=== modified file 'packaging/deb.am'
--- a/packaging/deb.am  2008-08-17 18:18:16 +0000
+++ b/packaging/deb.am  2009-02-15 00:33:12 +0000
@@ -16,26 +16,32 @@
 # 
 
 # Build a Debian/Ubuntu .deb GNU/Linux package
-deb debian: dist-bzip2 $(srcdir)/packaging/debian/rules
-       rm -rf gnash-${VERSION}
-       tar jxf gnash-${VERSION}.tar.bz2
-       cp -fr $(srcdir)/packaging/debian gnash-${VERSION}/
-       (cd gnash-${VERSION}; dpkg-buildpackage)
+deb debian: dist $(srcdir)/packaging/debian/rules
+       now=`date "+%Y%m%d"`; \
+       snapshot_dir="gnash-$(RELEASE)$${now}"; \
+       rm -rf gnash-${VERSION}; \
+       tar jxf gnash-${VERSION}.tar.gz; \
+       cp -fr $(srcdir)/packaging/debian gnash-$(RELEASE}${VERSION}/; \
+       (cd gnash-$(RELEASE)${VERSION}; dpkg-buildpackage)
 
 # Build a .deb snapshot, which means we have to munge the date
 # into the proper files to build a package with the version in
 # all the right places. This involves editing the debian/changelog
 # file. Configure.ac is edited by the snapshot target.
-snapshot-deb: # snapshot
-       now=`date "+%Y%m%d"`; \
-       snapshot_dir="gnash-$${now}trunk"; \
-       if test ! -d $${snapshot_dir}/debian; then \
-         cp -rp $(srcdir)/packaging/debian $${snapshot_dir}/; \
+snapshot-deb: # distdir snapshot
+       -now=`date "+%Y%m%d"`; \
+       pkgname="gnash-${RELEASE}$${now}"; \
+       snapshot_dir="gnash-${RELEASE}$${now}"; \
+       snapshot_tar="$${pkgname}.tar.gz"; \
+       if test -d "gnash-trunk"; then \
+         mv -f gnash-trunk $${snapshot_dir}; \
        fi; \
+       mkdir -p $${snapshot_dir}/debian; \
+       cp -rfp $(srcdir)/packaging/debian/* $${snapshot_dir}/debian/; \
        if test -e $${snapshot_dir}/debian/changelog; then \
          mv -f $${snapshot_dir}/debian/changelog 
$${snapshot_dir}/debian/changelog.orig; \
-         sed -e "s:(.*):($${now}trunk):" 
$${snapshot_dir}/debian/changelog.orig > $${snapshot_dir}/debian/changelog; \
+         sed -e "s:trunk:trunk$${now}:" $${snapshot_dir}/debian/changelog.orig 
> $${snapshot_dir}/debian/changelog; \
        fi; \
-       (cd $${snapshot_dir}; dpkg-buildpackage -rfakeroot)
+       (cd $${snapshot_dir}; dpkg-buildpackage -rfakeroot -j6)
 
 .PHONY : deb debian 

=== modified file 'packaging/debian/changelog'
--- a/packaging/debian/changelog        2008-03-03 16:02:39 +0000
+++ b/packaging/debian/changelog        2009-02-15 00:33:12 +0000
@@ -1,3 +1,9 @@
+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
+
 gnash (0.8.2~cvs20080302t0056-0cvs) snapshot; urgency=low
 
   * be able to make our own deb packages.

=== modified file 'packaging/debian/control'
--- a/packaging/debian/control  2008-03-03 04:34:32 +0000
+++ b/packaging/debian/control  2009-02-15 00:33:12 +0000
@@ -1,18 +1,16 @@
 Source: gnash
 Priority: optional
-Maintainer: Alexander Sack <address@hidden>
-XSBC-Original-Maintainer: Miriam Ruiz <address@hidden>
-Uploaders: Alexander Sack <address@hidden>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), quilt, autoconf, 
automake1.9 | automake, libtool, libltdl3-dev, help2man, libxmu-dev, dejagnu, 
autotools-dev, libboost-dev, libboost-thread-dev, libxml2-dev, libjpeg-dev, 
libpng12-dev | libpng-dev, libagg-dev, libgstreamer0.10-dev, libpango1.0-dev | 
pango-devel, libgtkglext1-dev, libmad0-dev, libdirectfb-dev, libkonq4-dev, 
libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | 
libcurl3-openssl-dev, libcaca-dev, libboost-date-time-dev, libavcodec-dev, 
libavformat-dev, libming-dev, libming-util, mtasc, 
libgstreamer-plugins-base0.10-dev
+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, libboost-dev, libboost-thread-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-time-dev, libavcodec-dev, libavformat-dev
 Standards-Version: 3.7.2
 Section: utils
-Xs-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/gnash/ubuntu
 
 Package: gnash-common
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-plugins-base, 
gstreamer0.10-alsa
-Suggests: gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
+# Suggests: gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
 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~)
 Description: free SWF movie player - common files/libraries

=== modified file 'packaging/debian/gnash-klash.install'
--- a/packaging/debian/gnash-klash.install      2008-02-13 03:15:17 +0000
+++ b/packaging/debian/gnash-klash.install      2009-02-15 00:33:12 +0000
@@ -1,4 +1,4 @@
 usr/share/apps/klash/*
-usr/lib/kde3/*
+usr/lib/kde4/*
 usr/bin/kde-gnash
 usr/share/services/klash_part.desktop

=== modified file 'packaging/debian/klash.install'
--- a/packaging/debian/klash.install    2008-03-03 04:34:32 +0000
+++ b/packaging/debian/klash.install    2009-02-15 00:33:12 +0000
@@ -1,3 +1,4 @@
-usr/bin/kde-gnash
+usr/bin/kde4-gnash
+usr/bin/gnash
 usr/share/pixmaps/klash.xpm
 usr/share/applications/klash.desktop

=== modified file 'packaging/debian/klash.links'
--- a/packaging/debian/klash.links      2008-03-03 04:34:32 +0000
+++ b/packaging/debian/klash.links      2009-02-15 00:33:12 +0000
@@ -1,1 +1,1 @@
-usr/bin/kde-gnash usr/bin/klash
+usr/bin/kde4-gnash usr/bin/gnash

=== modified file 'packaging/debian/konqueror-plugin-gnash.install'
--- a/packaging/debian/konqueror-plugin-gnash.install   2008-03-03 04:34:32 
+0000
+++ b/packaging/debian/konqueror-plugin-gnash.install   2009-02-15 00:33:12 
+0000
@@ -1,4 +1,4 @@
-usr/lib/kde3/libklashpart.so
-usr/lib/kde3/libklashpart.la
+usr/lib/kde4/libklashpart.so
+usr/lib/kde4/libklashpart.la
 usr/share/apps/klash
 usr/share/services/[Kk]lash*

=== modified file 'packaging/debian/mozilla-plugin-gnash.install'
--- a/packaging/debian/mozilla-plugin-gnash.install     2008-10-24 15:18:26 
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.install     2009-02-15 00:33:12 
+0000
@@ -1,1 +1,1 @@
-usr/lib/gnash/libgnashplugin.so
+usr/lib/mozilla/plugins/libgnashplugin.so

=== modified file 'packaging/debian/mozilla-plugin-gnash.postinst'
--- a/packaging/debian/mozilla-plugin-gnash.postinst    2008-06-27 03:50:30 
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.postinst    2009-02-15 00:33:12 
+0000
@@ -5,7 +5,7 @@
 case "$1" in
         configure)
                      for p in iceape iceweasel mozilla firefox xulrunner 
midbrowser; do 
-                                               update-alternatives --install 
"/usr/lib/$p/plugins/flashplugin-alternative.so" "$p-flashplugin" 
/usr/lib/gnash/libgnashplugin.so 50;
+                                               update-alternatives --install 
"/usr/lib/$p/plugins/flashplugin-alternative.so" "$p-flashplugin" 
/usr/lib/mozilla/plugins/libgnashplugin.so 50;
                                        done
         ;;
         abort-upgrade|abort-remove|abort-deconfigure)

=== modified file 'packaging/debian/mozilla-plugin-gnash.prerm'
--- a/packaging/debian/mozilla-plugin-gnash.prerm       2008-06-27 03:50:30 
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.prerm       2009-02-15 00:33:12 
+0000
@@ -5,7 +5,7 @@
 case "$1" in
         remove|upgrade|deconfigure)
                 for p in iceape iceweasel mozilla firefox xulrunner 
midbrowser; do 
-                       update-alternatives --remove "$p-flashplugin" 
/usr/lib/gnash/libgnashplugin.so;
+                       update-alternatives --remove "$p-flashplugin" 
/usr/lib/mozilla/plugins/libgnashplugin.so;
                         [ `update-alternatives --list "$p-flashplugin" | wc 
-l` = 0 ]  && \
                                 update-alternatives --remove-all 
"$p-flashplugin"
                 done
@@ -15,7 +15,7 @@
                   dpkg --compare-versions "$2" "<<" 0.8.1~trunk.070802-0ubuntu5
                then 
                   for p in iceape iceweasel mozilla firefox xulrunner 
midbrowser; do 
-                        update-alternatives --remove "$p-flashplugin" 
/usr/lib/gnash/libgnashplugin.so;
+                        update-alternatives --remove "$p-flashplugin" 
/usr/lib/mozilla/plugins/libgnashplugin.so;
                         [ `update-alternatives --list "$p-flashplugin" | wc 
-l` = 0 ]  && \
                                 update-alternatives --remove-all 
"$p-flashplugin"
                   done

=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules    2008-10-24 15:18:26 +0000
+++ b/packaging/debian/rules    2009-02-15 00:33:12 +0000
@@ -35,7 +35,8 @@
        dh_testdir
 
        @printf "\n == APPLYING PATCHES 
============================================ \n\n"
-       $(MAKE) -f /usr/share/quilt/quilt.make patch
+       # we have no patches, we're the developers!
+#      $(MAKE) -f /usr/share/quilt/quilt.make patch
        @printf "\n ----------------------------------- End of APPLYING PATCHES 
---- \n\n"
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -50,16 +51,24 @@
        @printf "\n -------------------------------------------- End of AUTOGEN 
---- \n\n"
 
        @printf "\n == CONFIGURE 
=================================================== \n\n"
-       # In the future, I want to add LDFLAGS="-Wl,-z,defs"
-       ./configure CFLAGS="$(CFLAGS)" \
+       ./configure CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
                --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-               --prefix=/usr --mandir=\$${prefix}/share/man \
-               --infodir=\$${prefix}/share/info \
-               --enable-cygnal --enable-media=gst --enable-renderer=agg \
-               --with-npapi-plugindir=\$${prefix}/lib/gnash \
-               --with-kde-pluginprefix=\$${prefix} \
-               --enable-shared --disable-static --disable-testsuite \
-               --disable-rpath CXXFLAGS=-O0
+               --prefix=/usr \
+               --mandir=/usr/share/man \
+               --infodir=/usr/share/info \
+               --disable-testsuite \
+               --disable-rpath \
+               --enable-cygnal \
+               --enable-media=ffmpeg \
+               --enable-gui=gtk,kde4 \
+               --enable-renderer=agg \
+               --with-npapi-plugindir=/usr/lib/mozilla/plugins
+#              --with-kde4-plugindir=/usr/lib/kde4/plugins \
+#              --with-kde4-pluginprefix=/usr \
+#              --with-kde4-servicesdir=/usr/share/kde4/services \
+#              --with-kde4-appsdatadir=/usr/share/kde4/apps/klash \
+#              --with-kde4-configdir=/usr/share/kde4/config
+
        @printf "\n ------------------------------------------- End of 
CONFIGURE ---- \n\n"
 
        cp libamf/README README.amf
@@ -71,7 +80,7 @@
        dh_testdir
 
        @printf "\n == MAKE 
======================================================== \n\n"
-       $(MAKE)
+       $(MAKE) 
        @printf "\n ----------------------------------------------- End of MAKE 
---- \n\n"
 
 #      @printf "\n == CHECK 
======================================================= \n\n"
@@ -115,7 +124,8 @@
        -rm -f README.amf
 
        @printf "\n == CLEANING PATCHES 
============================================ \n\n"
-       $(MAKE) -f /usr/share/quilt/quilt.make unpatch
+       # we have no patches, we're the developers!
+#      $(MAKE) -f /usr/share/quilt/quilt.make unpatch
        @printf "\n ----------------------------------- End of CLEANING PATCHES 
---- \n\n"
 
        dh_clean 
@@ -144,6 +154,8 @@
 
        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/
+       cp libbase/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libnet/
        install -d $(CURDIR)/debian/tmp/usr/include/gnash/libamf/
        cp libamf/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libamf/
        install -d $(CURDIR)/debian/tmp/usr/include/gnash/libcore/
@@ -189,7 +201,7 @@
        dh_builddeb
 
 VERSION_DATE = $(shell /bin/date --utc +%0Y%0m%0d.%0k%0M)
-VERSION_ID = 0.7.2+cvs$(VERSION_DATE)
+VERSION_ID = trunk_$(VERSION_DATE)
 get-orig-source:
        echo Downloading gnash $(VERSION_ID) from CVS...
        #test -e gnashd && exit

=== modified file 'packaging/rpm.am'
--- a/packaging/rpm.am  2009-02-14 18:10:55 +0000
+++ b/packaging/rpm.am  2009-02-15 00:33:12 +0000
@@ -29,8 +29,8 @@
        address@hidden "+%Y%m%d"`; \
        pkgname="gnash-trunk_$${now}"; \
        snapshot_tar="$${pkgname}.tar.gz"; \
-       sed -e "s/Version.*/Version:    trunk_$${now}/" 
$(srcdir)/packaging/redhat/gnash.spec > gnash.spec; \
-       sed -e "s/Version.*/Version:    trunk_$${now}/" 
$(srcdir)/packaging/redhat/klash.spec > klash.spec;
+       sed -e "s/Version.*/Version:    $(RELEASE)$${now}/" 
$(srcdir)/packaging/redhat/gnash.spec > gnash.spec; \
+       sed -e "s/Version.*/Version:    $(RELEASE)$${now}/" 
$(srcdir)/packaging/redhat/klash.spec > klash.spec;
 
 # Build an Redhat/Fedora .rpm package
 # We do this by using the source snapshot that we know is 'distclean'.