[Pkg-maemo-commits] r79 ./hildon-1/debian: Add myself as uploader

[Riku Voipio]

------------------------------------------------------------
revno: 79
committer: Riku Voipio <riku.voipio at iki.fi>
branch nick: debian
timestamp: Thu 2007-12-27 22:59:05 +0200
message:
  Add myself as uploader
  Fix conflict
  Fix dh_makeshlibs call
  Update Standard-Version
  Make binNMU safe
  Fix lintian errors
modified:
  debian/control
  debian/rules
-------------- next part --------------
=== modified file 'debian/control'
--- a/debian/control	2007-12-27 09:14:43 +0000
+++ b/debian/control	2007-12-27 20:59:05 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Maemo Maintainers <pkg-maemo-maintainers at lists.alioth.debian.org>
 XSBC-Original-Maintainer: Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>
-Uploaders: Loic Minier <lool at dooz.org>, Jonny Lamb <jonnylamb at jonnylamb.com>
+Uploaders: Loic Minier <lool at dooz.org>, Jonny Lamb <jonnylamb at jonnylamb.com>, Riku Voipio <riku.voipio at iki.fi>
 Build-Depends: debhelper (>= 5.0.0),
                pkg-config,
                libgtk2.0-dev (>= 2.10),
@@ -15,13 +15,12 @@
                libesd0-dev,
                libglib2.0-doc,
                automake
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: libhildon-1-dev
-Section: devel
+Section: libdevel
 Architecture: any
-<<<<<<< TREE
-Depends: libhildon-1-0 (= ${Source-Version}),
+Depends: libhildon-1-0 (= ${binary:Version}),
          ${misc:Depends},
          libgtk2.0-dev (>= 2.10),
          libgconf2-dev,
@@ -34,10 +33,6 @@
  .
  This package contains the development files, needed to
  develop tools using this library.
-=======
-Depends: libhildon1 (= ${Source-Version}), libgtk2.0-dev (>= 2.10.12-0osso16), libesd0-dev | osso-esd-dev, libgconf2-dev
-Description: Hildon libraries development files
->>>>>>> MERGE-SOURCE
 
 Package: libhildon-1-0
 Section: libs
@@ -55,8 +50,9 @@
 
 Package: libhildon-1-0-dbg
 Section: libdevel
+Priority: extra
 Architecture: any
-Depends: libhildon-1-0 (= ${Source-Version}),
+Depends: libhildon-1-0 (= ${binary:Version}),
          ${misc:Depends}
 Description: Hildon libraries - detached debug symbols
  Hildon is the widget library for maemo. It contains a

=== modified file 'debian/rules'
--- a/debian/rules	2007-09-21 16:52:39 +0000
+++ b/debian/rules	2007-12-27 20:59:05 +0000
@@ -125,7 +125,7 @@
 	dh_strip --dbg-package="libhildon-1-0-dbg"
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -V "libhildon1 (>= 1.0.11)" 
+	dh_makeshlibs -V "libhildon-1-0 (>= 1.99)"
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol