[Pkg-octave-commit] [SCM] qtoctave branch, master, updated. 1dfa0c6d8de06026de751df9134d37eb77a84e7b

[Thomas Weber]

The following commit has been merged in the master branch:
commit 310a46ad92f1b914825aa4c5c78714f66f73e39e
Author: Thomas Weber <tweber at debian.org>
Date:   Sat May 22 23:28:21 2010 +0200

    We don't repackage the upstream sources anymore

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index c2edc72..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,12 +0,0 @@
-QtOctave source for Debian
---------------------------
-
-The layout of the original tarball has been changed in the Debian package.
-First, the simple_rcs directory has been removed, because it relates to
-another project than qtoctave.  Second, the qtoctave/octave_doc directory
-has also been removed, because it contains the HTML files generated from the
-Octave texinfo documentation files.  Since the sources are not distributed,
-it does not comply with the DFSG. 
-
-Note that './debian/rules get-orig-source' creates the Debian "upstream"
-tarball.
diff --git a/debian/changelog b/debian/changelog
index 364505e..35489c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qtoctave (0.9.1-1) UNRELEASED; urgency=low
   * New upstream release
   * debian/watch: Update regexp to allow notification for bz2 archives
   * This version works with Qt 4.6 (closes: #565197,584349)
+  * Removed +dfsg from version; upstream has stopped distributing
+    GPL-questionable docs.
 
   [ Thomas Weber ]
   * debian/control: Remove Rafael Laboissiere from Uploaders (Closes: #571914)
diff --git a/debian/rules b/debian/rules
index c65c836..6076fa2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,21 +9,3 @@ build/qtoctave::
 	uudecode < debian/icons.tar.uu
 	tar -xf icons.tar -C debian
 
-PACKAGE = qtoctave
-VERSION = $(shell dpkg-parsechangelog \
-                  | sed -ne 's/^Version: \([0-9.]\+\).*/\1/p')
-PACKVER = $(PACKAGE)-$(VERSION)
-TARBALL = $(PACKVER).tar.gz
-SITE = http://forja.rediris.es
-PAGE = frs/?group_id=60
-URL = $(SITE)$(shell wget -O - $(SITE)/$(PAGE) \
-               | sed -ne 's/.*href="\(.*$(TARBALL)\)".*/\1/p')
-
-get-orig-source:
-	rm -f $(TARBALL)
-	wget $(URL) -O $(TARBALL)
-	tar xfz $(TARBALL)
-	( cd $(PACKVER) ; 				\
-	  rm -rf simple_rcs qtoctave/src/octave_doc )
-	tar cfz $(PACKAGE)_$(VERSION)+dfsg.orig.tar.gz $(PACKVER)
-	rm -rf $(PACKVER) $(TARBALL)

-- 
qtoctave