[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#425544: oleo: diff for QA upload version 1.99.16-11



Hi,

The attached file is the diff for my oleo 1.99.16-11 QA upload. The
associated changelog entry is:

 oleo (1.99.16-11) unstable; urgency=medium

   * QA upload.
   * Fix FTBFS with GCC 4.3. (Closes: #425544)
   * Call update-menus in postinst and postrm.
   * Remove minimum version in versioned dependency on libncurses5-dev.
   * debian/copyright:
     + Update FSF address.
     + Alter common-licenses reference to GPL-2.
   * debian/control:
     + Bump Standards-Version to 3.7.3.
     + Add Homepage: field.


Regards,

-- 
Chris Lamb, UK                                       chris@chris-lamb.co.uk
                                                            GPG: 0x634F9A20
diff -Nru oleo-1.99.16/configure oleo-1.99.16/configure
--- oleo-1.99.16/configure	2001-03-10 14:32:48.000000000 +0000
+++ oleo-1.99.16/configure	2008-04-25 03:11:17.000000000 +0100
@@ -6445,7 +6445,7 @@
       mktime_test ((time_t) 60 * 60);
       mktime_test ((time_t) 60 * 60 * 24);
 
-      for (j = 1; 0 < j; j *= 2)
+      for (j = 1; 0 < j; j <<= 1)
         bigtime_test (j);
       bigtime_test (j - 1);
     }
diff -Nru oleo-1.99.16/debian/changelog oleo-1.99.16/debian/changelog
--- oleo-1.99.16/debian/changelog	2008-04-25 03:11:16.000000000 +0100
+++ oleo-1.99.16/debian/changelog	2008-04-25 03:11:17.000000000 +0100
@@ -1,3 +1,18 @@
+oleo (1.99.16-11) unstable; urgency=medium
+
+  * QA upload.
+  * Fix FTBFS with GCC 4.3. (Closes: #425544)
+  * Call update-menus in postinst and postrm.
+  * Remove minimum version in versioned dependency on libncurses5-dev.
+  * debian/copyright:
+    + Update FSF address.
+    + Alter common-licenses reference to GPL-2.
+  * debian/control:
+    + Bump Standards-Version to 3.7.3.
+    + Add Homepage: field.
+
+ -- Chris Lamb <chris@chris-lamb.co.uk>  Fri, 25 Apr 2008 02:45:12 +0100
+
 oleo (1.99.16-10) unstable; urgency=low
 
   * QA upload.
diff -Nru oleo-1.99.16/debian/control oleo-1.99.16/debian/control
--- oleo-1.99.16/debian/control	2008-04-25 03:11:16.000000000 +0100
+++ oleo-1.99.16/debian/control	2008-04-25 03:11:17.000000000 +0100
@@ -2,8 +2,9 @@
 Section: math
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Standards-Version: 3.5.9
-Build-Depends: libgsl0-dev, libmysqlclient-dev, libncurses5-dev (>= 5.2.20010310-1), libplot-dev, libxdb-dev, libx11-dev, libxpm-dev, libxt-dev, x-dev, bison|byacc
+Standards-Version: 3.7.3
+Build-Depends: libgsl0-dev, libmysqlclient-dev, libncurses5-dev, libplot-dev, libxdb-dev, libx11-dev, libxpm-dev, libxt-dev, x-dev, bison|byacc
+Homepage: http://www.gnu.org/software/oleo/
 
 Package: oleo
 Architecture: any
diff -Nru oleo-1.99.16/debian/copyright oleo-1.99.16/debian/copyright
--- oleo-1.99.16/debian/copyright	2008-04-25 03:11:16.000000000 +0100
+++ oleo-1.99.16/debian/copyright	2008-04-25 03:11:17.000000000 +0100
@@ -25,8 +25,8 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru oleo-1.99.16/debian/postinst oleo-1.99.16/debian/postinst
--- oleo-1.99.16/debian/postinst	2008-04-25 03:11:16.000000000 +0100
+++ oleo-1.99.16/debian/postinst	2008-04-25 03:11:17.000000000 +0100
@@ -11,5 +11,6 @@
         if command -v install-docs >/dev/null 2>&1; then
 	    install-docs -i /usr/share/doc-base/oleo
 	fi
+	if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
     ;;
 esac
diff -Nru oleo-1.99.16/debian/postrm oleo-1.99.16/debian/postrm
--- oleo-1.99.16/debian/postrm	1970-01-01 01:00:00.000000000 +0100
+++ oleo-1.99.16/debian/postrm	2008-04-25 03:11:17.000000000 +0100
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
diff -Nru oleo-1.99.16/debian/rules oleo-1.99.16/debian/rules
--- oleo-1.99.16/debian/rules	2008-04-25 03:11:16.000000000 +0100
+++ oleo-1.99.16/debian/rules	2008-04-25 03:11:17.000000000 +0100
@@ -36,7 +36,7 @@
 clean:
 	$(checkdir)
 	-rm -f build
-	-$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean
+	[ -f Makefile ] && $(MAKE) -i distclean
 	-rm -rf *~ debian/tmp debian/*~ debian/files*
 
 binary-indep:	checkroot build
@@ -54,6 +54,7 @@
 	install -d debian/tmp/usr/lib/menu
 	install debian/postinst debian/tmp/DEBIAN/.
 	install debian/prerm debian/tmp/DEBIAN/.
+	install debian/postrm debian/tmp/DEBIAN/.
 	install -d debian/tmp/usr/share/doc-base
 	install -m 0644 debian/doc-base debian/tmp/usr/share/doc-base/oleo
 	$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
diff -Nru oleo-1.99.16/debian/substvars oleo-1.99.16/debian/substvars
--- oleo-1.99.16/debian/substvars	2008-04-25 03:11:16.000000000 +0100
+++ oleo-1.99.16/debian/substvars	2008-04-25 03:11:17.000000000 +0100
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.5-5), libgcc1 (>= 1:4.2-20070516), libncurses5 (>= 5.4-5), libplot2c2, libstdc++6 (>= 4.2-20070516), libxdb1
+shlibs:Depends=libc6 (>= 2.7-1), libcupsys2 (>= 1.3.4), libgcc1 (>= 1:4.1.1-21), libncurses5 (>= 5.6+20071006-3), libplot2c2, libstdc++6 (>= 4.1.1-21), libxdb1

Attachment: signature.asc
Description: PGP signature


Reply to: