r137 - in /packages/flasm/trunk/debian: changelog compat control copyright flasm.copyright patches/01-config-file.patch rules

pabs at users.alioth.debian.org pabs at users.alioth.debian.org
Sun Jul 8 02:25:39 UTC 2007 

Author: pabs
Date: Sun Jul  8 02:25:38 2007
New Revision: 137

URL: http://svn.debian.org/wsvn/?sc=1&rev=137
Log:
  - Mention lack of Flash 9 support in the description
  - Update copyright information (years & trademarks)
* Switch to debhelper compatibility level 5
* Convert 01-config-file.patch to something useful to upstream

Modified:
    packages/flasm/trunk/debian/changelog
    packages/flasm/trunk/debian/compat
    packages/flasm/trunk/debian/control
    packages/flasm/trunk/debian/copyright
    packages/flasm/trunk/debian/flasm.copyright
    packages/flasm/trunk/debian/patches/01-config-file.patch
    packages/flasm/trunk/debian/rules

Modified: packages/flasm/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/changelog?rev=137&op=diff
==============================================================================
--- packages/flasm/trunk/debian/changelog (original)
+++ packages/flasm/trunk/debian/changelog Sun Jul  8 02:25:38 2007
@@ -1,9 +1,13 @@
 flasm (1.62-1) UNRELEASED; urgency=low
 
   * New upstream release
+    - Mention lack of Flash 9 support in the description
+    - Update copyright information (years & trademarks)
   * Change my email address now that I'm a Debian Developer
+  * Switch to debhelper compatibility level 5
+  * Convert 01-config-file.patch to something useful to upstream
 
- -- Paul Wise <pabs at debian.org>  Sat, 07 Jul 2007 23:58:57 +1000
+ -- Paul Wise <pabs at debian.org>  Sun, 08 Jul 2007 12:23:16 +1000
 
 flasm (1.61-1) unstable; urgency=low
 

Modified: packages/flasm/trunk/debian/compat
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/compat?rev=137&op=diff
==============================================================================
--- packages/flasm/trunk/debian/compat (original)
+++ packages/flasm/trunk/debian/compat Sun Jul  8 02:25:38 2007
@@ -1,1 +1,1 @@
-4
+5

Modified: packages/flasm/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/control?rev=137&op=diff
==============================================================================
--- packages/flasm/trunk/debian/control (original)
+++ packages/flasm/trunk/debian/control Sun Jul  8 02:25:38 2007
@@ -2,7 +2,7 @@
 Section: utils
 Priority: extra
 Maintainer: Paul Wise <pabs at debian.org>
-Build-Depends: debhelper (>= 4.0.0), quilt (>= 0.40), flex, bison, gperf, zlib1g-dev
+Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40), flex, bison, gperf, zlib1g-dev
 Standards-Version: 3.7.2
 
 Package: flasm
@@ -23,4 +23,7 @@
  .
  Flasm can also compress and decompress SWF files. 
  .
+ Flasm does not and may never work with Flash 9 files since Flash 9 is
+ a new virtual machine and support for it would mean a full rewrite.
+ .
   Homepage: http://flasm.sourceforge.net/

Modified: packages/flasm/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/copyright?rev=137&op=diff
==============================================================================
--- packages/flasm/trunk/debian/copyright (original)
+++ packages/flasm/trunk/debian/copyright Sun Jul  8 02:25:38 2007
@@ -5,7 +5,7 @@
 
 Copyright:
 
-    Copyright (c) 2001 Opaque Industries, (c) 2002-2005 Igor Kogan, (c) 2005 Wang Zhen
+    Copyright (c) 2001 Opaque Industries, (c) 2002-2007 Igor Kogan, (c) 2005 Wang Zhen
 
   memwatch:
 
@@ -35,10 +35,10 @@
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
 WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Macromedia(r) and Flash(tm) are trademarks or registered trademarks of Macromedia, Inc.
-in the United States and/or other countries.
+Macromedia and Flash are either registered trademarks or trademarks of Adobe Systems
+Incorporated in the United States and/or other countries.
 
-Macromedia(r) does not sponsor, affiliate, or endorse this product and/or services.
+Adobe does not sponsor, affiliate, or endorse this product and/or services.
 
   memwatch:
 

Modified: packages/flasm/trunk/debian/flasm.copyright
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/flasm.copyright?rev=137&op=diff
==============================================================================
--- packages/flasm/trunk/debian/flasm.copyright (original)
+++ packages/flasm/trunk/debian/flasm.copyright Sun Jul  8 02:25:38 2007
@@ -5,7 +5,7 @@
 
 Copyright:
 
-    Copyright (c) 2001 Opaque Industries, (c) 2002-2005 Igor Kogan, (c) 2005 Wang Zhen
+    Copyright (c) 2001 Opaque Industries, (c) 2002-2007 Igor Kogan, (c) 2005 Wang Zhen
 
 License:
 
@@ -31,7 +31,7 @@
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
 WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Macromedia(r) and Flash(tm) are trademarks or registered trademarks of Macromedia, Inc.
-in the United States and/or other countries.
+Macromedia and Flash are either registered trademarks or trademarks of Adobe Systems
+Incorporated in the United States and/or other countries.
 
-Macromedia(r) does not sponsor, affiliate, or endorse this product and/or services.
+Adobe does not sponsor, affiliate, or endorse this product and/or services.

Modified: packages/flasm/trunk/debian/patches/01-config-file.patch
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/patches/01-config-file.patch?rev=137&op=diff
==============================================================================
--- packages/flasm/trunk/debian/patches/01-config-file.patch (original)
+++ packages/flasm/trunk/debian/patches/01-config-file.patch Sun Jul  8 02:25:38 2007
@@ -3,26 +3,18 @@
 Patch flasm to search for /etc/flasm.ini
 Index: flasm.c
 ===================================================================
---- flasm.c.orig	2006-05-31 10:18:41.000000000 +0800
-+++ flasm.c	2006-06-11 22:47:05.000000000 +0800
-@@ -1464,18 +1464,8 @@
- 	int k;
+--- flasm.c.orig	2007-07-08 00:36:51.000000000 +1000
++++ flasm.c	2007-07-08 00:39:36.000000000 +1000
+@@ -1481,7 +1481,11 @@
  
- 	if ((iniFile = fopen("flasm.ini", "r")) == NULL) {
--		/* flasm.ini not found in current directory, look at executable's path */
--		int pathlen = strlen(exepath);
--		char inipath[pathlen + 10], *inipathptr;
--		if (exepath == NULL || *exepath == '\0')
+ 		strcpy(inipathptr + 1, "flasm.ini");
+ 		if ((iniFile = fopen(inipath, "r")) == NULL)
 -			return -1;
--		strcpy(inipath, exepath);
--		inipathptr = inipath + pathlen;
--		while (*inipathptr != '\\' && *inipathptr != '/' && *inipathptr != ':' && inipathptr>=inipath)
--			inipathptr--;
--
--		strcpy(inipathptr + 1, "flasm.ini");
--		if ((iniFile = fopen(inipath, "r")) == NULL)
-+		/* flasm.ini not found in current directory, look at config path */
-+		if ((iniFile = fopen("/etc/flasm.ini", "r")) == NULL)
- 			return -1;
++#ifdef CONFIG_PATH
++			/* flasm.ini not found in current directory, look at config path */^M
++			if ((iniFile = fopen(CONFIG_PATH, "r")) == NULL)^M
++#endif
++				return -1;
  	}
  
+ 	while (fgets(ln, 256, iniFile)) {													 /* read ini file */

Modified: packages/flasm/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/rules?rev=137&op=diff
==============================================================================
--- packages/flasm/trunk/debian/rules (original)
+++ packages/flasm/trunk/debian/rules Sun Jul  8 02:25:38 2007
@@ -5,7 +5,7 @@
 
 include /usr/share/quilt/quilt.make
 
-CFLAGS = -Wall -g
+CFLAGS = -Wall -g -DCONFIG_PATH=\"/etc/flasm.ini\"
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else

More information about the pkg-flash-devel mailing list