[Pkg-gtkpod-devel] r230 - libgpod/trunk/debian

[djpig at alioth.debian.org]

Author: djpig
Date: 2007-07-17 16:35:13 +0000 (Tue, 17 Jul 2007)
New Revision: 230

Modified:
   libgpod/trunk/debian/control
   libgpod/trunk/debian/rules
Log:
More debian/rules fixes:
 * Also build binary-indep packages
 * Don't get suddenly too strict about shlibs versions
 * Add missing call to dh_installexamples


Modified: libgpod/trunk/debian/control
===================================================================
--- libgpod/trunk/debian/control	2007-07-17 15:31:17 UTC (rev 229)
+++ libgpod/trunk/debian/control	2007-07-17 16:35:13 UTC (rev 230)
@@ -3,7 +3,7 @@
 Section: libs
 Maintainer: gtkpod Maintainers <pkg-gtkpod-devel at lists.alioth.debian.org>
 Uploaders: Frank Lichtenheld <djpig at debian.org>, Nico Golde <nion at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, cdbs, libglib2.0-dev (>= 2.4), libgtk2.0-dev, intltool, pkg-config, swig, python (>= 2.3.5-7), python-all-dev, python-central (>= 0.5), python-mutagen
+Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, libglib2.0-dev (>= 2.4), libgtk2.0-dev, intltool, pkg-config, swig, python (>= 2.3.5-7), python-all-dev, python-central (>= 0.5), python-mutagen
 Standards-Version: 3.7.2
 XS-Python-Version: all
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-gtkpod/libgpod/trunk/

Modified: libgpod/trunk/debian/rules
===================================================================
--- libgpod/trunk/debian/rules	2007-07-17 15:31:17 UTC (rev 229)
+++ libgpod/trunk/debian/rules	2007-07-17 16:35:13 UTC (rev 230)
@@ -2,7 +2,7 @@
 
 
 SONAME=2
-VERSION=$(shell head -1 debian/changelog | sed 's/.*(//;s/).*//;s/-[^-]*$$//')
+VERSION=
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
@@ -69,27 +69,42 @@
 binary-arch: build-stamp install-stamp
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
+	dh_installchangelogs -a ChangeLog
+	dh_installdocs -a -A AUTHORS README
+	dh_installexamples -a
 	sed 's#debian/tmp/##' debian/libgpod$(SONAME).install > debian/libgpod$(SONAME)-nogtk.install
 	sed 's#debian/tmp/##' debian/libgpod-dev.install > debian/libgpod-nogtk-dev.install
 	dh_install -Nlibgpod$(SONAME)-nogtk -Nlibgpod-nogtk-dev
 	dh_install -plibgpod$(SONAME)-nogtk -plibgpod-nogtk-dev  --sourcedir=debian/tmp-nogtk
 	dh_pycentral -ppython-gpod
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -plibgpod$(SONAME) -V
-	dh_makeshlibs -plibgpod$(SONAME)-nogtk -V 'libgpod$(SONAME)-nogtk (>= $(VERSION)) | libgpod$(SONAME) (>= $(VERSION))'
-	dh_shlibdeps -Llibgpod$(SONAME)
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -plibgpod$(SONAME) -V 'libgpod$(SONAME)$(VERSION)'
+	dh_makeshlibs -plibgpod$(SONAME)-nogtk -V 'libgpod$(SONAME)-nogtk$(VERSION) | libgpod$(SONAME)$(VERSION)'
+	dh_shlibdeps -a -Llibgpod$(SONAME)
+	dh_installdeb -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
-binary: binary-arch binary-indep
 binary-indep:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i ChangeLog
+	dh_installdocs -i -A AUTHORS README
+	dh_installexamples -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
+binary: binary-arch binary-indep
+
+
 .PHONY: build binary-arch binary-indep binary