r30 - in /packages/gnash/trunk/debian: changelog control patches/amf.patch patches/cmdline.patch patches/getopt.patch patches/series rules

baby-guest at users.alioth.debian.org baby-guest at users.alioth.debian.org
Fri Oct 6 03:49:28 UTC 2006


Author: baby-guest
Date: Fri Oct  6 03:49:27 2006
New Revision: 30

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=30
Log:
Added libboost-dev and libboost-thread-dev to Build-Depends.
Removed patches: amf.patch getopt.patch
Beautify debian/rules so that output can be more easily analyzed.


Removed:
    packages/gnash/trunk/debian/patches/amf.patch
    packages/gnash/trunk/debian/patches/getopt.patch
Modified:
    packages/gnash/trunk/debian/changelog
    packages/gnash/trunk/debian/control
    packages/gnash/trunk/debian/patches/cmdline.patch
    packages/gnash/trunk/debian/patches/series
    packages/gnash/trunk/debian/rules

Modified: packages/gnash/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/changelog?rev=30&op=diff
==============================================================================
--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Fri Oct  6 03:49:27 2006
@@ -1,16 +1,22 @@
-gnash (0.7.1+cvs20060924.1330-2) UNRELEASED; urgency=low
+gnash (0.7.1+cvs20061006.0229-1) UNRELEASED; urgency=low
 
-  * Added cmdline.patch to solve problem of cmdline parser failure
-    with "a=b.swf". Thanks to Robert Millan <rmh at aybabtu.com>.
-    Closes: #383770
+  * New Upstream Release. Downloaded from CVS.
   * Added --without-gcc-arch to ./configure in debian/rules so that the
     build script don't pass options like "-march=prescot" to gcc even if
     the CPU of the build system supports those. Thanks to Timo Juhani
     Lindfors <timo.lindfors at iki.fi>. Closes: #390919
+  * Added libboost-dev and libboost-thread-dev to Build-Depends.
+  * Added cmdline.patch to solve problem of cmdline parser failure
+    with "a=b.swf". Thanks to Robert Millan <rmh at aybabtu.com>.
+    Closes: #383770
+  * Removed patches: amf.patch getopt.patch
   * Leaving the CVS dirs in package. They might be useful for updating the
     source tree for testing stuff. Closes: #390283
+  * Added make check to debian/rules, even though the build won't stop if
+    failures are found.
+  * Beautify debian/rules so that output can be more easily analyzed.
 
- -- Miriam Ruiz <little_miry at yahoo.es>  Mon, 25 Sep 2006 18:51:20 +0200
+ -- Miriam Ruiz <little_miry at yahoo.es>  Fri,  6 Oct 2006 04:31:17 +0200
 
 gnash (0.7.1+cvs20060924.1330-1) unstable; urgency=low
 

Modified: packages/gnash/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/control?rev=30&op=diff
==============================================================================
--- packages/gnash/trunk/debian/control (original)
+++ packages/gnash/trunk/debian/control Fri Oct  6 03:49:27 2006
@@ -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, help2man, libxmu-dev, dejagnu, autotools-dev, libxml2-dev, libjpeg-dev, libpng12-dev | libpng-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libgstreamer0.10-dev | libgstreamer0.8-dev, libpango1.0-dev | pango-devel, libgtkglext1-dev, libmad0-dev, libxul-dev | mozilla-dev, libdirectfb-dev, libkonq4-dev, libgstreamer0.10-dev, libcurl3-gnutls-dev | libcurl3-openssl-dev, libfltk1.1-dev
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), quilt, autoconf, automake1.9, 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, libgstreamer0.10-dev | libgstreamer0.8-dev, libpango1.0-dev | pango-devel, libgtkglext1-dev, libmad0-dev, libxul-dev | mozilla-dev, libdirectfb-dev, libkonq4-dev, libgstreamer0.10-dev, libcurl3-gnutls-dev | libcurl3-openssl-dev, libfltk1.1-dev
 Standards-Version: 3.7.2
 Section: utils
 

Modified: packages/gnash/trunk/debian/patches/cmdline.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/patches/cmdline.patch?rev=30&op=diff
==============================================================================
--- packages/gnash/trunk/debian/patches/cmdline.patch (original)
+++ packages/gnash/trunk/debian/patches/cmdline.patch Fri Oct  6 03:49:27 2006
@@ -1,20 +1,3 @@
-diff -ur gnash-0.7.1.old/backend/gnash.cpp gnash-0.7.1/backend/gnash.cpp
---- gnash-0.7.1.old/backend/gnash.cpp	2006-08-18 22:21:21.000000000 +0200
-+++ gnash-0.7.1/backend/gnash.cpp	2006-08-19 13:48:14.000000000 +0200
-@@ -350,12 +350,7 @@
-     
-     // get the file name from the command line
-     while (optind < argc) {
--        // Some options set variables, like ip=127.0.0.1
--        if (strchr(argv[optind], '=')) {
--            dbglogfile << "Got variable option on command line!" << endl;
--        } else {
--            infiles.push_back(argv[optind]);
--        }
-+        infiles.push_back(argv[optind]);
- 	optind++;
-     }
- 
 diff -ur gnash-0.7.1.old/plugin/klash/klash.cpp gnash-0.7.1/plugin/klash/klash.cpp
 --- gnash-0.7.1.old/plugin/klash/klash.cpp	2006-04-25 19:14:23.000000000 +0200
 +++ gnash-0.7.1/plugin/klash/klash.cpp	2006-08-19 13:49:33.000000000 +0200

Modified: packages/gnash/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/patches/series?rev=30&op=diff
==============================================================================
--- packages/gnash/trunk/debian/patches/series (original)
+++ packages/gnash/trunk/debian/patches/series Fri Oct  6 03:49:27 2006
@@ -1,3 +1,1 @@
-amf.patch -p1
-getopt.patch -p1
 cmdline.patch -p1

Modified: packages/gnash/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/rules?rev=30&op=diff
==============================================================================
--- packages/gnash/trunk/debian/rules (original)
+++ packages/gnash/trunk/debian/rules Fri Oct  6 03:49:27 2006
@@ -32,7 +32,13 @@
 config.status: configure.ac
 	dh_testdir
 
+	#
+	# == APPLYING PATCHES ============================================
+	#
 	$(MAKE) -f /usr/share/quilt/quilt.make patch
+	#
+	# ----------------------------------- End of APPLYING PATCHES ----
+	#
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -41,9 +47,15 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
+	#
+	# == AUTOGEN =====================================================
+	#
 	./autogen.sh
-
-	# Add here commands to configure the package.
+	#
+	# -------------------------------------------- End of AUTOGEN ----
+	#
+	# == CONFIGURE ===================================================
+	#
 	# In the future, I want to add LDFLAGS="-Wl,-z,defs"
 	./configure CFLAGS="$(CFLAGS)" \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -52,6 +64,9 @@
 		--with-plugindir=\$${prefix}/lib/gnash \
 		--enable-shared=yes --enable-static=yes --enable-sdk-install \
 		--disable-rpath --enable-lotsa-warnings --without-gcc-arch
+	#
+	# ------------------------------------------- End of CONFIGURE ----
+	#
 
 	cp libamf/README README.amf
 
@@ -61,8 +76,19 @@
 build-stamp:  config.status
 	dh_testdir
 
-	# Add here commands to compile the package.
+	#
+	# == MAKE ========================================================
+	#
 	$(MAKE)
+	#
+	# ----------------------------------------------- End of MAKE ----
+	#
+	# == CHECK =======================================================
+	#
+	-$(MAKE) check
+	#
+	# ---------------------------------------------- End of CHECK ----
+	#
 
 	touch build-stamp
 
@@ -98,7 +124,13 @@
 
 	-rm -f README.amf
 
+	#
+	# == CLEANING PATCHES ============================================
+	#
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
+	#
+	# ----------------------------------- End of CLEANING PATCHES ----
+	#
 
 	dh_clean 
 




More information about the pkg-flash-devel mailing list