diff -Nru simulpic-2005-1-28/debian/changelog simulpic-2005-1-28/debian/changelog --- simulpic-2005-1-28/debian/changelog 2014-05-29 23:58:40.000000000 +0000 +++ simulpic-2005-1-28/debian/changelog 2014-05-29 16:57:00.000000000 +0000 @@ -1,3 +1,11 @@ +simulpic (1:2005-1-28-9) unstable; urgency=medium + + * Switch to dh. + * Switch to dpkg-source 3.0 (quilt) format. + * Bump Standards-Version to 3.9.5. + + -- Aurelien Jarno Thu, 29 May 2014 18:56:59 +0200 + simulpic (1:2005-1-28-8) unstable; urgency=low * Build with -O2. diff -Nru simulpic-2005-1-28/debian/compat simulpic-2005-1-28/debian/compat --- simulpic-2005-1-28/debian/compat 2014-05-29 23:58:40.000000000 +0000 +++ simulpic-2005-1-28/debian/compat 2014-05-29 16:15:37.000000000 +0000 @@ -1 +1 @@ -4 +9 diff -Nru simulpic-2005-1-28/debian/control simulpic-2005-1-28/debian/control --- simulpic-2005-1-28/debian/control 2014-05-29 23:58:40.000000000 +0000 +++ simulpic-2005-1-28/debian/control 2014-05-29 16:35:53.000000000 +0000 @@ -2,12 +2,13 @@ Maintainer: Aurelien Jarno Section: electronics Priority: optional -Standards-Version: 3.7.3 -Build-Depends: debhelper (>> 4.0.0) +Standards-Version: 3.9.5 +Build-Depends: debhelper (>= 9) Package: simulpic Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: simulator for Microchip PIC16F84 microcontroller - This software allows to simulate the execution of any program on a Microchip - PIC16F84 microcontroller. + This software allows one to simulate the execution of any program on a + Microchip PIC16F84 microcontrollerk, and to display register and memory + information. diff -Nru simulpic-2005-1-28/debian/copyright simulpic-2005-1-28/debian/copyright --- simulpic-2005-1-28/debian/copyright 2014-05-29 23:58:40.000000000 +0000 +++ simulpic-2005-1-28/debian/copyright 2014-05-29 16:02:21.000000000 +0000 @@ -1,6 +1,6 @@ This is the Debian prepackaged version of Microchip PIC device simulator. It was Debianised by Samuel Tardieu , using files obtained -from http://www.dseetharam.org/software/ +from http://alumni.media.mit.edu/~deva/software.shtml Copyright and licence notice: diff -Nru simulpic-2005-1-28/debian/install simulpic-2005-1-28/debian/install --- simulpic-2005-1-28/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ simulpic-2005-1-28/debian/install 2014-05-29 16:21:18.000000000 +0000 @@ -0,0 +1 @@ +simulpic usr/bin diff -Nru simulpic-2005-1-28/debian/manpages simulpic-2005-1-28/debian/manpages --- simulpic-2005-1-28/debian/manpages 1970-01-01 00:00:00.000000000 +0000 +++ simulpic-2005-1-28/debian/manpages 2014-05-29 16:33:07.000000000 +0000 @@ -0,0 +1 @@ +simulpic.1 diff -Nru simulpic-2005-1-28/debian/patches/00-no-writable-strings.diff simulpic-2005-1-28/debian/patches/00-no-writable-strings.diff --- simulpic-2005-1-28/debian/patches/00-no-writable-strings.diff 1970-01-01 00:00:00.000000000 +0000 +++ simulpic-2005-1-28/debian/patches/00-no-writable-strings.diff 2014-05-29 16:25:53.000000000 +0000 @@ -0,0 +1,9 @@ +--- a/Makefile ++++ b/Makefile +@@ -8,7 +8,7 @@ SRCS=simulpic.cc tfile.cc tiofile.cc tpa + + ALLSRC=$(IECSRC) $(SRCS) $(INCLUDES) Makefile Copyright README simulpic.doc simulpic.1 + +-CFLAGS= -g -fPIC -O -Wall -fwritable-strings -fno-exceptions \ ++CFLAGS= -g -fPIC -O2 -Wall -fno-exceptions \ + -I. -I/usr/include/g++-3 diff -Nru simulpic-2005-1-28/debian/patches/01-SUBLW.diff simulpic-2005-1-28/debian/patches/01-SUBLW.diff --- simulpic-2005-1-28/debian/patches/01-SUBLW.diff 1970-01-01 00:00:00.000000000 +0000 +++ simulpic-2005-1-28/debian/patches/01-SUBLW.diff 2014-05-29 16:26:26.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/tpic.cc ++++ b/tpic.cc +@@ -300,7 +300,7 @@ void TPic::SUBLW(TRegister literal) + { + unsigned char NewDC = (((literal & 0x0F) | 0x10) - (W & 0x0F) >= 0x10); + unsigned char NewC = (((unsigned int) literal) | 0x0100) - ((unsigned int) W) >= 0x0100; +- W-=literal; ++ W=literal-W; + Regs.STATUS=Bit_Write(Regs.STATUS, STATUS_C, NewC); + Regs.STATUS=Bit_Write(Regs.STATUS, STATUS_DC, NewDC); + Regs.STATUS=Bit_Write(Regs.STATUS, STATUS_Z, W==0); diff -Nru simulpic-2005-1-28/debian/patches/02-g++-extra-qualtification.diff simulpic-2005-1-28/debian/patches/02-g++-extra-qualtification.diff --- simulpic-2005-1-28/debian/patches/02-g++-extra-qualtification.diff 1970-01-01 00:00:00.000000000 +0000 +++ simulpic-2005-1-28/debian/patches/02-g++-extra-qualtification.diff 2014-05-29 16:27:37.000000000 +0000 @@ -0,0 +1,19 @@ +--- a/tpic.h ++++ b/tpic.h +@@ -89,11 +89,11 @@ class TPic { + TRegister Bit_Read(TRegister reg, TBit_Address pos); + TRegister Bit_Write(TRegister reg, TBit_Address pos, TBool bit); + +- TBool TPic::RB_Change_Event(); +- TBool TPic::INT_Event(); +- TBool TPic::RTCC_Event(); +- void TPic::Update_RTCC(); +- TBool TPic::Update_WDT(); ++ TBool RB_Change_Event(); ++ TBool INT_Event(); ++ TBool RTCC_Event(); ++ void Update_RTCC(); ++ TBool Update_WDT(); + + /**** PIC16C84 - Instruction Set ****/ + diff -Nru simulpic-2005-1-28/debian/patches/03-LDFLAGS.diff simulpic-2005-1-28/debian/patches/03-LDFLAGS.diff --- simulpic-2005-1-28/debian/patches/03-LDFLAGS.diff 1970-01-01 00:00:00.000000000 +0000 +++ simulpic-2005-1-28/debian/patches/03-LDFLAGS.diff 2014-05-29 16:29:54.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ CXX= g++ $(CFLAGS) + OBJS= $(SRCS:.cc=.o) + + simulpic: $(OBJS) +- g++ -g -o simulpic $(OBJS) ++ g++ $(LDFLAGS) -g -o simulpic $(OBJS) + + clean: + - rm -f $(OBJS) a.out *.core simulpic diff -Nru simulpic-2005-1-28/debian/patches/04-LFS.diff simulpic-2005-1-28/debian/patches/04-LFS.diff --- simulpic-2005-1-28/debian/patches/04-LFS.diff 1970-01-01 00:00:00.000000000 +0000 +++ simulpic-2005-1-28/debian/patches/04-LFS.diff 2014-05-29 16:41:48.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,7 @@ SRCS=simulpic.cc tfile.cc tiofile.cc tpa + ALLSRC=$(IECSRC) $(SRCS) $(INCLUDES) Makefile Copyright README simulpic.doc simulpic.1 + + CFLAGS= -g -fPIC -O2 -Wall -fno-exceptions \ +- -I. -I/usr/include/g++-3 ++ -I. -I/usr/include/g++-3 -D_FILE_OFFSET_BITS=64 + + + CXX= g++ $(CFLAGS) diff -Nru simulpic-2005-1-28/debian/patches/series simulpic-2005-1-28/debian/patches/series --- simulpic-2005-1-28/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ simulpic-2005-1-28/debian/patches/series 2014-05-29 16:41:58.000000000 +0000 @@ -0,0 +1,5 @@ +00-no-writable-strings.diff +01-SUBLW.diff +02-g++-extra-qualtification.diff +03-LDFLAGS.diff +04-LFS.diff diff -Nru simulpic-2005-1-28/debian/rules simulpic-2005-1-28/debian/rules --- simulpic-2005-1-28/debian/rules 2014-05-29 23:58:40.000000000 +0000 +++ simulpic-2005-1-28/debian/rules 2014-05-29 16:15:17.000000000 +0000 @@ -1,77 +1,4 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -build: build-stamp -build-stamp: - dh_testdir - $(MAKE) - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - $(MAKE) clean - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/simulpic. - install -p -m 755 -o root -g root $(CURDIR)/simulpic $(CURDIR)/debian/simulpic/usr/bin - install -p -m 644 -o root -g root $(CURDIR)/simulpic.1 $(CURDIR)/debian/simulpic/usr/share/man/man1 - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot -# dh_installdebconf - dh_installdocs - dh_installexamples - dh_installmenu -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit - dh_installcron - dh_installman - dh_installinfo - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +%: + dh $@ --parallel diff -Nru simulpic-2005-1-28/debian/source/format simulpic-2005-1-28/debian/source/format --- simulpic-2005-1-28/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ simulpic-2005-1-28/debian/source/format 2014-05-29 16:24:25.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru simulpic-2005-1-28/debian/source/options simulpic-2005-1-28/debian/source/options --- simulpic-2005-1-28/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ simulpic-2005-1-28/debian/source/options 2014-05-29 16:24:35.000000000 +0000 @@ -0,0 +1 @@ +compression="xz" diff -Nru simulpic-2005-1-28/Makefile simulpic-2005-1-28/Makefile --- simulpic-2005-1-28/Makefile 2014-05-29 23:58:40.000000000 +0000 +++ simulpic-2005-1-28/Makefile 2005-01-28 05:19:03.000000000 +0000 @@ -8,7 +8,7 @@ ALLSRC=$(IECSRC) $(SRCS) $(INCLUDES) Makefile Copyright README simulpic.doc simulpic.1 -CFLAGS= -g -fPIC -O2 -Wall -fno-exceptions \ +CFLAGS= -g -fPIC -O -Wall -fwritable-strings -fno-exceptions \ -I. -I/usr/include/g++-3 diff -Nru simulpic-2005-1-28/tpic.cc simulpic-2005-1-28/tpic.cc --- simulpic-2005-1-28/tpic.cc 2014-05-29 23:58:40.000000000 +0000 +++ simulpic-2005-1-28/tpic.cc 2005-01-27 05:08:46.000000000 +0000 @@ -300,7 +300,7 @@ { unsigned char NewDC = (((literal & 0x0F) | 0x10) - (W & 0x0F) >= 0x10); unsigned char NewC = (((unsigned int) literal) | 0x0100) - ((unsigned int) W) >= 0x0100; - W=literal-W; + W-=literal; Regs.STATUS=Bit_Write(Regs.STATUS, STATUS_C, NewC); Regs.STATUS=Bit_Write(Regs.STATUS, STATUS_DC, NewDC); Regs.STATUS=Bit_Write(Regs.STATUS, STATUS_Z, W==0); diff -Nru simulpic-2005-1-28/tpic.h simulpic-2005-1-28/tpic.h --- simulpic-2005-1-28/tpic.h 2014-05-29 23:58:40.000000000 +0000 +++ simulpic-2005-1-28/tpic.h 2005-01-27 05:08:46.000000000 +0000 @@ -89,11 +89,11 @@ TRegister Bit_Read(TRegister reg, TBit_Address pos); TRegister Bit_Write(TRegister reg, TBit_Address pos, TBool bit); - TBool RB_Change_Event(); - TBool INT_Event(); - TBool RTCC_Event(); - void Update_RTCC(); - TBool Update_WDT(); + TBool TPic::RB_Change_Event(); + TBool TPic::INT_Event(); + TBool TPic::RTCC_Event(); + void TPic::Update_RTCC(); + TBool TPic::Update_WDT(); /**** PIC16C84 - Instruction Set ****/