[fityk] 18/45: Imported Debian patch 0.8.2-2

[Stuart Prescott]

This is an automated email from the git hooks/post-receive script.

stuart pushed a commit to branch master
in repository fityk.

commit 478f8f31f777b8ae62e259c27ef43b83fb15b455
Author: Carlo Segre <segre at debian.org>
Date:   Sat Mar 22 11:29:16 2008 -0500

    Imported Debian patch 0.8.2-2
---
 debian/changelog |  8 ++++++++
 debian/control   |  5 ++---
 debian/copyright |  2 +-
 python/Makefile  | 22 +++++++++++-----------
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f6ae72..9c24d21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fityk (0.8.2-2) unstable; urgency=low
+
+  * Accepted patches from NMU (Closes: #455180)
+  * Upgrade to Standards-Version 3.7.3 (no changes)
+  * Move Homepage from description to debian/control header
+
+ -- Carlo Segre <segre at debian.org>  Sat, 22 Mar 2008 11:29:16 -0500
+
 fityk (0.8.2-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 636649c..e36b96c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: science
 Priority: optional
 Maintainer: Carlo Segre <segre at debian.org>
 Build-Depends: debhelper (>> 5.0.0), libwxgtk2.6-dev (>> 2.6.0), libboost-dev, libreadline5-dev
-Standards-Version: 3.7.2
+Homepage: http://www.unipress.waw.pl/fityk/
+Standards-Version: 3.7.3
 
 Package: fityk
 Architecture: any
@@ -27,5 +28,3 @@ Description: general-purpose nonlinear curve fitting and data analysis
  bound to each other, eg. the width of a peak can be an independent 
  variable, can be the same as the width of another peak or can be given 
  by a complicated - common to all peaks - formula.
- .
- Homepage: http://www.unipress.waw.pl/fityk/
diff --git a/debian/copyright b/debian/copyright
index 9719422..84356a9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ http://sourceforge.net/projects/fityk/
 
 Upstream Author: Marcin Wojdyr <wojdyr at if.pw.edu.pl>
 
-Copyright: Marcin Wojdyr
+Copyright 2003-2007 Marcin Wojdyr
 
 This is free software; you can redistribute it and/or modify it under the
 terms of version 2 of the GNU General Public License as published by the
diff --git a/python/Makefile b/python/Makefile
index ce09930..f5dc8c7 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -80,14 +80,14 @@ py_compile = $(top_srcdir)/config/py-compile
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/debian/fityk/fityk-0.8.2/config/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/debian/fityk/nmu/fityk-0.8.2/config/missing --run aclocal-1.9
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/debian/fityk/fityk-0.8.2/config/missing --run tar
+AMTAR = ${SHELL} /home/debian/fityk/nmu/fityk-0.8.2/config/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /home/debian/fityk/fityk-0.8.2/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/debian/fityk/fityk-0.8.2/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/debian/fityk/fityk-0.8.2/config/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/debian/fityk/nmu/fityk-0.8.2/config/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/debian/fityk/nmu/fityk-0.8.2/config/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/debian/fityk/nmu/fityk-0.8.2/config/missing --run automake-1.9
 AWK = gawk
 CC = i486-linux-gnu-gcc
 CCDEPMODE = depmode=gcc3
@@ -126,7 +126,7 @@ LTLIBOBJS =
 MAINT = #
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
-MAKEINFO = ${SHELL} /home/debian/fityk/fityk-0.8.2/config/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/debian/fityk/nmu/fityk-0.8.2/config/missing --run makeinfo
 NO_READLINE = 
 OBJEXT = o
 OS_WIN32_FALSE = 
@@ -161,12 +161,12 @@ SWIG_LIB =
 SWIG_PYTHON_CPPFLAGS = 
 SWIG_PYTHON_OPT = 
 VERSION = 0.8.2
-WX_CFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA 
+WX_CFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA 
 WX_CFLAGS_ONLY = 
 WX_CONFIG_PATH = /usr/bin/wx-config
-WX_CPPFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
-WX_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA  
-WX_CXXFLAGS_ONLY = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
+WX_CPPFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
+WX_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA  
+WX_CXXFLAGS_ONLY = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
 WX_LIBS = -pthread   -lwx_gtk2u_xrc-2.6 -lwx_gtk2u_qa-2.6 -lwx_gtk2u_html-2.6 -lwx_gtk2u_adv-2.6 -lwx_gtk2u_core-2.6 -lwx_baseu_xml-2.6 -lwx_baseu_net-2.6 -lwx_baseu-2.6 
 WX_LIBS_STATIC = 
 WX_VERSION = 2.6.3
@@ -202,7 +202,7 @@ host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${prefix}/share/info
-install_sh = /home/debian/fityk/fityk-0.8.2/config/install-sh
+install_sh = /home/debian/fityk/nmu/fityk-0.8.2/config/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fityk.git