Hi!
I would like you to consider a freeze exception for an RC bug fix in
gstm. The version fixing the bug has not yet been uploaded, so the
debdiff is attached (there are extra non-RC changes due to the fact
that a new version has already been uploaded to unstable).
Here is the changelog:
gstm (1.2-6) UNRELEASED; urgency=low
* fix implicit pointer conversions (Closes: #504657)
- use quilt
* use dh_clean to remove the generated man pages
gstm (1.2-5) unstable; urgency=low
* New maintainer (Closes: #501940)
- Added Vcs-{Git,Browser} fields
* Changed menu section
* Fix capitalization of GNOME in descriptions
* Don't ignore make errors
* Upgraded to debian policy version 3.8.0
- parallel support in DEB_BUILD_OPTIONS
- Use homepage field
* use help2man to make man pages
* fix short description
Thanks!
Ryan
--
_________________________
Ryan Niebur
ryanryan52@gmail.com
diff -u gstm-1.2/debian/control gstm-1.2/debian/control
--- gstm-1.2/debian/control
+++ gstm-1.2/debian/control
@@ -4,14 +4,15 @@
-Maintainer: Thierry Randrianiriana <randrianiriana@gmail.com>
-Build-Depends: debhelper (>= 4), autotools-dev, libgnomeui-dev (>= 2.10.0), gettext
-Standards-Version: 3.7.2
+Maintainer: Ryan Niebur <ryanryan52@gmail.com>
+Build-Depends: debhelper (>= 4), autotools-dev, libgnomeui-dev (>= 2.10.0), gettext, help2man, quilt
+Homepage: http://gstm.sourceforge.net/
+Vcs-Browser: http://git.ryan52.info/?p=gstm;a=summary
+Vcs-Git: git://git.ryan52.info/git/gstm/
+Standards-Version: 3.8.0
Package: gstm
Architecture: any
Depends: ssh-client, ${shlibs:Depends}, ${misc:Depends}
Suggests: ssh-server
-Description: Gnome SSH Tunnel Manager
- Gnome Secure shell Tunnel Manager is a front-end to manage secure shell
+Description: SSH tunnel manager for GNOME
+ GNOME Secure shell Tunnel Manager is a front-end to manage secure shell
tunneled port redirects. A port redirect is when you use secure shell to
tunnel from your machine through another machine.
- .
- Homepage: http://gstm.sourceforge.net/
diff -u gstm-1.2/debian/rules gstm-1.2/debian/rules
--- gstm-1.2/debian/rules
+++ gstm-1.2/debian/rules
@@ -4,20 +4,26 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
# C compiler information
CFLAGS = -Wall -g
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-config.status: configure
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+config.status: configure $(QUILT_STAMPFN)
dh_testdir
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
@@ -29,14 +35,16 @@
$(MAKE)
+ help2man ./src/gstm -o debian/gstm.1 -n "GNOME SSH Tunnel Manager"
+ help2man ./gAskpass/gaskpass -o debian/gaskpass.1 -n "Asks for a password"
+
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
-
- -$(MAKE) distclean
- dh_clean
+ [ ! -f Makefile ] || $(MAKE) distclean
+ dh_clean debian/gaskpass.1 debian/gstm.1
install: build
dh_testdir
@@ -58,6 +66,7 @@
dh_installchangelogs ChangeLog
dh_installdocs
dh_installmenu
+ dh_installman
dh_strip
dh_compress
dh_fixperms
diff -u gstm-1.2/debian/changelog gstm-1.2/debian/changelog
--- gstm-1.2/debian/changelog
+++ gstm-1.2/debian/changelog
@@ -1,3 +1,26 @@
+gstm (1.2-6) UNRELEASED; urgency=low
+
+ * fix implicit pointer conversions (Closes: #504657)
+ - use quilt
+ * use dh_clean to remove the generated man pages
+
+ -- Ryan Niebur <ryanryan52@gmail.com> Thu, 06 Nov 2008 20:47:30 -0800
+
+gstm (1.2-5) unstable; urgency=low
+
+ * New maintainer (Closes: #501940)
+ - Added Vcs-{Git,Browser} fields
+ * Changed menu section
+ * Fix capitalization of GNOME in descriptions
+ * Don't ignore make errors
+ * Upgraded to debian policy version 3.8.0
+ - parallel support in DEB_BUILD_OPTIONS
+ - Use homepage field
+ * use help2man to make man pages
+ * fix short description
+
+ -- Ryan Niebur <ryanryan52@gmail.com> Tue, 04 Nov 2008 23:16:49 -0800
+
gstm (1.2-4) unstable; urgency=low
* debian/control: changed openssh-server to ssh-server
diff -u gstm-1.2/debian/menu gstm-1.2/debian/menu
--- gstm-1.2/debian/menu
+++ gstm-1.2/debian/menu
@@ -1,6 +1,6 @@
?package(gstm):\
needs="X11" \
- section="Apps/System" \
+ section="Applications/Network/Communication" \
title="GNOME SSH Tunnel Manager" \
longtitle="gSTM: GNOME SSH Tunnel Manager" \
command="gstm"
only in patch2:
unchanged:
--- gstm-1.2.orig/debian/manpages
+++ gstm-1.2/debian/manpages
@@ -0,0 +1,2 @@
+debian/gstm.1
+debian/gaskpass.1
only in patch2:
unchanged:
--- gstm-1.2.orig/debian/patches/series
+++ gstm-1.2/debian/patches/series
@@ -0,0 +1 @@
+fix-implicit-pointer-conversions
only in patch2:
unchanged:
--- gstm-1.2.orig/debian/patches/fix-implicit-pointer-conversions
+++ gstm-1.2/debian/patches/fix-implicit-pointer-conversions
@@ -0,0 +1,21 @@
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -13,6 +13,7 @@
+ #include "conffile.h"
+
+ extern void gstm_quit(void);
++extern char *gstm_name2filename(char *n);
+ extern void docklet_x11_create(void);
+ extern void docklet_x11_position_menu(GtkMenu *menu, int *x, int *y, gboolean *push_in, gpointer user_data);
+
+--- a/src/notarea.c
++++ b/src/notarea.c
+@@ -34,6 +34,8 @@
+ #include "eggtrayicon.h"
+ EggTrayIcon *docklet = NULL;
+ static GtkWidget *image = NULL;
++extern GdkPixbuf *create_pixbuf(const gchar *filename);
++
+ extern void docklet_clicked(int);
+
+ static void docklet_x11_destroyed_cb(GtkWidget *widget, void *data);
Attachment:
signature.asc
Description: Digital signature