Kartik Mistry <[EMAIL PROTECTED]> (19/09/2007): > Please find attached patch to fix this bug (gip: FTBFS if built twice > in a row).
Hi. Looks like a better solution would be to call ./clean.sh, which I did for my NMU. Please find attached the diff for it, fixing some other issues at the same time. Cheers, -- Cyril Brulebois
reverted:
--- gip-1.6.1.1/clean
+++ gip-1.6.1.1.orig/clean
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Just to be sure...
-if [ ! -e $PWD/clean.sh ]; then
- echo Please enter the Gip package root directory
- echo before starting this script.
- exit 1
-fi
-
-echo Deleting all object files starting from $PWD/...
-find . -name "*.o" -o -name "*.mo" | while read file; do
- rm $file
-done
-
-rm config.h
-
-echo Deleting the Gip binary...
-[ -e gip ] && rm gip
-echo Finished.
diff -u gip-1.6.1.1/debian/gip.menu gip-1.6.1.1/debian/gip.menu
--- gip-1.6.1.1/debian/gip.menu
+++ gip-1.6.1.1/debian/gip.menu
@@ -1,2 +1,2 @@
-?package(gip):needs="X11" section="Apps/Net"\
+?package(gip):needs="X11" section="Applications/Network/Monitoring"\
title="Gip" command="/usr/bin/gip"
diff -u gip-1.6.1.1/debian/rules gip-1.6.1.1/debian/rules
--- gip-1.6.1.1/debian/rules
+++ gip-1.6.1.1/debian/rules
@@ -45,9 +45,9 @@
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) clean
+ ./clean.sh
- dh_clean
+ dh_clean po/gip.pot
install: build
dh_testdir
diff -u gip-1.6.1.1/debian/control gip-1.6.1.1/debian/control
--- gip-1.6.1.1/debian/control
+++ gip-1.6.1.1/debian/control
@@ -2,8 +2,9 @@
Section: gnome
Priority: optional
Maintainer: Khalid El Fathi <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), intltool, libgtkmm-2.4-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), intltool, libgtkmm-2.4-dev
+Standards-Version: 3.7.3
+Homepage: http://www.debain.org/software/gip/
Package: gip
Architecture: any
@@ -19,2 +19,0 @@
- .
- Homepage: http://www.debain.org/software/gip/
diff -u gip-1.6.1.1/debian/compat gip-1.6.1.1/debian/compat
--- gip-1.6.1.1/debian/compat
+++ gip-1.6.1.1/debian/compat
@@ -1 +1 @@
-4
+5
diff -u gip-1.6.1.1/debian/changelog gip-1.6.1.1/debian/changelog
--- gip-1.6.1.1/debian/changelog
+++ gip-1.6.1.1/debian/changelog
@@ -1,3 +1,19 @@
+gip (1.6.1.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix double-build FTBFS by calling “./clean.sh” instead of
+ “-$(MAKE) clean” (Closes: #442574).
+ * Remove unneeded “clean” script.
+ * Remove po/gip.pot through dh_clean in the “clean” target since it's
+ (re)generated during the build. It's now kept out of the Debian diff.
+ * Bump debhelper compatibility from 4 to 5, no changes needed.
+ * Bump Standards-Version from 3.7.2 to 3.7.3, no changes needed.
+ * Move the Homepage from the description to a source field.
+ * Menu transition: Move the menu section from “Apps/Net” to
+ “Applications/Network/Monitoring”.
+
+ -- Cyril Brulebois <[EMAIL PROTECTED]> Tue, 26 Feb 2008 21:13:54 +0100
+
gip (1.6.1.1-1) unstable; urgency=low
* New upstream release.
signature.asc
Description: Digital signature
