rev 15944 - trunk/packages/wv2/debian

[Pino Toscano]

Author: pino-guest
Date: 2009-09-18 14:35:12 +0000 (Fri, 18 Sep 2009)
New Revision: 15944

Added:
   trunk/packages/wv2/debian/libwv2-3.install
   trunk/packages/wv2/debian/libwv2-3.shlibs
   trunk/packages/wv2/debian/libwv2-dev.install
Removed:
   trunk/packages/wv2/debian/libwv2-2.files
   trunk/packages/wv2/debian/libwv2-2.shlibs
   trunk/packages/wv2/debian/libwv2-dev.files
Modified:
   trunk/packages/wv2/debian/changelog
   trunk/packages/wv2/debian/compat
   trunk/packages/wv2/debian/control
   trunk/packages/wv2/debian/rules
Log:
switch to dh, and bump debhelper requirements & compatibility to 7
complete the soname bump


Modified: trunk/packages/wv2/debian/changelog
===================================================================
--- trunk/packages/wv2/debian/changelog	2009-09-18 14:29:43 UTC (rev 15943)
+++ trunk/packages/wv2/debian/changelog	2009-09-18 14:35:12 UTC (rev 15944)
@@ -5,8 +5,9 @@
   +++ Changes by Pino Toscano:
 
   * Bump SONAME.
+  * Switch to dh, and bump debhelper requirements & compatibility to 7.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Fri, 18 Sep 2009 16:28:19 +0200
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Fri, 18 Sep 2009 16:33:33 +0200
 
 wv2 (0.3.1.dfsg-1) unstable; urgency=low
 

Modified: trunk/packages/wv2/debian/compat
===================================================================
--- trunk/packages/wv2/debian/compat	2009-09-18 14:29:43 UTC (rev 15943)
+++ trunk/packages/wv2/debian/compat	2009-09-18 14:35:12 UTC (rev 15944)
@@ -1 +1 @@
-6
+7

Modified: trunk/packages/wv2/debian/control
===================================================================
--- trunk/packages/wv2/debian/control	2009-09-18 14:29:43 UTC (rev 15943)
+++ trunk/packages/wv2/debian/control	2009-09-18 14:35:12 UTC (rev 15944)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>
-Build-Depends: debhelper (>= 6), libglib2.0-dev, libgsf-1-dev (>= 1.14.0), libxml2-dev, zlib1g-dev, pkg-config
+Build-Depends: debhelper (>= 7.3.12), libglib2.0-dev, libgsf-1-dev (>= 1.14.0), libxml2-dev, zlib1g-dev, pkg-config
 Standards-Version: 3.8.2
 Homepage: http://wvware.sourceforge.net
 

Copied: trunk/packages/wv2/debian/libwv2-3.install (from rev 15943, trunk/packages/wv2/debian/libwv2-2.files)
===================================================================
--- trunk/packages/wv2/debian/libwv2-3.install	                        (rev 0)
+++ trunk/packages/wv2/debian/libwv2-3.install	2009-09-18 14:35:12 UTC (rev 15944)
@@ -0,0 +1 @@
+usr/lib/libwv2.so.*

Copied: trunk/packages/wv2/debian/libwv2-3.shlibs (from rev 15943, trunk/packages/wv2/debian/libwv2-2.shlibs)
===================================================================
--- trunk/packages/wv2/debian/libwv2-3.shlibs	                        (rev 0)
+++ trunk/packages/wv2/debian/libwv2-3.shlibs	2009-09-18 14:35:12 UTC (rev 15944)
@@ -0,0 +1 @@
+libwv2 3 libwv2-3

Copied: trunk/packages/wv2/debian/libwv2-dev.install (from rev 15943, trunk/packages/wv2/debian/libwv2-dev.files)
===================================================================
--- trunk/packages/wv2/debian/libwv2-dev.install	                        (rev 0)
+++ trunk/packages/wv2/debian/libwv2-dev.install	2009-09-18 14:35:12 UTC (rev 15944)
@@ -0,0 +1,3 @@
+usr/bin/wv2-config
+usr/include/wv2
+usr/lib/libwv2.so

Modified: trunk/packages/wv2/debian/rules
===================================================================
--- trunk/packages/wv2/debian/rules	2009-09-18 14:29:43 UTC (rev 15943)
+++ trunk/packages/wv2/debian/rules	2009-09-18 14:35:12 UTC (rev 15944)
@@ -3,92 +3,5 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-OPTFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	OPTFLAGS += -O0
-else
-	OPTFLAGS += -O2
-endif
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp: 
-	dh_testdir
-
-	# Add here commands to configure the package.
-	CFLAGS="$(OPTFLAGS)" CXXFLAGS="$(OPTFLAGS)" ./configure \
-	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	--disable-debug \
-	--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp patch-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-	dh_movefiles
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-
-	# Fix up the documentation directory for the -dev package.
-#	rm -rf `find debian/libwv2-dev/usr/share/doc/libwv2-dev/doc \
-#		-name CVS -type d`
-#	rm -f `find debian/libwv2-dev/usr/share/doc/libwv2-dev/doc \
-#		-name .cvsignore -type f`
-#	mv debian/libwv2-dev/usr/share/doc/libwv2-dev/doc \
-#		debian/libwv2-dev/usr/share/doc/libwv2-dev/design
-
-	dh_installexamples
-	dh_installman
-	dh_installmenu
-	dh_installinfo
-	dh_strip
-	dh_link
-	dh_compress -X.css -X.docbook -X.bz2
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh $@