[ngspice] 04/61: Version 19 ready for upload.

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ngspice.

commit 38ea0fee7568f888d9b6970e9840b328ba786d34
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Fri May 22 05:43:31 2009 +0000

    Version 19 ready for upload.
---
 debian/changelog            |  6 ++++--
 debian/control              |  2 +-
 debian/getopt_replacement.c |  3 ---
 debian/ngspice.dirs         |  2 +-
 debian/ngspice.install      |  2 +-
 debian/rules                | 16 +++-------------
 6 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1ae831..b6f9166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
-ng-spice-rework (19-1) UNRELEASED; urgency=low
+ng-spice-rework (19-1) unstable; urgency=low
 
   * New upstream release
   * Remove all patches since they are already in upstream
   * Remove call to autogen and --enable experimental option when building
   * Fix watch file
   * Not removing getopt files, since they are BSD now
+  * Change /usr/share/ng-spice-rework to /usr/share/ngspice
+  * Remove quilt dependency
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Thu, 21 May 2009 10:39:47 +0200
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Thu, 21 May 2009 20:42:59 +0200
 
 ng-spice-rework (18-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 68d6d61..1615cbc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Gudjon I. Gudjonsson <gudjon at gudjon.org>
 Build-Depends: debhelper (>= 7), automake, libtool, libxaw7-dev, flex,
  bison, gfortran, libeditline-dev, libncurses5-dev,
  texinfo, texlive-latex-base,
- tcl8.4-dev, tcl8.4, tk8.4-dev, tk8.4, blt-dev, quilt
+ tcl8.4-dev, tcl8.4, tk8.4-dev, tk8.4, blt-dev
 Standards-Version: 3.8.1
 Homepage: http://ngspice.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/ngspice/trunk/
diff --git a/debian/getopt_replacement.c b/debian/getopt_replacement.c
deleted file mode 100644
index 8616103..0000000
--- a/debian/getopt_replacement.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* for Debian, we use the system getopts.  Upstream provided GPL versions
-** which have been removed to preserve BSD licensing
-*/
diff --git a/debian/ngspice.dirs b/debian/ngspice.dirs
index 713562d..b228d57 100644
--- a/debian/ngspice.dirs
+++ b/debian/ngspice.dirs
@@ -2,5 +2,5 @@ usr/bin
 usr/lib/spice
 usr/share/info
 usr/share/man
-usr/share/ng-spice-rework
+usr/share/ngspice
 
diff --git a/debian/ngspice.install b/debian/ngspice.install
index f90d4fe..41dad0c 100644
--- a/debian/ngspice.install
+++ b/debian/ngspice.install
@@ -2,4 +2,4 @@ usr/bin/*
 usr/lib/spice/*
 usr/share/info/*
 usr/share/man/*
-usr/share/ng-spice-rework/*
+usr/share/ngspice/*
diff --git a/debian/rules b/debian/rules
index 7bf55a6..d0c57bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
+#include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -17,13 +17,9 @@ endif
 
 
 
-config.status: patch config.status-stamp configure
+config.status: config.status-stamp configure
 config.status-stamp:
 	dh_testdir
-	# Install empty files instead of the original getopt files
-	cp debian/getopt_replacement.c src/misc/getopt.c
-	cp debian/getopt_replacement.c src/misc/getopt.h
-	cp debian/getopt_replacement.c src/misc/getopt1.c
 	# Make build dir for ngspice
 	mkdir -p build/ngspice
 	cp -Rl `ls . |grep -v build|grep -v debian` build/ngspice
@@ -87,15 +83,12 @@ build-stamp:  config.status
 
 	touch $@
 
-clean: unpatch
+clean: 
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
 	rm -f config.status-stamp
 	rm -rf build
-	rm -f src/misc/getopt1.c
-	rm -f src/misc/getopt.c
-	rm -f src/misc/getopt.h
 
 	dh_clean 
 
@@ -188,9 +181,6 @@ get-orig-source:
 	rm -f doc/*.pdf
 	rm -f config.sub
 	rm -f config.guess
-	#rm -f src/misc/getopt1.c
-	#rm -f src/misc/getopt.c
-	#rm -f src/misc/getopt.h
 	tar -zcf ${TARNAME} ${DIRNAME}
 	rm -rf ${DIRNAME} ${ARCHIVE}
 

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