[Forensics-changes] [SCM] debian-forensics/guymager branch, debian, updated. debian/0.5.9-1-4-g34d0617

Julien Valroff julien at kirya.net
Sat Jan 7 14:59:31 UTC 2012


The following commit has been merged in the debian branch:
commit 34d0617f24d162bb9c525d4c23802da2f950d8db
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Jan 7 15:57:22 2012 +0100

    Switch to 3.0 (quilt) package format

diff --git a/debian/changelog b/debian/changelog
index 2b782b1..d095b13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,10 @@ guymager (0.5.9-2) unstable; urgency=low
 
   * Team upload.
   * Fix FTBFS by linking to libproc-ng rather than libproc (Closes: #652170)
-  * Add source format
+  * Switch to 3.0 (quilt) source package format
   * Bump debhelper compat to 8
 
- -- Julien Valroff <julien at debian.org>  Sat, 07 Jan 2012 15:48:39 +0100
+ -- Julien Valroff <julien at debian.org>  Sat, 07 Jan 2012 15:56:56 +0100
 
 guymager (0.5.9-1) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 8bee6c6..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_do-not-statically-compile-against-libs.dpatch
diff --git a/debian/patches/01_do-not-statically-compile-against-libs.dpatch b/debian/patches/01_do-not-statically-compile-against-libs.diff
similarity index 74%
rename from debian/patches/01_do-not-statically-compile-against-libs.dpatch
rename to debian/patches/01_do-not-statically-compile-against-libs.diff
index 4f240d9..12764c8 100755
--- a/debian/patches/01_do-not-statically-compile-against-libs.dpatch
+++ b/debian/patches/01_do-not-statically-compile-against-libs.diff
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## do-not-statically-compile-against-libs.dpatch by Michael Prokop <mika at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: do not statically compile against libewf and libguytools
+Description: disable statically linking
+Author: Mickael Prokop <mika at debian.org>
+Last-Updated: 2012-01-07
 
- at DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' guymager~/guymager.pro guymager/guymager.pro
 --- guymager~/guymager.pro	2012-01-07 15:20:44.000000000 +0100
 +++ guymager/guymager.pro	2012-01-07 15:39:26.808021108 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ccdc92d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_do-not-statically-compile-against-libs.diff
diff --git a/debian/rules b/debian/rules
index c15189f..cd713d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-	dpatch cat-all >patch-stamp
-
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
 configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
 	dh_testdir
 	qmake-qt4 DEFINES+="SPLASH_DIR=\'\\\"/usr/share/guymager\\\"\' LANGUAGE_DIR=\'\\\"/usr/share/guymager\\\"\' LANGUAGE_DIR_QT=\'\\\"/usr/share/qt4/translations\\\"\'"
 	touch configure-stamp
@@ -33,7 +19,7 @@ build-stamp: configure-stamp
 	cd manuals  && ./rebuild.sh && cd -
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)

-- 
debian-forensics/guymager



More information about the forensics-changes mailing list