[fityk] 22/45: Imported Debian patch 0.8.6-3

[Stuart Prescott]

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

stuart pushed a commit to branch master
in repository fityk.

commit bc473e190c52bb1a48b611438682bff63ea7f63e
Author: Carlo Segre <segre at debian.org>
Date:   Sun Apr 12 13:55:45 2009 -0500

    Imported Debian patch 0.8.6-3
---
 debian/changelog     |  9 +++++++++
 debian/copyright     |  2 +-
 debian/fityk.desktop | 12 ------------
 debian/watch         |  7 +++----
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9652665..bb84714 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+fityk (0.8.6-3) unstable; urgency=low
+
+  * Removed leftover debian/fityk.desktop (Closes: #500090) - thanks
+    to David Futcher <bobbo at ubuntu.com>.
+  * Restore sourceforge redirector in debian/watch.
+  * Fix reference to GPL-2.
+
+ -- Carlo Segre <segre at debian.org>  Sun, 12 Apr 2009 13:55:45 -0500
+
 fityk (0.8.6-2) unstable; urgency=high
 
   * Compile against libwxgtk2.8-dev so Help/Manual works (Closes: #499734).
diff --git a/debian/copyright b/debian/copyright
index 84356a9..ca2ca63 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,4 +21,4 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 In Debian GNU/Linux, the full text of the GPL may be found in:
-/usr/share/common-licenses/GPL
+/usr/share/common-licenses/GPL-2
diff --git a/debian/fityk.desktop b/debian/fityk.desktop
deleted file mode 100644
index cb9496c..0000000
--- a/debian/fityk.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=Fityk
-GenericName=Curve Fitter
-Icon=/usr/share/pixmaps/fityk.xpm
-Comment=Peak fitting and data analysis
-Exec=fityk %F
-Terminal=False
-StartupNotify=True
-MimeType=application/x-fityk;
-Categories=Education;Science;DataVisualization;
diff --git a/debian/watch b/debian/watch
index 03f4abc..a65f303 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,6 @@
 version=3
-# qa.debian.org redirector timing out
-#http://sf.net/fityk/fityk-(.+)\.tar\.bz2	debian	uupdate
+http://sf.net/fityk/fityk-(.+)\.tar\.bz2	debian	uupdate
 #ftp://upload.sourceforge.net/pub/sourceforge/f/fi/fityk/ \
 #	fityk-(.+)\.tar\.bz2	debian	uupdate
-ftp://heanet.dl.sourceforge.net/f/fi/fityk/fityk-(.*)\.tar\.bz2	\
- debian	uupdate
+#ftp://heanet.dl.sourceforge.net/f/fi/fityk/fityk-(.*)\.tar\.bz2	\
+# debian	uupdate

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