Bug#642709: ctsim: diff for NMU version 5.2.0-1.1

2011-12-16 Thread gregor herrmann 
On Thu, 15 Dec 2011 22:02:16 -0700, Kevin Rosenberg wrote:

  I've prepared an NMU for ctsim (versioned as 5.2.0-1.1) and
  uploaded it to DELAYED/2. Please feel free to tell me if I
  should delay it longer.
 I suspect I'll rework the patch a bit. 

Do you want me to cancel the NMU?

 Upstream needs to distribute
 config.guess and such. So, I think a more robust patch would be
 for the debian/rules to delete the upstream file and then copy
 the files from the autotools-dev build-time package to replace
 upstreams.

Hm, that's what's happening, more or less:
- dh_autotools-dev_updateconfig in the configure target backups the
  shipped config.* files and copies the one from autotools-dev before
  calling configure
- dh_autotools-dev_restoreconfig in the clean target moves the
  backupped versions back if they exist.  
 

Cheers,
gregor

-- 
 .''`.   Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06
 : :' :  Debian GNU/Linux user, admin,  developer - http://www.debian.org/
 `. `'   Member of VIBE!AT  SPI, fellow of Free Software Foundation Europe
   `-NP: Tanita Tikaram: World Outside Your Window


signature.asc
Description: Digital signature

Bug#642709: ctsim: diff for NMU version 5.2.0-1.1

2011-12-15 Thread gregor herrmann 
tags 642709 + patch
tags 642709 + pending
thanks

Dear maintainer,

I've prepared an NMU for ctsim (versioned as 5.2.0-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.   Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06
 : :' :  Debian GNU/Linux user, admin,  developer - http://www.debian.org/
 `. `'   Member of VIBE!AT  SPI, fellow of Free Software Foundation Europe
   `-NP: Donovan: Lalena
diff -Nru ctsim-5.2.0/debian/changelog ctsim-5.2.0/debian/changelog
--- ctsim-5.2.0/debian/changelog	2010-11-08 02:31:45.0 +0100
+++ ctsim-5.2.0/debian/changelog	2011-12-15 19:50:12.0 +0100
@@ -1,3 +1,15 @@
+ctsim (5.2.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS: /bin/sh: 0: Can't open ./config.status
+- as a pre-requisite, use autotools-dev to handle config.{sub,guess}
+  (newer dpkg-source bails out due the changed files); also remove
+  auto-generated patch with changes to these files
+- for the actual fix, remove second call to make clean from debian/rules
+(Closes: #642709)
+
+ -- gregor herrmann gre...@debian.org  Thu, 15 Dec 2011 19:48:51 +0100
+
 ctsim (5.2.0-1) unstable; urgency=low
 
   * New upstream
diff -Nru ctsim-5.2.0/debian/control ctsim-5.2.0/debian/control
--- ctsim-5.2.0/debian/control	2010-11-08 02:34:33.0 +0100
+++ ctsim-5.2.0/debian/control	2011-12-15 19:42:24.0 +0100
@@ -2,7 +2,7 @@
 Section: science
 Priority: extra
 Maintainer: Kevin M. Rosenberg k...@debian.org
-Build-Depends: debhelper (= 7.0.0), wx2.8-headers, libfftw3-dev, libreadline-dev, libgl1-mesa-dev, libglu1-mesa-dev, libwxgtk2.8-dev, ctn-dev, libpng12-dev, libglib2.0-dev, libgtk2.0-dev
+Build-Depends: debhelper (= 7.0.0), wx2.8-headers, libfftw3-dev, libreadline-dev, libgl1-mesa-dev, libglu1-mesa-dev, libwxgtk2.8-dev, ctn-dev, libpng12-dev, libglib2.0-dev, libgtk2.0-dev, autotools-dev
 Standards-Version: 3.9.1.0
 Homepage: http://www.ctsim.org
 Vcs-Git: git://git.b9.com/ctsim.git
diff -Nru ctsim-5.2.0/debian/patches/debian-changes-5.2.0-1 ctsim-5.2.0/debian/patches/debian-changes-5.2.0-1
--- ctsim-5.2.0/debian/patches/debian-changes-5.2.0-1	2010-11-08 02:34:40.0 +0100
+++ ctsim-5.2.0/debian/patches/debian-changes-5.2.0-1	1970-01-01 01:00:00.0 +0100
@@ -1,440 +0,0 @@
-Description: Upstream changes introduced in version 5.2.0-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- ctsim (5.2.0-1) unstable; urgency=low
- .
-   * New upstream
- .
- The person named in the Author field signed this changelog entry.
-Author: Kevin M. Rosenberg k...@debian.org
-

-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: vendor|upstream|other, url of original patch
-Bug: url in upstream bugtracker
-Bug-Debian: http://bugs.debian.org/bugnumber
-Bug-Ubuntu: https://launchpad.net/bugs/bugnumber
-Forwarded: no|not-needed|url proving that it has been forwarded
-Reviewed-By: name and email of someone who approved the patch
-Last-Update: -MM-DD
-
 ctsim-5.2.0.orig/config.guess
-+++ ctsim-5.2.0/config.guess
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
- #   Free Software Foundation, Inc.
- 
--timestamp='2009-06-10'
-+timestamp='2009-12-30'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -27,16 +27,16 @@ timestamp='2009-06-10'
- # the same distribution terms that you use for the rest of that program.
- 
- 
--# Originally written by Per Bothner p...@bothner.com.
--# Please send patches to config-patc...@gnu.org.  Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# Originally written by Per Bothner.  Please send patches (context
-+# diff format) to config-patc...@gnu.org and include a ChangeLog
-+# entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub.  If it succeeds, it prints the system name on stdout, and
- # exits with 0.  Otherwise, it exits with 1.
- #
--# The plan is that this can be called by configure scripts if you
--# don't specify an explicit build system type.
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- 
- me=`echo $0 | sed -e 's,.*/,,'`
- 
-@@ -56,8 +56,9 @@ version=\
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993,

Bug#642709: ctsim: diff for NMU version 5.2.0-1.1

2011-12-15 Thread Kevin Rosenberg 
On Dec 15, 2011, at 12:01 PM, gregor herrmann wrote:

 tags 642709 + patch
 tags 642709 + pending
 thanks
 
 Dear maintainer,
 
 I've prepared an NMU for ctsim (versioned as 5.2.0-1.1) and
 uploaded it to DELAYED/2. Please feel free to tell me if I
 should delay it longer.

I suspect I'll rework the patch a bit. Upstream needs to distribute
config.guess and such. So, I think a more robust patch would be
for the debian/rules to delete the upstream file and then copy
the files from the autotools-dev build-time package to replace
upstreams.

Kevin





-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org