Bug#595165: unblock: gip/1.7.0-1-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
Hello,
I'd be glad if you could unblock gip/1.7.0-1-2.
The upload would fix these bugs: 576416 (and LP: #565187)
I have attached the relevant debdiff of the changes made to the
package. Below is its changelog:
----------------------8<-----------------------------8<----------------------
gip (1.7.0-1-2) unstable; urgency=low
* debian/control:
- Bumped Standards-Version to 3.9.1.
- Added Vcs-Svn and Vcs-Browser as the package has been added on
collab-maint/ext-main.
* debian/patches:
- Added 40-init_lock_events.diff: to initialize the lock_events variable
to FALSE as it was not initialized. (Closes: #576416)
Thank you Frank Dean <frank-lists@smartpixie.com> for providing the patch.
- 20-build-sh.diff: updated the patch to correct linking paths (LP: #565187)
* Converted the package to "3.0 (quilt)" source format.
----------------------8<-----------------------------8<----------------------
unblock gip/1.7.0-1-2
Thank you for your consideration,
Ignace M
diff -Nru gip-1.7.0-1/debian/changelog gip-1.7.0-1/debian/changelog
--- gip-1.7.0-1/debian/changelog 2010-09-01 16:37:21.000000000 +0200
+++ gip-1.7.0-1/debian/changelog 2010-09-01 01:16:20.000000000 +0200
@@ -1,3 +1,18 @@
+gip (1.7.0-1-2) unstable; urgency=low
+
+ * debian/control:
+ - Bumped Standards-Version to 3.9.1.
+ - Added Vcs-Svn and Vcs-Browser as the package has been added on
+ collab-maint/ext-main.
+ * debian/patches:
+ - Added 40-init_lock_events.diff: to initialize the lock_events variable
+ to FALSE as it was not initialized. (Closes: #576416)
+ Thank you Frank Dean <frank-lists@smartpixie.com> for providing the patch.
+ - 20-build-sh.diff: updated the patch to correct linking paths (LP: #565187)
+ * Converted the package to "3.0 (quilt)" source format.
+
+ -- Ignace Mouzannar <mouzannar@gmail.com> Wed, 01 Sep 2010 00:58:07 +0200
+
gip (1.7.0-1-1) unstable; urgency=low
* New maintainer. (Closes: #547045)
diff -Nru gip-1.7.0-1/debian/control gip-1.7.0-1/debian/control
--- gip-1.7.0-1/debian/control 2010-09-01 16:37:21.000000000 +0200
+++ gip-1.7.0-1/debian/control 2010-09-01 01:15:22.000000000 +0200
@@ -3,7 +3,9 @@
Priority: optional
Maintainer: Ignace Mouzannar <mouzannar@gmail.com>
Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7), intltool, libgtkmm-2.4-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/collab-maint/ext-maint/gip/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/ext-maint/gip/trunk/
Homepage: http://code.google.com/p/gip/
Package: gip
diff -Nru gip-1.7.0-1/debian/patches/20-build-sh.diff gip-1.7.0-1/debian/patches/20-build-sh.diff
--- gip-1.7.0-1/debian/patches/20-build-sh.diff 2010-09-01 16:37:21.000000000 +0200
+++ gip-1.7.0-1/debian/patches/20-build-sh.diff 2010-09-01 00:58:00.000000000 +0200
@@ -2,12 +2,14 @@
- Corrects installation path in the build.sh file
- Removes uselessly linked libraries in the LFLAGS variable, as none of
their symbols are used.
+ - Corrects linking paths (used to include the debian/gip/ build directory).
+ (LP: #565187)
Author: Ignace Mouzannar <mouzannar@gmail.com>
-Last-Update: 2009-10-02
+Last-Update: 2010-09-01
--- a/build.sh
+++ b/build.sh
-@@ -153,15 +153,14 @@
+@@ -153,21 +153,20 @@
INST_BINDIR="$INST_PREFIX/bin/"
INST_LIBDIR="$INST_PREFIX/lib/$EXECUTABLE"
INST_LOCALEDIR="$INST_PREFIX/share/locale"
@@ -27,7 +29,17 @@
+INST_ICON_HIGHRES="$INST_ICON/48x48/apps"
# Preprocessor macros:
- MACROS="PACKAGE_LIB_DIR=$INST_LIBDIR/\
+-MACROS="PACKAGE_LIB_DIR=$INST_LIBDIR/\
+-:PACKAGE_PIXMAPS_DIR=$INST_PIXMAPDIR/\
+-:PACKAGE_LOCALE_DIR=$INST_LOCALEDIR/\
+-:PACKAGE_DOC_DIR=$INST_DOCDIR/\
++MACROS="PACKAGE_LIB_DIR=`echo $INST_LIBDIR |sed \"s/.*debian\/$EXECUTABLE//\"`/\
++:PACKAGE_PIXMAPS_DIR=`echo $INST_PIXMAPDIR |sed \"s/.*debian\/$EXECUTABLE//\"`/\
++:PACKAGE_LOCALE_DIR=`echo $INST_LOCALEDIR |sed \"s/.*debian\/$EXECUTABLE//\"`/\
++:PACKAGE_DOC_DIR=`echo $INST_DOCDIR |sed \"s/.*debian\/$EXECUTABLE//\"`/\
+ :VERSION=$VERSION\
+ :SUBVERSION=$TAGVERSION\
+ :GETTEXTPACKAGE=$EXECUTABLE\
@@ -250,7 +249,8 @@
###############################################################################
# Compiler/Linker options.
diff -Nru gip-1.7.0-1/debian/patches/40-init_lock_events.diff gip-1.7.0-1/debian/patches/40-init_lock_events.diff
--- gip-1.7.0-1/debian/patches/40-init_lock_events.diff 1970-01-01 01:00:00.000000000 +0100
+++ gip-1.7.0-1/debian/patches/40-init_lock_events.diff 2010-09-01 00:27:35.000000000 +0200
@@ -0,0 +1,51 @@
+Description: Add initialization (to FALSE) of the lock_events variable
+Author: Frank Dean <frank-lists@smartpixie.com>
+Last-Update: 04-04-2010
+--- a/src/gui_ipv4_analyzer.cc
++++ b/src/gui_ipv4_analyzer.cc
+@@ -28,7 +28,7 @@
+ /******************************************************************************
+ * Constructor/Destructor
+ ******************************************************************************/
+-GUIIPv4Analyzer::GUIIPv4Analyzer()
++GUIIPv4Analyzer::GUIIPv4Analyzer() : lock_events(FALSE)
+ {
+ #ifdef _DEBUG_
+ printf("GUIIPv4Analyzer::GUIIPv4Analyzer(): Called.\n");
+--- a/src/gui_ipv4_subnet_calculator.cc
++++ b/src/gui_ipv4_subnet_calculator.cc
+@@ -30,7 +30,8 @@
+ ******************************************************************************/
+ GUIIPv4SubnetCalculator::GUIIPv4SubnetCalculator()
+ : label_range(_("Address range:")),
+- label_dash("-")
++ label_dash("-"),
++ lock_events(FALSE)
+ {
+ resize(2, 4);
+ set_border_width(6);
+--- a/src/gui_ipv4_subnet_splitter.cc
++++ b/src/gui_ipv4_subnet_splitter.cc
+@@ -32,7 +32,8 @@
+ : label_range(_("Address range:"), 0, 0.5),
+ label_dash("-"),
+ label_pfxlen(_("Subnetted using prefixlength:"), 0, 0.5),
+- label_maxmatch(_("Showing a maximum of 1000 subnets."), 1, 0.5)
++ label_maxmatch(_("Showing a maximum of 1000 subnets."), 1, 0.5),
++ lock_events(FALSE)
+ {
+ resize(4, 4);
+ set_border_width(6);
+--- a/po/gen.sh
++++ b/po/gen.sh
+@@ -18,8 +18,7 @@
+ echo GETTEXT_PACKAGE=gip > ../configure.ac || exit 1
+ touch POTFILES.in || exit 1
+ intltool-update -m || exit 1
+-if [ -e missing ]; then
+- mv missing POTFILES.in || exit 1
+-fi
++
++rm -f missing
+
+ rm ../configure.ac
diff -Nru gip-1.7.0-1/debian/patches/series gip-1.7.0-1/debian/patches/series
--- gip-1.7.0-1/debian/patches/series 2010-09-01 16:37:21.000000000 +0200
+++ gip-1.7.0-1/debian/patches/series 2010-09-01 00:10:45.000000000 +0200
@@ -1,3 +1,4 @@
10-gen-sh.diff
20-build-sh.diff
30-gip-desktop.diff
+40-init_lock_events.diff
diff -Nru gip-1.7.0-1/debian/source/format gip-1.7.0-1/debian/source/format
--- gip-1.7.0-1/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ gip-1.7.0-1/debian/source/format 2010-08-31 22:30:35.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
Reply to: