Package: gbase
Version: 0.5-2.1
Severity: normal
Hi,
Attached is a debdiff of the changes I made for my -2.2 NMU. Apologies
for the intrusive NMU but this package hasn't seen an update in a while.
Thank you,
Barry deFreese
Debian QA
diff -u gbase-0.5/debian/menu gbase-0.5/debian/menu
--- gbase-0.5/debian/menu
+++ gbase-0.5/debian/menu
@@ -1 +1 @@
-?package(gbase): needs=X11 section=Apps/Math title="GBase" command="gbase"
+?package(gbase): needs="X11" section="Applications/Science/Mathematics"
title="GBase" command="gbase"
diff -u gbase-0.5/debian/changelog gbase-0.5/debian/changelog
--- gbase-0.5/debian/changelog
+++ gbase-0.5/debian/changelog
@@ -1,3 +1,21 @@
+gbase (0.5-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build with Gtk2. (Closes: #438405).
+ * Don't segfault on command line args. (Closes: #282651).
+ + Thanks to Elmar Hoffmann.
+ * Add ${misc:Depends} for debhelper package.
+ * Quote strings in menu file.
+ * Escape hyphen used as minus in manpage.
+ * Add watch file.
+ * Bump debhelper build dep to 5.
+ * Move DH_COMPAT to debian/compat and set to 5.
+ + Handles nostrip properly. (Closes: #436906).
+ * Bump Standards Version to 3.8.0.
+ + Menu policy transition.
+
+ -- Barry deFreese <[email protected]> Mon, 23 Feb 2009 16:51:00 -0500
+
gbase (0.5-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u gbase-0.5/debian/control gbase-0.5/debian/control
--- gbase-0.5/debian/control
+++ gbase-0.5/debian/control
@@ -2,12 +2,13 @@
Section: math
Priority: optional
Maintainer: Josip Rodin <[email protected]>
-Build-Depends: debhelper (>= 2), libgtk1.2-dev, libglib1.2-dev
-Standards-Version: 3.6.0
+Build-Depends: debhelper (>= 5), libgtk2.0-dev, libglib2.0-dev
+Standards-Version: 3.8.0
+Homepage: http://www.hibernaculum.net/gbase/index.php
Package: gbase
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: small numeric base converter
This simple program converts numbers between bases 2 (binary),
8 (octal), 10 (decimal) and 16 (hexadecimal).
diff -u gbase-0.5/debian/rules gbase-0.5/debian/rules
--- gbase-0.5/debian/rules
+++ gbase-0.5/debian/rules
@@ -1,9 +1,6 @@
#!/usr/bin/make -f
-#export DH_VERBOSE=1
-export DH_COMPAT=2
-
-CFLAGS := -g -Wall $(shell gtk-config --cflags)
+CFLAGS := -g -Wall $(shell pkg-config --cflags gtk+-2.0)
ifneq "$(findstring noopt,$(DEB_BUILD_OPTIONS))" ""
CFLAGS += -O0
else
diff -u gbase-0.5/debian/gbase.1 gbase-0.5/debian/gbase.1
--- gbase-0.5/debian/gbase.1
+++ gbase-0.5/debian/gbase.1
@@ -12,7 +12,7 @@
to describe the base the number is in) the program will display that
number in the four bases on the console and exit.
.br
-You can also specify the -s switch which will allow you to enter/display
+You can also specify the \-s switch which will allow you to enter/display
signed numbers. (This allows the use of a - (minus) before a decimal number).
.PP
Just running the program without any switches will display the main
only in patch2:
unchanged:
--- gbase-0.5.orig/Makefile
+++ gbase-0.5/Makefile
@@ -1,6 +1,6 @@
CC = gcc
-CCFLAGS = `gtk-config --cflags`
-LDFLAGS = `gtk-config --libs`
+CCFLAGS = `pkg-config --cflags gtk+-2.0`
+LDFLAGS = `pkg-config --libs gtk+-2.0`
gbase: gbase.o
$(CC) gbase.o $(LDFLAGS) -o gbase
@@ -12,4 +12,4 @@
%.o:
$(CC) $(CCFLAGS) -c $*.c
-gbase.o: gbase.c
\ No newline at end of file
+gbase.o: gbase.c
only in patch2:
unchanged:
--- gbase-0.5.orig/gbase.c
+++ gbase-0.5/gbase.c
@@ -377,7 +377,7 @@
else
usage();
- if(i == argc)
+ if(i+1 == argc)
usage();
only in patch2:
unchanged:
--- gbase-0.5.orig/debian/watch
+++ gbase-0.5/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+http://www.hibernaculum.net/gbase/index.php \/download\/gbase-([\d.]+)\.tar\.gz
only in patch2:
unchanged:
--- gbase-0.5.orig/debian/compat
+++ gbase-0.5/debian/compat
@@ -0,0 +1 @@
+5
