--- uisp-20050207.orig/debian/control +++ uisp-20050207/debian/control @@ -0,0 +1,18 @@ +Source: uisp +Section: electronics +Priority: extra +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Margarita Manterola +Standards-Version: 3.7.2 +Build-Depends: debhelper (>=5), dpatch +Homepage: http://www.nongnu.org/uisp/ + +Package: uisp +Architecture: any +Depends: ${shlibs:Depends} +Description: Micro In-System Programmer for Atmel's AVR MCUs + This utility is required to program AVR chips with object code + created by the ava assembler/linker, gas, or gcc. It supports + in-system programming, Atmel's prototype board/programmer (stk500), + and many other extremely low-cost parallel port programmers. + It can also be used to program Atmel's AT89S51 and AT89S52. --- uisp-20050207.orig/debian/docs +++ uisp-20050207/debian/docs @@ -0,0 +1,9 @@ +ChangeLog-2003 +ChangeLog-2002 +AUTHORS +NEWS +TODO +CHANGES +doc/README.stk500 +doc/README.xilinx +doc/uisp-parport-connect.txt --- uisp-20050207.orig/debian/README.debian +++ uisp-20050207/debian/README.debian @@ -0,0 +1,17 @@ +uisp for DEBIAN +--------------- + +If you want to use a parallel-port programmer (such as the STK200) +with this release, your kernel must have ppdev support. + +If running a 2.6 kernel image, make sure you have loaded both the +"parport_pc" and the "ppdev" modules. + +-- Margarita Manterola Wed, 6 Oct 2004 00:59:00 -0300 + +The ppdev driver will be standard in 2.4.x kernels. If you're running +a 2.2.x kernel, a patch is available: + +http://people.redhat.com/twaugh/ftp/parport/patch-2.2.17-ppdev1.gz + +-- Jefferson E. Noxon Sat, 18 Nov 2000 15:09:05 -0600 --- uisp-20050207.orig/debian/changelog +++ uisp-20050207/debian/changelog @@ -0,0 +1,170 @@ +uisp (20050207-4.2ubuntu1) raring; urgency=low + + * Merge from Debian unstable. (LP: #1080868) Remaining changes: + - Build with -Wno-error as some warn_unused_result warnings are generated. + Fixes FTBFS + + -- Alessandro Losavio Wed, 21 Nov 2012 17:51:28 +0000 + +uisp (20050207-4.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "ftbfs with GCC-4.7": debian/rules: add -Wno-narrowing to CXXFLAGS, as + suggested by Matthias Klose. + (Closes: #667403) + + -- gregor herrmann Fri, 25 May 2012 15:30:45 +0200 + +uisp (20050207-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "ftbfs with gcc-4.6 -Werror": add patch 40_fix_g++_4.6.dpatch from + peter green (removes unused variables). + Closes: #625409 + + -- gregor herrmann Wed, 21 Dec 2011 14:33:08 +0100 + +uisp (20050207-4ubuntu1) lucid; urgency=low + + * Build with -Wno-error as some warn_unused_result warnings are + generated. Fixes FTBFS. + + -- Ilya Barygin Sun, 07 Mar 2010 00:28:56 +0300 + +uisp (20050207-4) unstable; urgency=low + + * Changed debian/rules to apply dpatches at configure-time. + * Fixed the manpage patch accordingly. + * Added 30_fix_g++_4.3.dpatch fixing the use of parenthesis with the + shift operator. (Closes: #417677) + * Cleaned up old 10_const_char.dpatch to new dpatch simpler format. + * Switched to debhelper compat level 5. + * Cleaned and updated debian/rules + * Upgraded to Standards-Version 3.7.2 - No changes needed. + * Moved Homepage from pseudo-field to real field in debian/control. + + -- Margarita Manterola Thu, 27 Sep 2007 22:27:27 -0300 + +uisp (20050207-3) unstable; urgency=low + + * Changed maintainer address. + * Added 10_const_char.dpatch to make it compile with GCC 4.2 + (Closes: #361712) + * Added 20_fix_manpage.dpatch to fix the manpage. (Closes: 360021) + + -- Margarita Manterola Fri, 14 Apr 2006 14:26:41 -0300 + +uisp (20050207-2) unstable; urgency=low + + * Fixed debian/rules to comply with Policy section 10.1 + * Trigger a rebuild for the C++ transition. + + -- Margarita Manterola Wed, 27 Jul 2005 11:21:45 -0300 + +uisp (20050207-1) unstable; urgency=low + + * New upstream release + * The patches applied are now in upstream, removed from debian/patches, + removed dpatch build-dependency. + * Added upstream homepage to the description in debian/control + + -- Margarita Manterola Tue, 8 Feb 2005 10:40:38 -0300 + +uisp (20040311-1) unstable; urgency=low + + * Apply patch to support Datamekatornik 2004 cable, submitted by Hakan Ardo + (closes: #240250). + * Apply patch to support g++-3.4 (closes: #264444). + * Add the new changelogs and several other documents to /usr/share/doc/uisp + (closes: #202771). + * Apply patch to support ATDH cable. + * New upstream release (closes: #253721) + - Fixes argument parsing for -datmel (closes: #226275). + * New maintainer. + + -- Margarita Manterola Wed, 11 Oct 2004 16:28:16 -0300 + +uisp (20030618-2) unstable; urgency=low + + * Forgot to update maintainer in control file, fixed. + + -- Jefferson E. Noxon Mon, 28 Jul 2003 12:38:24 -0500 + +uisp (20030618-1) unstable; urgency=low + + * New upstream release + * New maintainer + + -- Jefferson E. Noxon Thu, 24 Jul 2003 11:08:05 -0500 + +uisp (20021201-1) unstable; urgency=low + + * New upstream release + + -- Shaun Jackman Mon, 10 Mar 2003 22:41:45 -0800 + +uisp (20020626-1) unstable; urgency=low + + * New upstream release (closes: #138733) + * New upstream location (closes: #148266) + + -- Shaun Jackman Sat, 5 Oct 2002 10:37:54 -0700 + +uisp (20010701-1.1) unstable; urgency=low + + * NMU + * Fix C++ errors. Closes: #105113. + + -- LaMont Jones Tue, 31 Jul 2001 12:52:38 -0600 + +uisp (20010701-1) unstable; urgency=low + + * New upstream release (closes: Bug#103003) + * New upstream maintainer address in copyright file + * New download location noted + + -- Jefferson E. Noxon Mon, 2 Jul 2001 16:37:02 -0500 + +uisp (20001118-1) unstable; urgency=low + + * New upstream release + * Add Build-Depends + + -- Jefferson E. Noxon Sat, 18 Nov 2000 14:53:23 -0600 + +uisp (0.1.6-4) frozen unstable; urgency=low + + * Removed PSPI functionality entirely. + + -- Jefferson E. Noxon Mon, 10 Apr 2000 16:05:33 -0500 + +uisp (0.1.6-3.1) frozen unstable; urgency=low + + * NMU + * Applied patch from bug report to make this compile on all archs in + order to satisy dependencies on packages that are compiled on all + archs, closes: #61145 + * changed control file's arch for the above change + + -- Ben Collins Thu, 6 Apr 2000 23:43:44 -0400 + +uisp (0.1.6-3) unstable; urgency=low + + * Updated to debian-policy 3.0.1.1 + * Changed maintainer address + + -- Jefferson E. Noxon Tue, 14 Sep 1999 23:53:13 -0500 + +uisp (0.1.6-2) unstable; urgency=low + + * Changed architecture to i386 (closes bug #36516). This bug should + be fixed in a less drastic way in a future upstream release. + + -- Jefferson E. Noxon Fri, 2 Jul 1999 20:15:31 -0500 + +uisp (0.1.6-1) unstable; urgency=low + + * Initial Release. + + -- Jefferson E. Noxon Sat, 6 Feb 1999 19:19:13 -0600 + --- uisp-20050207.orig/debian/manpages +++ uisp-20050207/debian/manpages @@ -0,0 +1 @@ +uisp.1 --- uisp-20050207.orig/debian/copyright +++ uisp-20050207/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Jefferson E. Noxon +on Sat, 6 Feb 1999 19:20:31 -0600. +It is now maintained by Margarita Manterola + +Upstream source: http://savannah.nongnu.org/projects/uisp/ +Upstream maintainer: Margarita Manterola + +Copyright and licensing info: + +# uisp - The Micro In-System Programmer for Atmel AVR microcontrollers. +# +# Copyright (c) 1997-1999 Uros Platise, 2000-2003 Marek Michalkiewicz +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian GNU/Linux Systems, the complete text of the GNU General Public +License can be found in "/usr/share/common-licenses/GPL". + --- uisp-20050207.orig/debian/install +++ uisp-20050207/debian/install @@ -0,0 +1 @@ +src/uisp usr/bin --- uisp-20050207.orig/debian/watch +++ uisp-20050207/debian/watch @@ -0,0 +1,3 @@ +# watch control file for uscan +# Site Directory Pattern Version Script +http://savannah.nongnu.org /download/uisp/ uisp-(.*)\\.tar\\.gz debian uupdate --- uisp-20050207.orig/debian/compat +++ uisp-20050207/debian/compat @@ -0,0 +1 @@ +5 --- uisp-20050207.orig/debian/dirs +++ uisp-20050207/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/doc/uisp --- uisp-20050207.orig/debian/rules +++ uisp-20050207/debian/rules @@ -0,0 +1,71 @@ +#!/usr/bin/make -f +# debian/rules for uisp. GNU copyright 1997-1999 by Joey Hess and others. + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +# This package uses dpatch +include /usr/share/dpatch/dpatch.make + +# 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) + +# Flags for debugging +CXXFLAGS = -g -Wall -Wno-error -Wno-narrowing + +# Flags for optimization +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CXXFLAGS += -O0 +else + CXXFLAGS += -O2 +endif + +config.status: configure patch-stamp + dh_testdir + CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + +build: build-stamp +build-stamp: config.status + dh_testdir + $(MAKE) + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + [ ! -f Makefile ] || $(MAKE) clean + dh_clean + [ ! -f Makefile ] || $(MAKE) distclean + +install: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + dh_install + +# 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_installdocs + dh_installman + dh_installchangelogs ChangeLog + 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 patch-stamp unpatch --- uisp-20050207.orig/debian/patches/30_fix_g++_4.3.dpatch +++ uisp-20050207/debian/patches/30_fix_g++_4.3.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_fix_g++_4.3.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad uisp-20050207~/src/Stk500.C uisp-20050207/src/Stk500.C +--- uisp-20050207~/src/Stk500.C 2007-09-27 21:42:04.000000000 -0300 ++++ uisp-20050207/src/Stk500.C 2007-09-27 21:55:41.000000000 -0300 +@@ -419,7 +419,7 @@ + } + + pgsz = prg_part[desired_part].params.pagesize; +- pagesize = (pgsz[0]) << 8 + pgsz[1]; ++ pagesize = (pgsz[0] << 8) + pgsz[1]; + + if (pagesize == 0) { + pagesize = 128; --- uisp-20050207.orig/debian/patches/00list +++ uisp-20050207/debian/patches/00list @@ -0,0 +1,4 @@ +10_const_char.dpatch +20_fix_manpage.dpatch +30_fix_g++_4.3.dpatch +40_fix_g++_4.6.dpatch --- uisp-20050207.orig/debian/patches/20_fix_manpage.dpatch +++ uisp-20050207/debian/patches/20_fix_manpage.dpatch @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_fix_man2.dpatch by Margarita Manterola +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Improved the manpage a bit. + +@DPATCH@ +diff -urNad uisp-20050207~/uisp.1.in uisp-20050207/uisp.1.in +--- uisp-20050207~/uisp.1.in 2004-10-20 13:25:07.000000000 -0300 ++++ uisp-20050207/uisp.1.in 2007-09-27 21:53:05.000000000 -0300 +@@ -1,13 +1,13 @@ + .TH UISP "1" "@DATE@" "uisp version @VERSION@" "User Commands" + .SH NAME +-uisp \- manual page for uisp ++uisp \- Micro In-System Programmer for Atmel's AVR MCUs + .SH SYNOPSIS + .B uisp + [\fIOPTION\fR].. \fI-dprog=TYPE\fR \fI-dpart=AT90XXX\fR \fI--FUNCTION\fR.. [\fIif=SOURCE\fR] [\fIof=DEST\fR] + .SH DESCRIPTION + .IP + .SS "Programming Methods:" +-\fB\-dprog\fR=avr910|pavr|stk500 ++\fB\-dprog\fR= + .RS + .TP + avr910 +@@ -18,10 +18,6 @@ + .TP + stk500 + Atmel STK500 +-.RE +-.HP +-\fB\-dprog\fR=dapa|stk200|abb|atdh|avrisp|bsd|fbprg|dt006|maxi|dm04|dasa|dasa2|dasa3 +-.RS + .TP + dapa + Direct AVR Parallel Access --- uisp-20050207.orig/debian/patches/10_const_char.dpatch +++ uisp-20050207/debian/patches/10_const_char.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# +# DP: Fix that allows the code to compile in GCC 4.2. +# DP: Changed char* name to const char* name, to make it a explicit +# DP: String constant +# DP: by +@DPATCH@ +--- uisp/src/Avr.h 2004-03-30 23:25:44.000000000 -0300 ++++ uisp/src/Avr.h.new 2006-04-14 14:23:19.125286240 -0300 +@@ -142,7 +142,7 @@ + private: + /* AVR Family Device (Part) List */ + struct TPart { +- char* name; ++ const char* name; + TByte part_family; + TByte part_number; + TAddr flash_size; --- uisp-20050207.orig/debian/patches/40_fix_g++_4.6.dpatch +++ uisp-20050207/debian/patches/40_fix_g++_4.6.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 40_fix_g++_4.6.dpatch by peter green +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove unused variables. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' uisp-20050207~/src/Stk500.C uisp-20050207/src/Stk500.C +--- uisp-20050207~/src/Stk500.C 2011-10-29 23:04:59.000000000 +0000 ++++ uisp-20050207/src/Stk500.C 2011-10-29 23:06:46.000000000 +0000 +@@ -724,7 +724,6 @@ + void TStk500::ReadMem(){ + TByte buf[0x200]; + int wordsize; +- TAddr addr; + TByte seg; + + if (segment == SEG_FLASH) { +@@ -741,7 +740,6 @@ + + EnterProgrammingMode(); + +- addr = 0; + for (unsigned int addr=0; addr