[Forensics-changes] [SCM] debian-forensics/libguytools branch, debian, updated. debian/1.1.1-1-3-g2704459

Mon Jun 14 15:59:34 UTC 2010

The following commit has been merged in the debian branch:
commit 27044596fabfca0e6227d8d8f2ec9b834f7e7cb6
Author: Michael Prokop <mika at debian.org>
Date:   Mon Jun 14 17:54:10 2010 +0200

    Adjust debian package for libguytools1->libguytools2.

diff --git a/debian/changelog b/debian/changelog
index 7ec69eb..cdaf77c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,6 @@
-libguytools1 (1.1.1-1) unstable; urgency=low
+libguytools2 (2.0.1-1) unstable; urgency=low
 
-  * Merging upstream version 1.1.1.
+  * Initial release of new libguytools version.
 
- -- Michael Prokop <mika at debian.org>  Fri, 29 Jan 2010 04:31:18 +0100
+ -- Michael Prokop <mika at debian.org>  Mon, 14 Jun 2010 17:12:05 +0200
 
-libguytools1 (1.0.4-2) unstable; urgency=low
-
-  * Add powerpc to list of supported architectures (see #549569).
-  * sysinfo/toolsysinfo.cpp: add #include <stdio> for sprintf. Thanks to
-    Kamal Mostafa for the patch. (Closes: #565859)
-
- -- Michael Prokop <mika at debian.org>  Fri, 29 Jan 2010 03:26:40 +0100
-
-libguytools1 (1.0.4-1) unstable; urgency=low
-
-  * Initial release (Closes: #479016).
-  * Packaging based on work by upstream author Guy Voncken.
-
- -- Michael Prokop <mika at debian.org>  Wed, 19 Aug 2009 11:09:24 +0200
diff --git a/debian/control b/debian/control
index f0a09af..2d5bb0e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,25 @@
-Source: libguytools1
+Source: libguytools2
 Section: libs
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Michael Prokop <mika at debian.org>
 Build-depends: debhelper (>> 5.0.0), libqt4-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/libguytools/
 Vcs-git: git://git.grml.org/libguytools.git
 Vcs-Browser: http://git.grml.org/?p=libguytools.git
 
-Package: libguytools1-dev
+Package: libguytools2-dev
 Section: libdevel
 Architecture: i386 amd64 powerpc
-Depends: libguytools1 (= ${binary:Version})
+Depends: libguytools2 (= ${binary:Version})
 Description: development files for libguytools being a small programming toolbox
  Includes modules for configuration file handling, error handling, logging and
  system information retrieval. A signal handler enables applications to do stack
  backtracing in case of segmentation faults. This package provides the
- development files for libguytools1.
+ development files for libguytools2.
 
-Package: libguytools1
+Package: libguytools2
 Architecture: i386 amd64 powerpc
 Depends: ${shlibs:Depends}
 Description: libguytools is a small programming toolbox
diff --git a/debian/copyright b/debian/copyright
index 6d578de..8c3c3d9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ It was downloaded from http://sourceforge.net/projects/libguytools/
 
 Upstream Author: Guy Voncken <vogu00 at gmail.com>
 
-Copyright: © Copyright 2009++ by Guy Voncken
+Copyright: © Copyright 2009, 2010 by Guy Voncken
 
 License:
 
@@ -27,5 +27,5 @@ On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 The Debian packaging is © 2009 by Guy Voncken <vogu00 at gmail.com>
-and © 2009 by Michael Prokop <mika at debian.org>
+and © 2009, 2010 by Michael Prokop <mika at debian.org>
 and is licensed under the GPL, see above.
diff --git a/debian/libguytools1-dev.dirs b/debian/libguytools1-dev.dirs
deleted file mode 100644
index 15d9d55..0000000
--- a/debian/libguytools1-dev.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/include/libguytools1
diff --git a/debian/libguytools1.links b/debian/libguytools1.links
deleted file mode 100644
index 8ee62c0..0000000
--- a/debian/libguytools1.links
+++ /dev/null
@@ -1,7 +0,0 @@
-# See chapter 8.1 in the Debian Policy Manual
-usr/lib/libguytoolcfg.so.1.1.1     usr/lib/libguytoolcfg.so.1
-usr/lib/libguytoolerror.so.1.1.1   usr/lib/libguytoolerror.so.1
-usr/lib/libguytoollog.so.1.1.1     usr/lib/libguytoollog.so.1
-usr/lib/libguytoolsignal.so.1.1.1  usr/lib/libguytoolsignal.so.1
-usr/lib/libguytoolsysinfo.so.1.1.1 usr/lib/libguytoolsysinfo.so.1
-
diff --git a/debian/libguytools2-dev.dirs b/debian/libguytools2-dev.dirs
new file mode 100644
index 0000000..21d73ae
--- /dev/null
+++ b/debian/libguytools2-dev.dirs
@@ -0,0 +1,3 @@
+usr/lib
+usr/include
+usr/include/libguytools2
diff --git a/debian/libguytools1-dev.install b/debian/libguytools2-dev.install
similarity index 100%
rename from debian/libguytools1-dev.install
rename to debian/libguytools2-dev.install
diff --git a/debian/libguytools1.dirs b/debian/libguytools2.dirs
similarity index 100%
rename from debian/libguytools1.dirs
rename to debian/libguytools2.dirs
diff --git a/debian/libguytools1.install b/debian/libguytools2.install
similarity index 100%
rename from debian/libguytools1.install
rename to debian/libguytools2.install
diff --git a/debian/libguytools2.links b/debian/libguytools2.links
new file mode 100644
index 0000000..068fcd1
--- /dev/null
+++ b/debian/libguytools2.links
@@ -0,0 +1,7 @@
+# See chapter 8.1 in the Debian Policy Manual
+usr/lib/libguytoolcfg.so.2.0.1     usr/lib/libguytoolcfg.so.2
+usr/lib/libguytoolerror.so.2.0.1   usr/lib/libguytoolerror.so.2
+usr/lib/libguytoollog.so.2.0.1     usr/lib/libguytoollog.so.2
+usr/lib/libguytoolsignal.so.2.0.1  usr/lib/libguytoolsignal.so.2
+usr/lib/libguytoolsysinfo.so.2.0.1 usr/lib/libguytoolsysinfo.so.2
+
diff --git a/debian/rules b/debian/rules
index b80d297..9a44ccf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,10 @@
 build: build-stamp
 build-stamp:
 	dh_testdir
-	./alltools makemake
-	./alltools make
+	./create_version_file.sh
+	lrelease tools.pro
+	qmake-qt4 tools.pro
+	$(MAKE)
 	touch build-stamp
 
 clean:
@@ -16,13 +18,13 @@ clean:
 	dh_testroot
 	rm -f build-stamp
 	# dpkg-buildpackage starts with cleaning, so we have to be sure that there's a Makefile (and thus call qmake)
-	./alltools qmake-qt4
-	./alltools clean
+	qmake-qt4 toolsstatic.pro
+	$(MAKE) clean
 	dh_clean
 
 	# remove leftover files:
-	rm -f log/Makefile signal/Makefile cfg/Makefile sysinfo/Makefile error/Makefile
-	rm -f libguytools_version.pro.inc
+	rm -f Makefile libguytools_version.pro.inc lib/libguytools*
+	rmdir lib || true
 
 install: build
 	dh_testdir
@@ -30,9 +32,9 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	mkdir -p debian/tmp/usr/lib debian/tmp/usr/include/libguytools1
+	mkdir -p debian/tmp/usr/lib debian/tmp/usr/include/libguytools2
 	cp -d lib/libguytool* debian/tmp/usr/lib/
-	cp -R include/*       debian/tmp/usr/include/libguytools1
+	cp -R include/*       debian/tmp/usr/include/libguytools2
 
 binary-arch: build install
 	dh_testdir

-- 
debian-forensics/libguytools

