r138 - in /packages/flasm/trunk/debian: README.Debian changelog docs flasm.copyright patches/01-config-file.patch rules

Sun Jul 8 03:33:57 UTC 2007

Author: pabs
Date: Sun Jul  8 03:33:57 2007
New Revision: 138

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=138
Log:
* Distribute upstream CHANGES.TXT as NEWS instead of changelog
* Don't ignore make clean failures (thanks lintian)
* chmod -x before creating the tarball instead of at build time

Modified:
    packages/flasm/trunk/debian/README.Debian
    packages/flasm/trunk/debian/changelog
    packages/flasm/trunk/debian/docs
    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/README.Debian
URL: http://svn.debian.org/wsvn/pkg-flash/packages/flasm/trunk/debian/README.Debian?rev=138&op=diff
==============================================================================

--- packages/flasm/trunk/debian/README.Debian (original)
+++ packages/flasm/trunk/debian/README.Debian Sun Jul  8 03:33:57 2007
@@ -1,8 +1,7 @@
 flasm for Debian
 ----------------
 
-The debian version of flasm uses /etc/flasm.ini and does not search in
-the same directory as itself for the config file.
+The debian version of flasm also uses /etc/flasm.ini
 
  -- Paul Wise <pabs at debian.org>, Mon, 24 Apr 2006 19:00:45 +0800
 

Modified: packages/flasm/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/flasm/trunk/debian/changelog?rev=138&op=diff
==============================================================================
--- packages/flasm/trunk/debian/changelog (original)
+++ packages/flasm/trunk/debian/changelog Sun Jul  8 03:33:57 2007
@@ -6,8 +6,11 @@
   * 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
+  * Distribute upstream CHANGES.TXT as NEWS instead of changelog
+  * Don't ignore make clean failures (thanks lintian)
+  * chmod -x before creating the tarball instead of at build time
 
- -- Paul Wise <pabs at debian.org>  Sun, 08 Jul 2007 12:23:16 +1000
+ -- Paul Wise <pabs at debian.org>  Sun, 08 Jul 2007 13:25:45 +1000
 
 flasm (1.61-1) unstable; urgency=low
 

Modified: packages/flasm/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-flash/packages/flasm/trunk/debian/docs?rev=138&op=diff
==============================================================================
--- packages/flasm/trunk/debian/docs (original)
+++ packages/flasm/trunk/debian/docs Sun Jul  8 03:33:57 2007
@@ -1,3 +1,4 @@
+NEWS
 flasm.html
 classic.css
 logo.gif 

Modified: packages/flasm/trunk/debian/flasm.copyright
URL: http://svn.debian.org/wsvn/pkg-flash/packages/flasm/trunk/debian/flasm.copyright?rev=138&op=diff
==============================================================================
--- packages/flasm/trunk/debian/flasm.copyright (original)
+++ packages/flasm/trunk/debian/flasm.copyright Sun Jul  8 03:33:57 2007
@@ -34,4 +34,4 @@
 Macromedia and Flash are either registered trademarks or trademarks of Adobe Systems
 Incorporated in the United States and/or other countries.
 
-Adobe 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/pkg-flash/packages/flasm/trunk/debian/patches/01-config-file.patch?rev=138&op=diff
==============================================================================
--- packages/flasm/trunk/debian/patches/01-config-file.patch (original)
+++ packages/flasm/trunk/debian/patches/01-config-file.patch Sun Jul  8 03:33:57 2007
@@ -3,16 +3,16 @@
 Patch flasm to search for /etc/flasm.ini
 Index: flasm.c
 ===================================================================
---- flasm.c.orig	2007-07-08 00:36:51.000000000 +1000
-+++ flasm.c	2007-07-08 00:39:36.000000000 +1000
+--- flasm.c.orig	2007-07-08 12:39:23.000000000 +1000
++++ flasm.c	2007-07-08 12:39:24.000000000 +1000
 @@ -1481,7 +1481,11 @@
  
  		strcpy(inipathptr + 1, "flasm.ini");
  		if ((iniFile = fopen(inipath, "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
++			/* flasm.ini not found in current directory, look at config path */
++			if ((iniFile = fopen(CONFIG_PATH, "r")) == NULL)
 +#endif
 +				return -1;
  	}

Modified: packages/flasm/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/flasm/trunk/debian/rules?rev=138&op=diff
==============================================================================
--- packages/flasm/trunk/debian/rules (original)
+++ packages/flasm/trunk/debian/rules Sun Jul  8 03:33:57 2007
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 include /usr/share/quilt/quilt.make
 
-CFLAGS = -Wall -g -DCONFIG_PATH=\"/etc/flasm.ini\"
+CFLAGS = -Wall -g -DCONFIG_PATH=\\\"/etc/flasm.ini\\\"
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -16,13 +15,14 @@
 build-stamp:
 	dh_testdir
 	$(MAKE) CFLAGS="$(CFLAGS)"
+	cp CHANGES.TXT NEWS
 	touch build-stamp
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	-$(MAKE) clean
-	rm -f build-stamp keywords.c flasm
+	[ ! -f Makefile ] || $(MAKE) clean
+	rm -f build-stamp NEWS keywords.c flasm
 	dh_clean 
 
 install: build
@@ -31,13 +31,12 @@
 	dh_clean -k 
 	dh_installdirs
 	dh_install
-	chmod a-x debian/flasm/etc/flasm.ini
 
 binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs CHANGES.TXT
+	dh_installchangelogs
 	dh_installdocs
 	dh_installman
 	dh_link


