[Pkg-electronics-commits] [SCM] Package for Gwave branch, master, updated. c11ffb16373636c8f16cb87628fef33d06e27805

Mon Nov 16 17:29:24 UTC 2009

The following commit has been merged in the master branch:
commit 21d74b40e34179ccfabf6b24606b72b8ebe41a52
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Mon Nov 16 19:16:38 2009 +0200

    * Switch to source format 3.0 (quilt).
    * debian/control:
      + Bumped Standards-Version to 3.8.3, no changes needed.
      + Added myself to uploaders.
      + Build-Depend on debhelper (>= 7.0.50~).
      + Added Homepage field.
      + Fix from Ubuntu: add dependency on guile-gnome2-gtk to fix segfault at
        launch (Closes: #522674)
      + Added dependency on ${misc:Depends}
      + Remove libreadline5-dev from Build-Depends (Closes: #553780).
    * debian/compat: Bumped compat level to 7
    * Added debian/gwave.install and debian/gwave.examples
    * debian/rules: Simplified rules file.
      + Add -Wl,--as-needed to LDFLAGS
    * debian/gwave.desktop:
      + Remove Encoding key.
      + Add Education;Science to categories.
    * Added patch 01_fix_ascii_import_locale.diff to fix LC_NUMERIC issue
      importing ASCII files. Thanks to Peter Clifton <pcjc2 at cam.ac.uk>.
      (LP: #482748)
    * debian/copyright: Rewrite in machine-readable format.

diff --git a/debian/changelog b/debian/changelog
index 04b0ed4..7a44bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+gwave (20090213-2) unstable; urgency=low
+
+  * Switch to source format 3.0 (quilt).
+  * debian/control:
+    + Bumped Standards-Version to 3.8.3, no changes needed.
+    + Added myself to uploaders.
+    + Build-Depend on debhelper (>= 7.0.50~).
+    + Added Homepage field.
+    + Fix from Ubuntu: add dependency on guile-gnome2-gtk to fix segfault at
+      launch (Closes: #522674)
+    + Added dependency on ${misc:Depends}
+    + Remove libreadline5-dev from Build-Depends (Closes: #553780).
+  * debian/compat: Bumped compat level to 7
+  * Added debian/gwave.install and debian/gwave.examples
+  * debian/rules: Simplified rules file.
+    + Add -Wl,--as-needed to LDFLAGS
+  * debian/gwave.desktop:
+    + Remove Encoding key.
+    + Add Education;Science to categories.
+  * Added patch 01_fix_ascii_import_locale.diff to fix LC_NUMERIC issue
+    importing ASCII files. Thanks to Peter Clifton <pcjc2 at cam.ac.uk>.
+    (LP: #482748)
+  * debian/copyright: Rewrite in machine-readable format.
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>  Mon, 16 Nov 2009 15:42:07 +0200
+
 gwave (20090213-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 243166c..a76763c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,14 @@ Source: gwave
 Section: electronics
 Priority: optional
 Maintainer: Debian Electronics Team <pkg-electronics-devel at lists.alioth.debian.org>
-Uploaders: Hamish Moffatt <hamish at debian.org>, Wesley J. Landaker <wjl at icecavern.net>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4), libgtk2.0-dev, guile-1.8-dev | libguile-dev, libglib2.0-dev, libreadline5-dev | libreadline-dev, guile-gnome2-dev, guile-gnome2-gtk, guile-cairo-dev, libgwrap-runtime-dev
+Uploaders: Hamish Moffatt <hamish at debian.org>, Wesley J. Landaker <wjl at icecavern.net>, أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
+Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev, guile-1.8-dev | libguile-dev, libglib2.0-dev, libreadline-dev, guile-gnome2-dev, guile-cairo-dev, libgwrap-runtime-dev
+Homepage: http://gwave.sourceforge.net
 
 Package: gwave
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, guile-gnome2-gtk
 Description: a waveform viewer eg for spice simulators
  gwave - a viewer for the output of spice-like simulators
  and other viewing of analog data.
diff --git a/debian/copyright b/debian/copyright
index b85d591..3a78033 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,41 +1,32 @@
-This package was debianized by:
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: gwave
+Maintainer: Steve Tell <tell at cs.unc.edu> or <steve at telltronics.org>
+Source: http://gwave.sourceforge.net
 
-    Hamish Moffatt <hamish at debian.org> on Wednesday October 7 1998.
 
-It was downloaded from:
+Copyright: 1997-2008, Stephen G. Tell <steve at telltronics.org>
+License: GPL-2+
 
-    <http://gwave.sourceforge.net/>
+On Debian systems, the complete text of the GNU GPL2 licenses
+can be found at `/usr/share/common-licenses/GPL-2'.
 
-Upstream Authors:
+Files: debian/*
+Copyright: 1998-2009, Hamish Moffatt <hamish at debian.org>
+           2009, أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users@users.sourceforge.net>
+License: GPL-2+
 
-     Steve Tell <tell at cs.unc.edu> or <steve at telltronics.org>
-
-Copyright:
-
-     Copyright (C) 1998, 1999, 2000 Stephen G. Tell.
-
-License:
-
-    This package is free software; you can redistribute it and/or modify
+License: GPL-2+
+    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 package is distributed in the hope that it will be useful,
+    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 package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is:
-
-    Copyright (C) 1998-2009, Hamish Moffatt <hamish at debian.org>
-
-and is licensed under the GPL, see above.
-
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+    USA.
diff --git a/debian/gwave.desktop b/debian/gwave.desktop
index abf1c19..339f041 100644
--- a/debian/gwave.desktop
+++ b/debian/gwave.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=gwave waveform viewer
 GenericName=gwave
 Comment=Use the gwave waveform viewer
 Type=Application
 Exec=gwave
 Icon=gwave
-Categories=Engineering;Electronics
+Categories=Education;Science;Engineering;Electronics
diff --git a/debian/gwave.docs b/debian/gwave.docs
index 7908446..43a144f 100644
--- a/debian/gwave.docs
+++ b/debian/gwave.docs
@@ -1 +1,4 @@
-README AUTHORS
+README
+AUTHORS
+FAQ
+NEWS
diff --git a/debian/gwave.examples b/debian/gwave.examples
new file mode 100644
index 0000000..e39721e
--- /dev/null
+++ b/debian/gwave.examples
@@ -0,0 +1 @@
+examples/*
diff --git a/debian/gwave.install b/debian/gwave.install
new file mode 100644
index 0000000..d248b6c
--- /dev/null
+++ b/debian/gwave.install
@@ -0,0 +1 @@
+debian/gwave.desktop usr/share/applications
diff --git a/debian/patches/.dpkg-source-applied b/debian/patches/.dpkg-source-applied
new file mode 100644
index 0000000..9b9b88b
--- /dev/null
+++ b/debian/patches/.dpkg-source-applied
@@ -0,0 +1 @@
+01-fix_ascii_import_locale.diff
diff --git a/debian/patches/01-fix_ascii_import_locale.diff b/debian/patches/01-fix_ascii_import_locale.diff
new file mode 100644
index 0000000..cdfb12f
--- /dev/null
+++ b/debian/patches/01-fix_ascii_import_locale.diff
@@ -0,0 +1,24 @@
+Description: Sets LC_NUMERIC to POSIX in order to avoid delimeter parsing
+  issues when data in ASCII formats.
+Origin: origin, commit: r240
+Author: Peter Clifton <pcjc2 at cam.ac.uk>
+diff -urN a/src/gwave.c b/src/gwave.c
+--- a/src/gwave.c	2009-02-13 04:40:03.000000000 +0000
++++ b/src/gwave.c	2009-11-15 14:14:39.185359393 +0000
+@@ -29,6 +29,7 @@
+ #include <errno.h>
+ #include <assert.h>
+ #include <sys/time.h>
++#include <locale.h>
+ 
+ #include <gtk/gtk.h>
+ #include <config.h>
+@@ -169,7 +170,7 @@
+ 	init_draw();
+ 	
+ 	gtk_init(&argc, &argv);
+-
++	setlocale(LC_NUMERIC, "POSIX");
+ 
+ #ifdef HAVE_G_SLICE_SET_CONFIG
+ 	/* default mode causes frequent crashes; this probably masks it rather
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9b9b88b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-fix_ascii_import_locale.diff
diff --git a/debian/rules b/debian/rules
index d4491f3..cdb8874 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,63 +1,10 @@
 #!/usr/bin/make -f
-# MAde with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Cristoph Lameter.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-	
-	./configure --prefix=/usr
-	$(MAKE) 
+#override_dh_auto_configure:
+#	dh_auto_configure -- LDFLAGS="$(LDFLAGS) -Wl,--as-needed"
 
-	touch build-stamp
-
-clean:
-	dh_testdir
-	rm -f build-stamp install-stamp
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: install-stamp
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=`pwd`/debian/gwave
-
-	touch install-stamp
-
-# 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_testversion
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	cp examples/* debian/gwave/usr/share/doc/gwave/examples
-	cp debian/gwave.desktop debian/gwave/usr/share/applications
-
-	dh_installmenu
-	dh_installchangelogs NEWS
-	dh_desktop
-	dh_strip
+override_dh_compress:
 	dh_compress --exclude=examples
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Package for Gwave

