r12 - in /packages/flasm/trunk: debian/changelog debian/control debian/patches/ debian/patches/01-config-file.patch debian/patches/series debian/rules flasm.c

[pabs-guest at users.alioth.debian.org]

Author: pabs-guest
Date: Sun Jun 11 14:21:59 2006
New Revision: 12

URL: http://svn.debian.org/wsvn/?sc=1&rev=12
Log:
Move patch from diff.gz to quilt

Added:
    packages/flasm/trunk/debian/patches/
    packages/flasm/trunk/debian/patches/01-config-file.patch
    packages/flasm/trunk/debian/patches/series
Removed:
    packages/flasm/trunk/flasm.c
Modified:
    packages/flasm/trunk/debian/changelog
    packages/flasm/trunk/debian/control
    packages/flasm/trunk/debian/rules

Modified: packages/flasm/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/changelog?rev=12&op=diff
==============================================================================
--- packages/flasm/trunk/debian/changelog (original)
+++ packages/flasm/trunk/debian/changelog Sun Jun 11 14:21:59 2006
@@ -1,3 +1,9 @@
+flasm (1.6-2) UNRELEASED; urgency=low
+
+  * Move patch from diff.gz to quilt
+
+ -- Paul Wise <pabs3 at bonedaddy.net>  Sun, 11 Jun 2006 22:00:38 +0800
+
 flasm (1.6-1) unstable; urgency=low
 
   * Initial release Closes: #351429

Modified: packages/flasm/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/control?rev=12&op=diff
==============================================================================
--- packages/flasm/trunk/debian/control (original)
+++ packages/flasm/trunk/debian/control Sun Jun 11 14:21:59 2006
@@ -2,7 +2,7 @@
 Section: utils
 Priority: extra
 Maintainer: Paul Wise <pabs3 at bonedaddy.net>
-Build-Depends: debhelper (>= 4.0.0), flex, bison, gperf, zlib1g-dev
+Build-Depends: debhelper (>= 4.0.0), quilt (>= 0.40), flex, bison, gperf, zlib1g-dev
 Standards-Version: 3.6.2
 
 Package: flasm

Added: 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=12&op=file
==============================================================================
--- packages/flasm/trunk/debian/patches/01-config-file.patch (added)
+++ packages/flasm/trunk/debian/patches/01-config-file.patch Sun Jun 11 14:21:59 2006
@@ -1,0 +1,28 @@
+flasm 01-config-file.patch
+Paul Wise <pabs3 at bonedaddy.net>
+Patch flasm to search for /etc/flasm.ini
+Index: flasm.c
+===================================================================
+--- flasm.c.orig	2006-06-11 22:15:41.000000000 +0800
++++ flasm.c	2006-06-11 22:16:10.000000000 +0800
+@@ -1468,18 +1468,8 @@
+ 	int k;
+ 
+ 	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')
+-			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;
+ 	}
+ 

Added: packages/flasm/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/patches/series?rev=12&op=file
==============================================================================
--- packages/flasm/trunk/debian/patches/series (added)
+++ packages/flasm/trunk/debian/patches/series Sun Jun 11 14:21:59 2006
@@ -1,0 +1,1 @@
+01-config-file.patch -p0

Modified: packages/flasm/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/flasm/trunk/debian/rules?rev=12&op=diff
==============================================================================
--- packages/flasm/trunk/debian/rules (original)
+++ packages/flasm/trunk/debian/rules Sun Jun 11 14:21:59 2006
@@ -2,6 +2,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
 
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -10,13 +12,13 @@
 	CFLAGS += -O2
 endif
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
 	dh_testdir
 	$(MAKE) CFLAGS="$(CFLAGS)"
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	-$(MAKE) clean