[Pkg-exppsy-maintainers] Bug#848933: psignifit: diff for NMU version 2.5.6-3.1

[Joao Eriberto Mota Filho]

Package: psignifit
Version: 2.5.6-3
Severity: normal
Tags: patch pending

Dear maintainer,

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

Regards,

Eriberto

diff -u psignifit-2.5.6/psig-src/Makefile psignifit-2.5.6/psig-src/Makefile
--- psignifit-2.5.6/psig-src/Makefile
+++ psignifit-2.5.6/psig-src/Makefile
@@ -18,7 +18,7 @@
 CXXFLAGS = $(CYGFLAG) $(DBFLAG)
 LD = gcc $(CYGFLAG) $(DBFLAG)
 # add '-lm' flag for Debian GNU/Linux
-LDFLAGS = -lm
+LIBS = -lm
 DEPEND_FLAG = -MM  # GNU compilers support -MM, others may only support -M
 
 csource = $(wildcard *.c)
@@ -46,7 +46,7 @@
 
 
 psignifit : $(objects)
-	$(LD) $(LDFLAGS) -o $@ $(objects)
+	$(LD) $(LDFLAGS) -o $@ $(objects) $(LIBS)
 
 %.d : %.c
 	@ set -e; $(CC) $(DEPEND_FLAG) $(CFLAGS) $< \
diff -u psignifit-2.5.6/debian/rules psignifit-2.5.6/debian/rules
--- psignifit-2.5.6/debian/rules
+++ psignifit-2.5.6/debian/rules
@@ -2,66 +2,4 @@
-
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
-	dh_testdir
-
-	cd psig-src && $(MAKE)
-	cd ..
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	-cd psig-src && $(MAKE) clean
-	cd ..
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	cd psig-src && $(MAKE) install DESTDIR=$(CURDIR)/debian/psignifit
-	cd ..
-
-
-binary-indep: build install
-# We have nothing to do by default.
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_install runexampledata usr/share/doc/psignifit/tests
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+	dh $@ --sourcedirectory=psig-src
diff -u psignifit-2.5.6/debian/compat psignifit-2.5.6/debian/compat
--- psignifit-2.5.6/debian/compat
+++ psignifit-2.5.6/debian/compat
@@ -1 +1 @@
-4
+10
diff -u psignifit-2.5.6/debian/control psignifit-2.5.6/debian/control
--- psignifit-2.5.6/debian/control
+++ psignifit-2.5.6/debian/control
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Experimental Psychology Maintainers <pkg-exppsy-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Hanke <michael.hanke at gmail.com>
-Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.7.2
-Homepage: http://www.bootstrap-software.org
+Build-Depends: debhelper (>= 10)
+Standards-Version: 3.9.8
+Homepage: http://bootstrap-software.com/psignifit/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-exppsy/psignifit/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/pkg-exppsy/psignifit
 
 Package: psignifit
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Fitting and testing hypotheses about psychometric functions
  Psignifit allows fitting of psychometric functions to datasets while
  maintaining full control over a large number of parameters. Data
diff -u psignifit-2.5.6/debian/changelog psignifit-2.5.6/debian/changelog
--- psignifit-2.5.6/debian/changelog
+++ psignifit-2.5.6/debian/changelog
@@ -1,3 +1,26 @@
+psignifit (2.5.6-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+    [ Joao Eriberto Mota Filho ]
+
+  * Bumped DH level to 10. (Closes: #817631)
+  * debian/control:
+      - Bumped Standards-Version to 3.9.8.
+      - Updated the Homepage field.
+
+    [ Logan Rosen ]
+
+  * debian/control: depend on ${misc:Depends}.
+  * debian/install: install runexampledata.
+  * debian/rules: Switch to dh sequencer.
+
+    [ Matthias Klose ]
+
+  * Fix FTBFS with ld --as-needed. (Closes: #641554, LP: #771008)
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Tue, 20 Dec 2016 20:29:49 -0200
+
 psignifit (2.5.6-3) unstable; urgency=low
 
   * Use new-style homepage field in debian/control (Closes: #438805).
only in patch2:
unchanged:
--- psignifit-2.5.6.orig/debian/install
+++ psignifit-2.5.6/debian/install
@@ -0,0 +1 @@
+runexampledata usr/share/doc/psignifit/tests