r103 - in /packages/gnash/trunk: ./ debian/ debian/h2m/

asac at users.alioth.debian.org asac at users.alioth.debian.org
Tue Jun 12 12:26:36 UTC 2007 

Author: asac
Date: Tue Jun 12 12:26:36 2007
New Revision: 103

URL: http://svn.debian.org/wsvn/?sc=1&rev=103
Log:
merge Alexander Sack 2007-06-12 revert baby's changes for revisions 47..58; cherry-pick whats needed afterwards

Added:
    packages/gnash/trunk/debian/gnash-cygnal.dirs
    packages/gnash/trunk/debian/gnash.dirs
    packages/gnash/trunk/debian/klash.dirs
    packages/gnash/trunk/debian/konqueror-plugin-gnash.dirs
    packages/gnash/trunk/debian/libgnash-dev.dirs
    packages/gnash/trunk/debian/libgnash0.dirs
    packages/gnash/trunk/debian/mozilla-plugin-gnash.dirs
Removed:
    packages/gnash/trunk/debian/libklash0.install
Modified:
    packages/gnash/trunk/   (props changed)
    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/h2m/Makefile
    packages/gnash/trunk/debian/h2m/gparser
    packages/gnash/trunk/debian/h2m/gprocessor
    packages/gnash/trunk/debian/klash.install
    packages/gnash/trunk/debian/konqueror-plugin-gnash.install
    packages/gnash/trunk/debian/libgnash0.install
    packages/gnash/trunk/debian/mozilla-plugin-gnash.install
    packages/gnash/trunk/debian/rules

Propchange: packages/gnash/trunk/
------------------------------------------------------------------------------
--- bzr:merge (added)
+++ bzr:merge Tue Jun 12 12:26:36 2007
@@ -1,0 +1,1 @@
+asac at jwsdot.com-20070612122605-jwopbr7mjw0wsdq0

Modified: packages/gnash/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/TODO?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/TODO (original)
+++ packages/gnash/trunk/debian/TODO Tue Jun 12 12:26:36 2007
@@ -1,4 +1,5 @@
 * 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/packages/gnash/trunk/debian/changelog?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Tue Jun 12 12:26:36 2007
@@ -1,17 +1,10 @@
-gnash (0.8.0+cvs20070609.2200-1) unstable; urgency=low
+gnash (0.7.2+cvs20070525.0721-1) unstable; urgency=low
 
   * New Upstream Release. Downloaded from CVS.
   * Added ming_headers.patch patch so that the missing definitions in ming
     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 automake1.9 | automake
-  * 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.
-  * konqueror-plugin-gnash now depends on klash
 
- -- Miriam Ruiz <little_miry at yahoo.es>  Sat, 09 Jun 2007 22:01:35 +0000
+ -- Miriam Ruiz <little_miry at yahoo.es>  Fri, 25 May 2007 07:21:23 +0000
 
 gnash (0.7.2+cvs20070518.1557-1) unstable; urgency=low
 

Modified: packages/gnash/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/control?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/control (original)
+++ packages/gnash/trunk/debian/control Tue Jun 12 12:26:36 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, 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, 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
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), quilt, autoconf, 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
 Standards-Version: 3.7.2
 Section: utils
 
@@ -102,7 +102,7 @@
 Package: konqueror-plugin-gnash
 Section: utils
 Architecture: any
-Depends: gnash (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgnash0 (= ${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.

Added: packages/gnash/trunk/debian/gnash-cygnal.dirs
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/gnash-cygnal.dirs?rev=103&op=file
==============================================================================
--- packages/gnash/trunk/debian/gnash-cygnal.dirs (added)
+++ packages/gnash/trunk/debian/gnash-cygnal.dirs Tue Jun 12 12:26:36 2007
@@ -1,0 +1,1 @@
+usr/bin

Modified: packages/gnash/trunk/debian/gnash-cygnal.install
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/gnash-cygnal.install?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash-cygnal.install (original)
+++ packages/gnash/trunk/debian/gnash-cygnal.install Tue Jun 12 12:26:36 2007
@@ -1,1 +1,1 @@
-tmp-gnash/usr/bin/cygnal usr/bin/
+usr/bin/cygnal

Modified: packages/gnash/trunk/debian/gnash-tools.install
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/gnash-tools.install?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash-tools.install (original)
+++ packages/gnash/trunk/debian/gnash-tools.install Tue Jun 12 12:26:36 2007
@@ -1,2 +1,2 @@
-tmp-gnash/usr/bin/gparser usr/bin/
-tmp-gnash/usr/bin/gprocessor usr/bin/
+usr/bin/gparser
+usr/bin/gprocessor

Added: packages/gnash/trunk/debian/gnash.dirs
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/gnash.dirs?rev=103&op=file
==============================================================================
--- packages/gnash/trunk/debian/gnash.dirs (added)
+++ packages/gnash/trunk/debian/gnash.dirs Tue Jun 12 12:26:36 2007
@@ -1,0 +1,1 @@
+usr/bin

Modified: packages/gnash/trunk/debian/gnash.install
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/gnash.install?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/gnash.install (original)
+++ packages/gnash/trunk/debian/gnash.install Tue Jun 12 12:26:36 2007
@@ -1,3 +1,3 @@
-tmp-gnash/usr/bin/gnash usr/bin/
-gnash.xpm usr/share/pixmaps/
-gnash.desktop usr/share/applications/
+usr/bin/gnash
+usr/share/pixmaps/gnash.xpm
+usr/share/applications/gnash.desktop

Modified: packages/gnash/trunk/debian/h2m/Makefile
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/h2m/Makefile?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/h2m/Makefile (original)
+++ packages/gnash/trunk/debian/h2m/Makefile Tue Jun 12 12:26:36 2007
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-MANPAGES= gnash.1 gparser.1 gprocessor.1 cygnal.1 klash.1
+MANPAGES= gnash.1 gparser.1 gprocessor.1 cygnal.1
 
 all: $(MANPAGES)
 

Modified: packages/gnash/trunk/debian/h2m/gparser
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/h2m/gparser?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/h2m/gparser (original)
+++ packages/gnash/trunk/debian/h2m/gparser Tue Jun 12 12:26:36 2007
@@ -11,8 +11,10 @@
       awk '(p<1){if(NF==0){p++;next;}}{print}'
     ;;
    "--version")
-    LD_LIBRARY_PATH="$LIB" $BIN/gnash --version 2>&1 | \
-      head -n 1 | awk '{ print $2 }'
+    echo gparser \
+        `LD_LIBRARY_PATH="$LIB" $BIN/gparser --version 2>&1 | awk '{ print $4 }' | awk -F, '{ print $1 }'` \
+        \(gnash \
+        `LD_LIBRARY_PATH="$LIB" $BIN/gparser --version 2>&1 | awk '{ print $7 }' | awk -F, '{ print $1 }'`\)
     ;;
 esac
 exit 0

Modified: packages/gnash/trunk/debian/h2m/gprocessor
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/h2m/gprocessor?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/h2m/gprocessor (original)
+++ packages/gnash/trunk/debian/h2m/gprocessor Tue Jun 12 12:26:36 2007
@@ -11,8 +11,10 @@
       awk '(p<3){if(NF==0){p++;next;}}{print}'
     ;;
    "--version")
-    LD_LIBRARY_PATH="$LIB" $BIN/gnash --version 2>&1 | \
-      head -n 1 | awk '{ print $2 }'
+    echo gprocessor \
+        `LD_LIBRARY_PATH="$LIB" $BIN/gprocessor --version 2>&1 | awk '{ print $4 }' | awk -F, '{ print $1 }'` \
+        \(gnash \
+        `LD_LIBRARY_PATH="$LIB" $BIN/gprocessor --version 2>&1 | awk '{ print $7 }' | awk -F, '{ print $1 }'`\)
     ;;
 esac
 exit 0

Added: packages/gnash/trunk/debian/klash.dirs
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/klash.dirs?rev=103&op=file
==============================================================================
--- packages/gnash/trunk/debian/klash.dirs (added)
+++ packages/gnash/trunk/debian/klash.dirs Tue Jun 12 12:26:36 2007
@@ -1,0 +1,1 @@
+usr/bin

Modified: packages/gnash/trunk/debian/klash.install
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/klash.install?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/klash.install (original)
+++ packages/gnash/trunk/debian/klash.install Tue Jun 12 12:26:36 2007
@@ -1,3 +1,3 @@
-tmp-gnash/usr/bin/klash usr/bin/
-klash.xpm usr/share/pixmaps/
-klash.desktop usr/share/applications/
+usr/bin/klash
+usr/share/pixmaps/klash.xpm
+usr/share/applications/klash.desktop

Added: packages/gnash/trunk/debian/konqueror-plugin-gnash.dirs
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/konqueror-plugin-gnash.dirs?rev=103&op=file
==============================================================================
--- packages/gnash/trunk/debian/konqueror-plugin-gnash.dirs (added)
+++ packages/gnash/trunk/debian/konqueror-plugin-gnash.dirs Tue Jun 12 12:26:36 2007
@@ -1,0 +1,3 @@
+usr/lib/kde3
+usr/share/apps/klash
+usr/share/services

Modified: packages/gnash/trunk/debian/konqueror-plugin-gnash.install
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/konqueror-plugin-gnash.install?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/konqueror-plugin-gnash.install (original)
+++ packages/gnash/trunk/debian/konqueror-plugin-gnash.install Tue Jun 12 12:26:36 2007
@@ -1,4 +1,4 @@
-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/
+usr/lib/kde3/libklashpart.so
+usr/lib/kde3/libklashpart.la
+usr/share/apps/klash
+usr/share/services/[Kk]lash*

Added: packages/gnash/trunk/debian/libgnash-dev.dirs
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/libgnash-dev.dirs?rev=103&op=file
==============================================================================
--- packages/gnash/trunk/debian/libgnash-dev.dirs (added)
+++ packages/gnash/trunk/debian/libgnash-dev.dirs Tue Jun 12 12:26:36 2007
@@ -1,0 +1,4 @@
+usr/lib
+usr/include
+usr/include/gnash/libbase
+usr/include/gnash/libgeometry

Added: packages/gnash/trunk/debian/libgnash0.dirs
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/libgnash0.dirs?rev=103&op=file
==============================================================================
--- packages/gnash/trunk/debian/libgnash0.dirs (added)
+++ packages/gnash/trunk/debian/libgnash0.dirs Tue Jun 12 12:26:36 2007
@@ -1,0 +1,1 @@
+usr/lib

Modified: packages/gnash/trunk/debian/libgnash0.install
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/libgnash0.install?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/libgnash0.install (original)
+++ packages/gnash/trunk/debian/libgnash0.install Tue Jun 12 12:26:36 2007
@@ -1,5 +1,5 @@
-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
+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

Added: packages/gnash/trunk/debian/mozilla-plugin-gnash.dirs
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/mozilla-plugin-gnash.dirs?rev=103&op=file
==============================================================================
--- packages/gnash/trunk/debian/mozilla-plugin-gnash.dirs (added)
+++ packages/gnash/trunk/debian/mozilla-plugin-gnash.dirs Tue Jun 12 12:26:36 2007
@@ -1,0 +1,4 @@
+usr/lib
+usr/lib/gnash
+usr/lib/mozilla/plugins
+usr/lib/mozilla-firefox/plugins

Modified: packages/gnash/trunk/debian/mozilla-plugin-gnash.install
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/mozilla-plugin-gnash.install?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/mozilla-plugin-gnash.install (original)
+++ packages/gnash/trunk/debian/mozilla-plugin-gnash.install Tue Jun 12 12:26:36 2007
@@ -1,5 +1,5 @@
-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/
+usr/lib/gnash/libgnashplugin.so
+usr/lib/libmozsdk*.so.*
+usr/lib/mozilla/*
+usr/lib/firefox/*
+usr/share/lintian/overrides/gnash-plugin

Modified: packages/gnash/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/rules?rev=103&op=diff
==============================================================================
--- packages/gnash/trunk/debian/rules (original)
+++ packages/gnash/trunk/debian/rules Tue Jun 12 12:26:36 2007
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # The template for this file was originally written by Joey Hess and Craig Small.
-# Modified for Gnash by Miriam Ruiz
+# Developed for Gnash by Miriam Ruiz
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -31,9 +31,9 @@
 
 # CONFIGURE
 
-setup: setup-stamp
-setup-stamp:
-	dh_testdir
+config.status: configure.ac
+	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,58 +46,49 @@
 endif
 
 	@printf "\n == AUTOGEN ===================================================== \n\n"
-	test -e configure || ./autogen.sh
+	./autogen.sh
 	@printf "\n -------------------------------------------- End of AUTOGEN ---- \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"
+	@printf "\n == CONFIGURE =================================================== \n\n"
 	# In the future, I want to add LDFLAGS="-Wl,-z,defs"
-	test -e $@ || ( mkdir tmp-gnash && cd tmp-gnash && $(CURDIR)/configure CFLAGS="$(CFLAGS)" \
+	./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=agg \
 		--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 GNASH ---- \n\n"
-	touch $@
+		--disable-rpath --enable-lotsa-warnings --without-gcc-arch
+	@printf "\n ------------------------------------------- End of CONFIGURE ---- \n\n"
+
+	cp libamf/README README.amf
 
 # BUILD
 
-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 $@
+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
 
 # CLEAN
 
 clean:
 	dh_testdir
 	dh_testroot
-
-	-rm -rf *-stamp tmp-* debian/tmp-*
+	rm -f build-stamp 
 
 ifeq (Makefile,$(wildcard Makefile))
-	-$(MAKE) -C tmp-gnash maintainer-clean
-	-$(MAKE) -C tmp-gnash distclean
+	-$(MAKE) maintainer-clean
+	-$(MAKE) distclean
 endif
 
 ifneq ($(wildcard ${AUTO_JUNK}),)
@@ -134,33 +125,45 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
-	-rm -rf debian/tmp-*
 	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 -C tmp-gnash DESTDIR=$(CURDIR)/debian/tmp-gnash
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	@printf "\n -------------------------------------------- End of INSTALL ---- \n\n"
 
 	#cd debian/h2m; $(MAKE)
 
-#	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/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/
 
 # CREATE PACKAGES
-
-binary: binary-indep binary-arch
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -173,7 +176,7 @@
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installexamples
-	dh_install --sourcedir=$(CURDIR)/debian
+	dh_install --sourcedir=$(CURDIR)/debian/tmp
 #	dh_installmenu
 #	dh_installmime
 	dh_installman
@@ -182,8 +185,7 @@
 	dh_compress
 	dh_fixperms
 	#dh_makeshlibs -V 'libgnash0 (=$${binary:Version})'
-	dh_makeshlibs -plibgnash0 -V 'libgnash0 (=$(MAIN_VERSION))'
-#	dh_makeshlibs -plibklash0 -V 'libklash0 (=$(MAIN_VERSION))'
+	dh_makeshlibs -V 'libgnash0 (=$(MAIN_VERSION))'
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -191,18 +193,17 @@
 	dh_builddeb
 
 VERSION_DATE = $(shell /bin/date --utc +%0Y%0m%0d.%0k%0M)
-VERSION_ID = 0.8.0+cvs$(VERSION_DATE)
-
+VERSION_ID = 0.7.2+cvs$(VERSION_DATE)
 get-orig-source:
 	echo Downloading gnash $(VERSION_ID) from CVS...
 	#test -e gnashd && exit
 	export CVS_RSH="ssh"; cvs -z3 -d:pserver:anonymous at cvs.sv.gnu.org:/sources/gnash co gnash
-	#export CVS_RSH="ssh"; export CVSROOT=":pserver:anonymous at cvs.sv.gnu.org:/sources/gnash" ; cvs co -r release-0-8-0 gnash
 	#cd gnash; rm -rf `find . -name CVS`
 	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 CVS."
 
-.PHONY: setup setup-gnash config config-gnash build-gnash
+
+binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install get-orig-source

More information about the pkg-flash-devel mailing list