tablix2 (0.3.5-2) debian-dir only changes

Summary

 debian/changelog      |   97 ++++++++++++++++++++++++++++++++++++++------------
 debian/compat         |    2 -
 debian/compat.debdiff |    1 
 debian/control        |   58 ++---------------------------
 debian/copyright      |   69 ++++++++++++-----------------------
 debian/docs           |    6 +++
 debian/examples       |    1 
 debian/manpages       |    6 +++
 debian/rules          |   59 ++++++++++++++----------------
 debian/watch          |    6 +++
 10 files changed, 152 insertions(+), 153 deletions(-)

    
download this patch

Patch contents

--- tablix2-0.3.5.orig/debian/rules
+++ tablix2-0.3.5/debian/rules
@@ -3,17 +3,23 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+CFLAGS = -g -Wall
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
 config.status: configure
 	dh_testdir
-	./configure --prefix=/usr --mandir=/usr/share/man --with-pvm3 --enable-conv
+	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=/usr/share/man --with-pvm3 --enable-conv --enable-more-teachers --enable-tunable
 
 build: build-stamp
 
-build-stamp: config.status
+build-stamp:  config.status
 	dh_testdir
 	$(MAKE)
 	touch build-stamp
@@ -23,47 +29,38 @@
 	dh_testroot
 	rm -f build-stamp 
 	rm -f examples/modules/*.so
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs usr/lib/pvm3/bin/`pvmgetarch`
+	dh_prep
+	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tablix2/
-	ln -s ../../../../bin/tablix2_kernel $(CURDIR)/debian/tablix2/usr/lib/pvm3/bin/`pvmgetarch`
+	mkdir -p $(CURDIR)/debian/tablix2/usr/lib/pvm3/bin/`pvmgetarch`
+	ln -s /usr/bin/tablix2_kernel $(CURDIR)/debian/tablix2/usr/lib/pvm3/bin/`pvmgetarch`/tablix2_kernel
+	# fix, --localedir isn't used
+	mv $(CURDIR)/debian/tablix2/usr/locale $(CURDIR)/debian/tablix2/usr/share/locale
 
 binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installchangelogs -i ChangeLog
-	dh_install -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
 
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installchangelogs -a ChangeLog 
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a 
-	dh_builddeb -a
+	dh_installdocs
+	dh_installman
+	dh_installexamples
+	dh_installchangelogs ChangeLog
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 
--- tablix2-0.3.5.orig/debian/examples
+++ tablix2-0.3.5/debian/examples
@@ -0,0 +1 @@
+examples/*
--- tablix2-0.3.5.orig/debian/control
+++ tablix2-0.3.5/debian/control
@@ -1,13 +1,13 @@
 Source: tablix2
 Section: misc
 Priority: extra
-Maintainer: Tomaz Solc <tomaz.solc@tablix.org>
-Build-Depends: debhelper (>> 4.0.0), pvm-dev, libxml2-dev
-Standards-Version: 3.6.2
+Maintainer: Robert Lemmen <robertle@semistable.com>
+Build-Depends: debhelper (>= 7.0.0), pvm-dev, libxml2-dev
+Standards-Version: 3.8.3
 
 Package: tablix2
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: pvm, ${shlibs:Depends}, ${misc:Depends}
 Recommends: gnuplot
 Description: Kernel for solving general timetabling problems
  Tablix is a powerful free software kernel for solving general 
@@ -17,52 +17,4 @@
  Tablix can run on a single host as well as on a heterogeneous 
  parallel virtual machine using PVM3.
  .
- Tablix kernel supports a very wide range of timetabling 
- problems, from high school timetabling to barge scheduling. 
- A number of timetable constraints are already implemented 
- in the default installation. Because of kernel's modular 
- design it is easy to add custom timetable constraints
- and/or modify existing ones.
- .
- This package contains Tablix kernel and the associated 
- command line utilities.
-
-Package: tablix2-dev
-Architecture: all
-Description: Kernel for solving general timetabling problems
- Tablix is a powerful free software kernel for solving general 
- timetabling problems. It uses a coarse-grained parallel genetic
- algorithm in combination with other techniques to construct 
- sensible timetables from XML formatted problem descriptions. 
- Tablix can run on a single host as well as on a heterogeneous 
- parallel virtual machine using PVM3.
- .
- Tablix kernel supports a very wide range of timetabling 
- problems, from high school timetabling to barge scheduling. 
- A number of timetable constraints are already implemented 
- in the default installation. Because of kernel's modular 
- design it is easy to add custom timetable constraints
- and/or modify existing ones.
- .
- This package contains header files necessary for 
- building additional Tablix modules.
-
-Package: tablix2-doc
-Architecture: all
-Description: Kernel for solving general timetabling problems
- Tablix is a powerful free software kernel for solving general 
- timetabling problems. It uses a coarse-grained parallel genetic
- algorithm in combination with other techniques to construct 
- sensible timetables from XML formatted problem descriptions. 
- Tablix can run on a single host as well as on a heterogeneous 
- parallel virtual machine using PVM3.
- .
- Tablix kernel supports a very wide range of timetabling 
- problems, from high school timetabling to barge scheduling. 
- A number of timetable constraints are already implemented 
- in the default installation. Because of kernel's modular 
- design it is easy to add custom timetable constraints
- and/or modify existing ones.
- .
- This package contains Tablix User's Manual, Tablix modules HOW-TO,
- Modules reference documentation and Tablix kernel API reference.
+ http://www.tablix.org/articles/about.html
--- tablix2-0.3.5.orig/debian/compat.debdiff
+++ tablix2-0.3.5/debian/compat.debdiff
@@ -0,0 +1 @@
+4
--- tablix2-0.3.5.orig/debian/docs
+++ tablix2-0.3.5/debian/docs
@@ -0,0 +1,6 @@
+BUGS
+AUTHORS
+doc/modules.pdf
+doc/modules2.pdf
+doc/morphix.pdf
+doc/manual.pdf
--- tablix2-0.3.5.orig/debian/changelog
+++ tablix2-0.3.5/debian/changelog
@@ -1,54 +1,105 @@
-tablix2 (0.3.5-1) unstable; urgency=low
+tablix2 (0.3.5-2) unstable; urgency=low
 
-  * New upstream release
+  * Set priority to extra
+  * Bumped Standards-Version to 3.8.3 and related changes
 
- -- Tomaz Solc <tomaz.solc@tablix.org>  Tue, 03 Jul 2007 13:21:37 +0200
+ -- Robert Lemmen <robertle@semistable.com>  Mon, 11 Jan 2010 15:32:41 +0000
 
-tablix2 (0.3.4-1) unstable; urgency=low
+tablix2 (0.3.5-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release (closes: #439886)
+  * fixed build system to make it re-buildable without cleans
 
- -- Tomaz Solc <tomaz.solc@tablix.org>  Fri,  3 Nov 2006 11:37:17 +0100
+ -- Robert Lemmen <robertle@semistable.com>  Tue, 18 Sep 2007 15:54:15 +0200
 
 tablix2 (0.3.3-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release (closes: #388777)
+  * Improvements to the Debian packaging (control- and rules-file)
+  * Sponsored upload by Petter Reinholdtsen
 
- -- Tomaz Solc <tomaz.solc@siol.net>  Sun, 28 May 2006 16:45:48 +0200
+ -- Robert Lemmen <robertle@semistable.com>  Thu,  5 Oct 2006 22:42:10 +0100
 
-tablix2 (0.3.2-1) unstable; urgency=low
+tablix2 (0.3.1-1) unstable; urgency=low
 
   * New upstream release
+  * Upload sponsored by Petter Reinholdtsen
 
- -- Tomaz Solc <tomaz.solc@siol.net>  Tue, 23 May 2006 19:25:21 +0200
+ -- Robert Lemmen <robertle@semistable.com>  Wed,  6 Apr 2006 11:40:50 +0100
 
-tablix2 (0.3.1-1) unstable; urgency=low
+tablix2 (0.3.0-2) unstable; urgency=low
 
-  * New upstream release
+  * Changed priority to extra, would violate policy otherwise because it
+    depends on an extra package.
+  * Sponsored upload by Petter Reinholdtsen
 
- -- Tomaz Solc <tomaz.solc@siol.net>  Wed,  1 Feb 2006 14:07:08 +0100
+ -- Robert Lemmen <robertle@semistable.com>  Tue, 29 Nov 2005 10:30:39 +0100
 
 tablix2 (0.3.0-1) unstable; urgency=low
 
-  * New upstream release
+  * Repacked for debian (closes: #322151)
+  * Sponsored upload by Petter Reinholdtsen
 
- -- Tomaz Solc <tomaz.solc@siol.net>  Fri,  7 Oct 2005 13:08:39 +0200
+ -- Robert Lemmen <robertle@semistable.com>  Sun, 13 Nov 2005 16:50:22 +0200
 
-tablix2 (0.2.3-1) unstable; urgency=low
+tablix (0.1.2-2) unstable; urgency=low
 
-  * New upstream release
+  * Minor cleanups in the debian/ dir
+  * Included the tablix_test manpage from ubuntu
 
- -- Tomaz Solc <tomaz.solc@siol.net>  Wed, 31 Aug 2005 13:11:56 +0200
+ -- Robert Lemmen <robertle@semistable.com>  Tue,  9 Aug 2005 13:23:01 +0200
 
-tablix2 (0.2.2-1) unstable; urgency=low
+tablix (0.1.2-1) unstable; urgency=low
 
   * New upstream release
 
- -- Tomaz Solc <tomaz.solc@siol.net>  Sat, 25 Jun 2005 20:04:58 +0200
+ -- Tomaz Solc <avian@orion.tomysoftware.net>  Fri, 10 Jun 2005 12:57:36 +0200
 
-tablix2 (0.2.1-1) unstable; urgency=low
+tablix (0.1.1-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release.
+
+ -- Tomaz Solc <tomaz.solc@siol.net>  Sat, 29 Jan 2005 17:13:08 +0100
+
+tablix (0.1.0-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- Tomaz Solc <avian@orion.tomysoftware.net>  Sat, 23 Oct 2004 17:24:47 +0200
+
+tablix (0.0.8-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- Tomaz Solc <avian@orion.tomysoftware.net>  Sat, 31 Jul 2004 11:08:17 +0200
+
+tablix (0.0.7-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Tomaz Solc <tomaz.solc@siol.net>  Wed, 31 Mar 2004 19:12:17 +0200
+
+tablix (0.0.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Tomaz Solc <tomaz.solc@siol.net>  Sat, 28 Feb 2004 12:17:35 +0100
+
+tablix (0.0.5-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- Tomaz Solc <tomaz.solc@siol.net>  Sun, 26 Oct 2003 11:03:24 +0100
+
+tablix (0.0.4-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- Tomaz Solc <tomaz.solc@siol.net>  Mon,  8 Sep 2003 21:46:22 +0200
+
+tablix (0.0.2-1) unstable; urgency=low
+
+  * Initial Release.
 
- -- Tomaz Solc <tomaz.solc@siol.net>  Thu,  9 Jun 2005 17:36:50 +0200
+ -- Tomaz Solc <tomaz.solc@siol.net>  Fri,  6 Sep 2002 17:08:56 +0200
 
--- tablix2-0.3.5.orig/debian/compat
+++ tablix2-0.3.5/debian/compat
@@ -1 +1 @@
-4
+7
--- tablix2-0.3.5.orig/debian/manpages
+++ tablix2-0.3.5/debian/manpages
@@ -0,0 +1,6 @@
+doc/tablix2.1
+doc/tablix2_output.1
+doc/tablix2_kernel.1
+doc/tablix2_benchmark.1
+doc/tablix2_plot.1
+doc/tablix2_test.1
--- tablix2-0.3.5.orig/debian/watch
+++ tablix2-0.3.5/debian/watch
@@ -0,0 +1,6 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+version=3
+# Site		Directory		Pattern			Version	Script
+http://www.tablix.org/releases/stable/ tablix[0-9]?-(.*)\.tar\.gz
--- tablix2-0.3.5.orig/debian/copyright
+++ tablix2-0.3.5/debian/copyright
@@ -1,50 +1,29 @@
-This package was debianized by Tomaz Solc <tomaz.solc@tablix.org> on
+This package was debianized by Tomaz Solc <tomaz.solc@siol.net> on
 Fri,  6 Sep 2002 17:08:56 +0200.
+Robert Lemmen <robertle@semistable.com> later modified it and is now
+maintaining it in the debian archive.
 
 It was downloaded from http://www.tablix.org
 
-Upstream Author(s): Tomaz Solc
+Upstream Author: Tomaz Solc <tomaz.solc@siol.net>
+  
+Copyright: 2002-2006 by Tomaz Solc.
+         
+License:
+  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 with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St, 
+  Fifth Floor, Boston, MA 02110-1301, USA.
 
-Copyright: 
-
-Tablix kernel and accompanying modules are 
-Copyright (c) 2002-2006 by Tomaz Solc.
-       
-You are free to distribute this software under the terms of
-the GNU General Public License.
-
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
-
-Tablix Testing Framework includes TinyScheme, a lightweight Scheme
-interpreter which is available under the following terms:
-
-Copyright (c) 2000, Dimitrios Souflis
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-Neither the name of Dimitrios Souflis nor the names of the
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR 
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.