[SCM] wxMaxima packaging branch, master, updated. debian/12.01.0-1-5-g2160b44

Tue May 1 16:45:27 UTC 2012

The following commit has been merged in the master branch:
commit 2160b4421b488bc36cec448238bf293fb1dc9bb7
Author: Frank S. Thomas <fst at debian.org>
Date:   Tue May 1 18:06:06 2012 +0200

    Release 12.04.0-1.

diff --git a/debian/changelog b/debian/changelog
index 5813946..e49e3f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-wxmaxima (12.04.0-1) UNRELEASED; urgency=low
+wxmaxima (12.04.0-1) unstable; urgency=low
 
   * New upstream release.
     - Shows the output of build_info(). (closes: #670088)
   * Bumped Standards-Version from 3.9.2 to 3.9.3, no changes required.
+  * Use debhelper >= 9 and dpkg-buildflags.
+  * Added independent license paragraphs to debian/copyright.
 
- -- Frank S. Thomas <fst at debian.org>  Tue, 01 May 2012 14:44:32 +0200
+ -- Frank S. Thomas <fst at debian.org>  Tue, 01 May 2012 18:04:55 +0200
 
 wxmaxima (12.01.0-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 79ca0a1..1daa19b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: math
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Frank S. Thomas <fst at debian.org>
-Build-Depends: debhelper (>= 7.0.50), autotools-dev, libwxgtk2.8-dev (>= 2.8.4)
+Build-Depends: debhelper (>= 9), libwxgtk2.8-dev (>= 2.8.4)
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/debian-science/packages/wxmaxima.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/wxmaxima.git
diff --git a/debian/copyright b/debian/copyright
index 4deed5d..7d02a5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,22 +8,6 @@ Copyright: © 2004-2011 Andrej Vodopivec <andrej.vodopivec at gmail.com>
            © 2011 cw.ahbong <cw.ahbong at gmail.com>
            © 2008-2009 Ziga Lenarcic <zigalenarcic at users.sourceforge.net>
 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 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 systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 Files: art/*
 Copyright: © Sven Hodapp (http://4pple.de)
@@ -95,3 +79,28 @@ Copyright: © 2005-2007 Rafa Rodriguez Galvan <rafael.rodriguez at uca.es>
            © 2005-2007 Marco Presi (Zufus) <zufus at debian.org>
            © 2009-2012 Frank S. Thomas <fst at debian.org>
 License: GPL-2+
+
+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 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 systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: GPL
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
+
+License: CC-BY-SA
+ https://creativecommons.org/licenses/by-sa/2.5/legalcode
diff --git a/debian/rules b/debian/rules
index ac8e115..b68254a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,30 +1,13 @@
 #!/usr/bin/make -f
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already). Refer to
-# the section "Calling GNU configure properly" in
-# /usr/share/doc/autotools-dev/README.Debian.gz for more details.
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
+export DEB_CXXFLAGS_MAINT_APPEND = -Wall
+export DEB_LDFLAGS_MAINT_APPEND  = -Wl,--as-needed
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	cp -f /usr/share/misc/config.guess .
-	cp -f /usr/share/misc/config.sub .
-	
-	dh_auto_configure -- \
-	  $(confflags) \
-	  --enable-printing \
-	  CXXFLAGS="$(CXXFLAGS) -Wall" \
-	  LDFLAGS="$(LDFLAGS) -Wl,--as-needed"
+	dh_auto_configure -- --enable-printing
 
 override_dh_auto_install:
 	dh_auto_install

-- 
wxMaxima packaging

