r392 - in /packages/flasm/trunk/debian: README.source changelog control patches/01-config-file.patch patches/fix-FTBFS-with-new-bison.patch rules source/ source/format

Tue Jul 27 18:03:18 UTC 2010

Author: pabs
Date: Tue Jul 27 18:03:16 2010
New Revision: 392

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=392
Log:
Switch to dpkg-source 3.0 (quilt)

Added:
    packages/flasm/trunk/debian/source/
    packages/flasm/trunk/debian/source/format
Removed:
    packages/flasm/trunk/debian/README.source
Modified:
    packages/flasm/trunk/debian/changelog
    packages/flasm/trunk/debian/control
    packages/flasm/trunk/debian/patches/01-config-file.patch
    packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch
    packages/flasm/trunk/debian/rules

Modified: packages/flasm/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/flasm/trunk/debian/changelog?rev=392&op=diff
==============================================================================

--- packages/flasm/trunk/debian/changelog (original)
+++ packages/flasm/trunk/debian/changelog Tue Jul 27 18:03:16 2010
@@ -1,3 +1,9 @@
+flasm (1.62-5) UNRELEASED; urgency=low
+
+  * Switch to dpkg-source 3.0 (quilt)
+
+ -- Paul Wise <pabs at debian.org>  Tue, 27 Jul 2010 13:43:10 -0400
+
 flasm (1.62-4) unstable; urgency=low
 
   * Add a patch to rework the temporary file handling (Closes: #530383)

Modified: packages/flasm/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/flasm/trunk/debian/control?rev=392&op=diff
==============================================================================
--- packages/flasm/trunk/debian/control (original)
+++ packages/flasm/trunk/debian/control Tue Jul 27 18:03:16 2010
@@ -2,7 +2,7 @@
 Section: utils
 Priority: extra
 Maintainer: Paul Wise <pabs at debian.org>
-Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40), flex, bison, gperf, zlib1g-dev
+Build-Depends: debhelper (>= 5.0.0), flex, bison, gperf, zlib1g-dev
 Standards-Version: 3.8.2
 Homepage: http://flasm.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-flash/packages/flasm/trunk

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=392&op=diff
==============================================================================
--- packages/flasm/trunk/debian/patches/01-config-file.patch (original)
+++ packages/flasm/trunk/debian/patches/01-config-file.patch Tue Jul 27 18:03:16 2010
@@ -1,11 +1,9 @@
-flasm 01-config-file.patch
-Paul Wise <pabs at debian.org>
-Patch flasm to search for /etc/flasm.ini
-Forwarded to http://sf.net/support/tracker.php?aid=1952071
-Index: flasm.c
-===================================================================
---- a/flasm.c.orig	2007-07-08 12:39:23.000000000 +1000
-+++ b/flasm.c	2007-07-08 12:39:24.000000000 +1000
+Author: Paul Wise <pabs at debian.org>
+Description: flasm to search for /etc/flasm.ini
+Forwarded: http://sf.net/support/tracker.php?aid=1952071
+Last-Update: 2007-07-08
+--- a/flasm.c
++++ b/flasm.c
 @@ -1481,7 +1481,11 @@
  
  		strcpy(inipathptr + 1, "flasm.ini");

Modified: packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch?rev=392&op=diff
==============================================================================
--- packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch (original)
+++ packages/flasm/trunk/debian/patches/fix-FTBFS-with-new-bison.patch Tue Jul 27 18:03:16 2010
@@ -1,9 +1,7 @@
-flasm fix-FTBFS-with-new-bison.patch
-Patch assembler.y so that it builds with bison 2.4.1
-Patch forwarded to http://sf.net/support/tracker.php?aid=2615264
-Patch from Gentoo and Fedora:
-http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-misc/flasm/files/flasm-1.6.2-bison-2.patch?rev=HEAD
-http://cvs.fedoraproject.org/viewvc/rpms/flasm/devel/flasm-1.62-midrule.patch?revision=HEAD
+Description: Patch assembler.y so that it builds with bison 2.4.1
+Forwarded: http://sf.net/support/tracker.php?aid=2615264
+Origin: vendor, http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-misc/flasm/files/flasm-1.6.2-bison-2.patch?rev=HEAD
+Origin: vendor, http://cvs.fedoraproject.org/viewvc/rpms/flasm/devel/flasm-1.62-midrule.patch?revision=HEAD
 --- a/assembler.y
 +++ b/assembler.y
 @@ -605,24 +605,24 @@ finally_opt

Modified: packages/flasm/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/flasm/trunk/debian/rules?rev=392&op=diff
==============================================================================
--- packages/flasm/trunk/debian/rules (original)
+++ packages/flasm/trunk/debian/rules Tue Jul 27 18:03:16 2010
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-
-include /usr/share/quilt/quilt.make
 
 CFLAGS = -Wall -g -DCONFIG_PATH=\\\"/etc/flasm.ini\\\"
 
@@ -18,13 +16,13 @@
 endif
 
 build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
+build-stamp:
 	dh_testdir
 	$(MAKE) CFLAGS="$(CFLAGS)"
 	cp CHANGES.TXT NEWS
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) clean

Added: packages/flasm/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-flash/packages/flasm/trunk/debian/source/format?rev=392&op=file
==============================================================================
--- packages/flasm/trunk/debian/source/format (added)
+++ packages/flasm/trunk/debian/source/format Tue Jul 27 18:03:16 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)


