r89 - in /packages/gnash/trunk/debian: TODO changelog control gnash-cygnal.install gnash-tools.install gnash.install klash.install konqueror-plugin-gnash.install libgnash0.install libklash0.install mozilla-plugin-gnash.install rules
baby-guest at users.alioth.debian.org
baby-guest at users.alioth.debian.org
Sat Jun 9 20:20:06 UTC 2007
Author: baby-guest
Date: Sat Jun 9 20:20:06 2007
New Revision: 89
URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=89
Log:
Reestructured the code in debian/rules so that multiple builds can be made
Modified:
packages/gnash/trunk/debian/TODO
packages/gnash/trunk/debian/changelog
packages/gnash/trunk/debian/control
packages/gnash/trunk/debian/gnash-cygnal.install
packages/gnash/trunk/debian/gnash-tools.install
packages/gnash/trunk/debian/gnash.install
packages/gnash/trunk/debian/klash.install
packages/gnash/trunk/debian/konqueror-plugin-gnash.install
packages/gnash/trunk/debian/libgnash0.install
packages/gnash/trunk/debian/libklash0.install
packages/gnash/trunk/debian/mozilla-plugin-gnash.install
packages/gnash/trunk/debian/rules
Modified: packages/gnash/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/TODO?rev=89&op=diff
==============================================================================
--- packages/gnash/trunk/debian/TODO (original)
+++ packages/gnash/trunk/debian/TODO Sat Jun 9 20:20:06 2007
@@ -1,5 +1,4 @@
* Create a better icon.
-* Add a debian/watch file.
* Find a way to generate man pages without $DISPLAY.
* Add LDFLAGS="-Wl,-z,defs" to ./configure in rules.
* Add swfdec testsuite for check.
Modified: packages/gnash/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/changelog?rev=89&op=diff
==============================================================================
--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Sat Jun 9 20:20:06 2007
@@ -5,9 +5,12 @@
headers are available for the check. Closes: #425888
* Removed $(MAKE) check. Does not seem to be able to finish in my computer.
* Changed build dependency from automake1.9 to automake | automake1.9
- * Added new binary packages: libklash0 and klash
- * removed debian/*.dirs files. They're not neccesary.
+ * Removed build-dependency: libfltk1.1-dev
+ * Added binary packages: libklash0 and klash (again)
+ * Removed debian/*.dirs files. They're not neccesary.
+ * Reestructured the code in debian/rules so that multiple builds can be made.
* Changed renderer to OpenGL again. Klash won't compile against AGG. Fuck!
+ * Konqueror plugin now depends on klash.
-- Miriam Ruiz <little_miry at yahoo.es> Fri, 08 Jun 2007 18:59:46 +0000
Modified: packages/gnash/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/control?rev=89&op=diff
==============================================================================
--- packages/gnash/trunk/debian/control (original)
+++ packages/gnash/trunk/debian/control Sat Jun 9 20:20:06 2007
@@ -1,7 +1,7 @@
Source: gnash
Priority: optional
Maintainer: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), quilt, autoconf, automake | automake1.9, libtool, libltdl3-dev, help2man, libxmu-dev, dejagnu, autotools-dev, libboost-dev, libboost-thread-dev, libxml2-dev, libjpeg-dev, libpng12-dev | libpng-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libagg-dev, libgstreamer0.10-dev | libgstreamer0.8-dev, libpango1.0-dev | pango-devel, libgtkglext1-dev, libmad0-dev, libxul-dev | mozilla-dev, libdirectfb-dev, libkonq4-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | libcurl3-openssl-dev , libfltk1.1-dev, libcaca-dev, libboost-date-time-dev, libavcodec-dev, libavformat-dev, libming-dev, libming-util, mtasc, swfmill
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), quilt, autoconf, automake | automake1.9, libtool, libltdl3-dev, help2man, libxmu-dev, dejagnu, autotools-dev, libboost-dev, libboost-thread-dev, libxml2-dev, libjpeg-dev, libpng12-dev | libpng-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libagg-dev, libgstreamer0.10-dev | libgstreamer0.8-dev, libpango1.0-dev | pango-devel, libgtkglext1-dev, libmad0-dev, libxul-dev | mozilla-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, swfmill
Standards-Version: 3.7.2
Section: utils
@@ -15,19 +15,6 @@
plugin for Firefox/Mozilla or Konqueror.
.
This package includes the shared libraries.
- .
- Homepage: http://www.gnu.org/software/gnash/
-
-Package: libklash0
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: gstreamer0.10-plugins-base, gstreamer0.10-alsa | gstreamer0.10-audiosink, gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
-Description: free Flash movie player - shared libraries for KDE
- Gnash is a free Flash movie player, which works either standalone, or as
- plugin for Firefox/Mozilla or Konqueror.
- .
- This package includes the shared libraries for the KDE environment.
.
Homepage: http://www.gnu.org/software/gnash/
@@ -138,7 +125,7 @@
Package: konqueror-plugin-gnash
Section: utils
Architecture: any
-Depends: libgnash0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: klash (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: free Flash movie player - Plugin for Konqueror
Gnash is a free Flash movie player, which works either standalone, or as
plugin for Firefox/Mozilla or Konqueror.
Modified: packages/gnash/trunk/debian/gnash-cygnal.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/gnash-cygnal.install?rev=89&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash-cygnal.install (original)
+++ packages/gnash/trunk/debian/gnash-cygnal.install Sat Jun 9 20:20:06 2007
@@ -1,1 +1,1 @@
-usr/bin/cygnal
+tmp-gnash/usr/bin/cygnal usr/bin/
Modified: packages/gnash/trunk/debian/gnash-tools.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/gnash-tools.install?rev=89&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash-tools.install (original)
+++ packages/gnash/trunk/debian/gnash-tools.install Sat Jun 9 20:20:06 2007
@@ -1,2 +1,2 @@
-usr/bin/gparser
-usr/bin/gprocessor
+tmp-gnash/usr/bin/gparser usr/bin/
+tmp-gnash/usr/bin/gprocessor usr/bin/
Modified: packages/gnash/trunk/debian/gnash.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/gnash.install?rev=89&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash.install (original)
+++ packages/gnash/trunk/debian/gnash.install Sat Jun 9 20:20:06 2007
@@ -1,3 +1,3 @@
-usr/bin/gnash
-usr/share/pixmaps/gnash.xpm
-usr/share/applications/gnash.desktop
+tmp-gnash/usr/bin/gnash usr/bin/
+gnash.xpm usr/share/pixmaps/
+gnash.desktop usr/share/applications/
Modified: packages/gnash/trunk/debian/klash.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/klash.install?rev=89&op=diff
==============================================================================
--- packages/gnash/trunk/debian/klash.install (original)
+++ packages/gnash/trunk/debian/klash.install Sat Jun 9 20:20:06 2007
@@ -1,3 +1,3 @@
-usr/bin/klash
-usr/share/pixmaps/klash.xpm
-usr/share/applications/klash.desktop
+tmp-gnash/usr/bin/klash usr/bin/
+klash.xpm usr/share/pixmaps/
+klash.desktop usr/share/applications/
Modified: packages/gnash/trunk/debian/konqueror-plugin-gnash.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/konqueror-plugin-gnash.install?rev=89&op=diff
==============================================================================
--- packages/gnash/trunk/debian/konqueror-plugin-gnash.install (original)
+++ packages/gnash/trunk/debian/konqueror-plugin-gnash.install Sat Jun 9 20:20:06 2007
@@ -1,4 +1,4 @@
-usr/lib/kde3/libklashpart.so
-usr/lib/kde3/libklashpart.la
-usr/share/apps/klash
-usr/share/services/[Kk]lash*
+tmp-gnash/usr/lib/kde3/libklashpart.so usr/lib/kde3/
+tmp-gnash/usr/lib/kde3/libklashpart.la usr/lib/kde3/
+tmp-gnash/usr/share/apps/klash usr/share/apps/
+tmp-gnash/usr/share/services/[Kk]lash* usr/share/services/
Modified: packages/gnash/trunk/debian/libgnash0.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/libgnash0.install?rev=89&op=diff
==============================================================================
--- packages/gnash/trunk/debian/libgnash0.install (original)
+++ packages/gnash/trunk/debian/libgnash0.install Sat Jun 9 20:20:06 2007
@@ -1,5 +1,5 @@
-usr/lib/libgnash*.so.*
-usr/lib/libgnash*-*.so
-usr/share/lintian/overrides/libgnash0
-usr/share/gnash/GnashG.png
-usr/share/gnash/gnash_128_96.ico
+tmp-gnash/usr/lib/libgnash*.so.* usr/lib/
+tmp-gnash/usr/lib/libgnash*-*.so usr/lib/
+overrides/libgnash0 usr/share/lintian/overrides/
+tmp-gnash/usr/share/gnash/GnashG.png usr/share/gnash
+tmp-gnash/usr/share/gnash/gnash_128_96.ico usr/share/gnash
Modified: packages/gnash/trunk/debian/libklash0.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/libklash0.install?rev=89&op=diff
==============================================================================
--- packages/gnash/trunk/debian/libklash0.install (original)
+++ packages/gnash/trunk/debian/libklash0.install Sat Jun 9 20:20:06 2007
@@ -1,3 +1,3 @@
-uusr/lib/libklash*.so.*
-usr/lib/libklash*-*.so
-usr/share/lintian/overrides/libklash0
+tmp-gnash/usr/lib/libklash*.so.* usr/lib/
+tmp-gnash/usr/lib/libklash*-*.so usr/lib/
+overrides/libklash0 usr/share/lintian/overrides/
Modified: packages/gnash/trunk/debian/mozilla-plugin-gnash.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/mozilla-plugin-gnash.install?rev=89&op=diff
==============================================================================
--- packages/gnash/trunk/debian/mozilla-plugin-gnash.install (original)
+++ packages/gnash/trunk/debian/mozilla-plugin-gnash.install Sat Jun 9 20:20:06 2007
@@ -1,5 +1,5 @@
-usr/lib/gnash/libgnashplugin.so
-usr/lib/libmozsdk*.so.*
-usr/lib/mozilla/*
-usr/lib/firefox/*
-usr/share/lintian/overrides/gnash-plugin
+tmp-gnash/usr/lib/gnash/libgnashplugin.so usr/lib/gnash/
+tmp-gnash/usr/lib/libmozsdk*.so.* usr/lib/
+tmp-gnash/usr/lib/mozilla/* usr/lib/mozilla/
+tmp-gnash/usr/lib/firefox/* usr/lib/firefox/
+overrides/gnash-plugin usr/share/lintian/overrides/
Modified: packages/gnash/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/rules?rev=89&op=diff
==============================================================================
--- packages/gnash/trunk/debian/rules (original)
+++ packages/gnash/trunk/debian/rules Sat Jun 9 20:20:06 2007
@@ -31,9 +31,9 @@
# CONFIGURE
-config.status: configure.ac
- dh_testdir
-
+setup: setup-stamp
+setup-stamp:
+ dh_testdir
@printf "\n == APPLYING PATCHES ============================================ \n\n"
$(MAKE) -f /usr/share/quilt/quilt.make patch
@printf "\n ----------------------------------- End of APPLYING PATCHES ---- \n\n"
@@ -46,49 +46,58 @@
endif
@printf "\n == AUTOGEN ===================================================== \n\n"
- ./autogen.sh
+ test -e configure || ./autogen.sh
@printf "\n -------------------------------------------- End of AUTOGEN ---- \n\n"
- @printf "\n == CONFIGURE =================================================== \n\n"
+ cp libamf/README README.amf
+ touch $@
+
+config-gnash: config-gnash-stamp
+config-gnash-stamp: setup
+ dh_testdir
+ @printf "\n == CONFIGURE GNASH ============================================= \n\n"
# In the future, I want to add LDFLAGS="-Wl,-z,defs"
- ./configure CFLAGS="$(CFLAGS)" \
+ test -e $@ || ( mkdir tmp-gnash && cd tmp-gnash && $(CURDIR)/configure CFLAGS="$(CFLAGS)" \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--enable-mp3 --enable-plugin --enable-klash --enable-sound=sdl \
--enable-gstreamer --enable-media=gst --enable-renderer=opengl \
--with-plugindir=\$${prefix}/lib/gnash \
--enable-shared=yes --enable-static=yes --enable-sdk-install \
- --disable-rpath --enable-lotsa-warnings --without-gcc-arch
- @printf "\n ------------------------------------------- End of CONFIGURE ---- \n\n"
-
- cp libamf/README README.amf
+ --disable-rpath --enable-lotsa-warnings --without-gcc-arch \
+ )
+ @printf "\n ------------------------------------- End of CONFIGURE GNASH ---- \n\n"
+ touch $@
# BUILD
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- @printf "\n == MAKE ======================================================== \n\n"
- $(MAKE)
- @printf "\n ----------------------------------------------- End of MAKE ---- \n\n"
-
- @#@printf "\n == CHECK ======================================================= \n\n"
- @#-$(MAKE) check
- @#@printf "\n ---------------------------------------------- End of CHECK ---- \n\n"
-
- touch build-stamp
+build: build-gnash
+
+build-gnash: build-gnash-stamp
+build-gnash-stamp: config-gnash
+ dh_testdir
+
+ @printf "\n == MAKE GNASH ================================================== \n\n"
+ test -e $@ || $(MAKE) -C tmp-gnash
+ @printf "\n ----------------------------------------- End of MAKE GNASH ---- \n\n"
+
+ @#@printf "\n == CHECK GNASH ================================================= \n\n"
+ @#-test -e $@ || $(MAKE) -C tmp-gnash check
+ @#@printf "\n ---------------------------------------- End of CHECK GNASH ---- \n\n"
+
+ touch $@
# CLEAN
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
+
+ -rm -rf *-stamp tmp-* debian/tmp-*
ifeq (Makefile,$(wildcard Makefile))
- -$(MAKE) maintainer-clean
- -$(MAKE) distclean
+ -$(MAKE) -C tmp-gnash maintainer-clean
+ -$(MAKE) -C tmp-gnash distclean
endif
ifneq ($(wildcard ${AUTO_JUNK}),)
@@ -127,43 +136,30 @@
dh_clean -k
dh_installdirs
- install -d $(CURDIR)/debian/tmp/usr/bin
- install -d $(CURDIR)/debian/tmp/usr/lib
- install -d $(CURDIR)/debian/tmp/usr/lib/gnash/
- install -d $(CURDIR)/debian/tmp/usr/lib/mozilla/plugins/
- install -d $(CURDIR)/debian/tmp/usr/lib/firefox/plugins/
- install -d $(CURDIR)/debian/tmp/usr/include/gnash
-
@printf "\n == INSTALL ===================================================== \n\n"
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) install -C tmp-gnash DESTDIR=$(CURDIR)/debian/tmp-gnash
@printf "\n -------------------------------------------- End of INSTALL ---- \n\n"
#cd debian/h2m; $(MAKE)
- install -d $(CURDIR)/debian/tmp/usr/share/lintian/overrides/
- cp debian/overrides/* $(CURDIR)/debian/tmp/usr/share/lintian/overrides/
-
- install -d $(CURDIR)/debian/tmp/usr/include/gnash/
- cp compatibility_include.h $(CURDIR)/debian/tmp/usr/include/gnash/
- 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/libgeometry/
- cp libgeometry/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libgeometry/
- 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/server/
- cp server/*.h $(CURDIR)/debian/tmp/usr/include/gnash/server/
- install -d $(CURDIR)/debian/tmp/usr/include/gnash/backend/
- cp backend/*.h $(CURDIR)/debian/tmp/usr/include/gnash/backend/
- install -d $(CURDIR)/debian/tmp/usr/include/gnash/gui/
- cp gui/*.h $(CURDIR)/debian/tmp/usr/include/gnash/gui/
-
- install -d $(CURDIR)/debian/tmp/usr/share/pixmaps/
- cp debian/*.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/
- install -d $(CURDIR)/debian/tmp/usr/share/applications/
- cp debian/*.desktop $(CURDIR)/debian/tmp/usr/share/applications/
+# install -d $(CURDIR)/debian/tmp/usr/include/gnash/
+# cp compatibility_include.h $(CURDIR)/debian/tmp/usr/include/gnash/
+# 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/libgeometry/
+# cp libgeometry/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libgeometry/
+# 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/server/
+# cp server/*.h $(CURDIR)/debian/tmp/usr/include/gnash/server/
+# install -d $(CURDIR)/debian/tmp/usr/include/gnash/backend/
+# cp backend/*.h $(CURDIR)/debian/tmp/usr/include/gnash/backend/
+# install -d $(CURDIR)/debian/tmp/usr/include/gnash/gui/
+# cp gui/*.h $(CURDIR)/debian/tmp/usr/include/gnash/gui/
# CREATE PACKAGES
+
+binary: binary-indep binary-arch
# Build architecture-independent files here.
binary-indep: build install
@@ -176,7 +172,7 @@
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
- dh_install --sourcedir=$(CURDIR)/debian/tmp
+ dh_install --sourcedir=$(CURDIR)/debian
# dh_installmenu
# dh_installmime
dh_installman
@@ -185,7 +181,8 @@
dh_compress
dh_fixperms
#dh_makeshlibs -V 'libgnash0 (=$${binary:Version})'
- dh_makeshlibs -V 'libgnash0 (=$(MAIN_VERSION))'
+ dh_makeshlibs -plibgnash0 -V 'libgnash0 (=$(MAIN_VERSION))'
+ dh_makeshlibs -plibklash0 -V 'libklash0 (=$(MAIN_VERSION))'
dh_installdeb
dh_shlibdeps
dh_gencontrol
@@ -194,6 +191,7 @@
VERSION_DATE = $(shell /bin/date --utc +%0Y%0m%0d.%0k%0M)
VERSION_ID = 0.8.0~cvs$(VERSION_DATE)
+
get-orig-source:
echo Downloading gnash $(VERSION_ID) from CVS...
#test -e gnashd && exit
@@ -205,6 +203,5 @@
cp debian "gnash-$(VERSION_ID)" -a
cd "gnash-$(VERSION_ID)"; dch -v "$(VERSION_ID)-1" "New Upstream Release. Downloaded from CVS."
-
-binary: binary-indep binary-arch
+.PHONY: setup setup-gnash config config-gnash build-gnash
.PHONY: build clean binary-indep binary-arch binary install get-orig-source
More information about the pkg-flash-devel
mailing list