[Pkg-maemo-commits] r344 ./hildon-fm/debian: * Merged with Ubuntu's branch.

[Loïc Minier]

------------------------------------------------------------
revno: 344
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Tue 2007-07-24 10:35:32 +0200
message:
  * Merged with Ubuntu's branch.
  * Revert changes to l10n dependencies; we will use haf-marketing release
    for now
  * Add --copy to auto* calls in autogen.sh
  * Pass --enable-gtk-doc to build documentation.
  * Change dependency on hildon-l10n-mr to hildon-l10n-english to allow
    installation
  * Set Maintainer to Tollef
modified:
  autogen.sh
  debian/changelog
  debian/rules
    ------------------------------------------------------------
    revno: 342.1.1
    merged: tfheen at err.no-20070608111324-hsl12rgzx7wc83cu
    committer: Tollef Fog Heen <tfheen at err.no>
    branch nick: hildon-fm
    timestamp: Fri 2007-06-08 13:13:24 +0200
    message:
      * Add --copy to auto* calls in autogen.sh
    ------------------------------------------------------------
    revno: 342.1.2
    merged: tfheen at err.no-20070608120716-pvgwumy59ub1u0hi
    committer: Tollef Fog Heen <tfheen at err.no>
    branch nick: hildon-fm
    timestamp: Fri 2007-06-08 14:07:16 +0200
    message:
      * Pass --enable-gtk-doc to build documentation.
    ------------------------------------------------------------
    revno: 342.1.3
    merged: tfheen at err.no-20070608121620-3z27qommomv69d4d
    committer: Tollef Fog Heen <tfheen at err.no>
    branch nick: hildon-fm
    timestamp: Fri 2007-06-08 14:16:20 +0200
    message:
      Update my email address
    ------------------------------------------------------------
    revno: 342.1.4
    merged: tfheen at err.no-20070608121809-6z48ia9svh83f62u
    committer: Tollef Fog Heen <tfheen at err.no>
    branch nick: hildon-fm
    timestamp: Fri 2007-06-08 14:18:09 +0200
    message:
      releasing version 1:1.9.23ubuntu2
    ------------------------------------------------------------
    revno: 342.1.5
    merged: mdz at ubuntu.com-20070611184137-zb8shi1vxkk3bd10
    committer: Matt Zimmerman <mdz at ubuntu.com>
    branch nick: hildon-fm
    timestamp: Mon 2007-06-11 19:41:37 +0100
    message:
        * Change dependency on hildon-l10n-mr to hildon-l10n-english to allow
          installation
        * Set Maintainer to Tollef
        ------------------------------------------------------------
        revno: 342.1.4.1.1
        merged: mdz at ubuntu.com-20070611183921-5u1vc7wkvp8wvlwl
        committer: Matt Zimmerman <mdz at ubuntu.com>
        branch nick: hildon-fm
        timestamp: Mon 2007-06-11 19:39:21 +0100
        message:
          * Change dependency on hildon-l10n-mr to hildon-l10n-english to allow
            installation
          * Set Maintainer to Tollef
    ------------------------------------------------------------
    revno: 342.1.6
    merged: mdz at ubuntu.com-20070611184449-j69g8dedlgz3zsq8
    committer: Matt Zimmerman <mdz at ubuntu.com>
    branch nick: hildon-fm
    timestamp: Mon 2007-06-11 19:44:49 +0100
    message:
      Set uploader
    ------------------------------------------------------------
    revno: 342.1.7
    merged: mdz at ubuntu.com-20070611190749-wh02tp1yozvycrw7
    committer: Matt Zimmerman <mdz at ubuntu.com>
    branch nick: hildon-fm
    timestamp: Mon 2007-06-11 20:07:49 +0100
    message:
      * Revert changes to l10n dependencies; we will use haf-marketing release
        for now
-------------- next part --------------
=== modified file 'autogen.sh'
--- a/autogen.sh	2007-02-08 13:36:49 +0000
+++ b/autogen.sh	2007-06-08 11:13:24 +0000
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 set -x
-libtoolize --automake
+libtoolize --copy --automake
 aclocal
 autoconf
 autoheader
-automake --add-missing --foreign
+automake --copy --add-missing --foreign
 
 if test x$NOCONFIGURE = x; then
   ./configure --enable-maintainer-mode "$@"

=== modified file 'debian/changelog'
--- a/debian/changelog	2007-06-07 08:12:16 +0000
+++ b/debian/changelog	2007-07-24 08:35:32 +0000
@@ -1,10 +1,18 @@
 libhildonfm (1:1.9.23-1) UNRELEASED; urgency=low
 
   * Set Debian Maemo Maintainers as Maintainer; add myself to Uploaders.
-
- -- Loic Minier <lool at dooz.org>  Wed, 06 Jun 2007 20:59:22 +0200
-
-libhildonfm (1:1.9.23ubuntu2) UNRELEASED; urgency=low
+  * Merged with Ubuntu's branch.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 24 Jul 2007 10:35:18 +0200
+
+libhildonfm (1:1.9.23ubuntu3) gutsy; urgency=low
+
+  * Revert changes to l10n dependencies; we will use haf-marketing release
+    for now
+
+ -- Matt Zimmerman <mdz at ubuntu.com>  Mon, 11 Jun 2007 20:06:07 +0100
+
+libhildonfm (1:1.9.23ubuntu2) gutsy; urgency=low
 
   [ Adilson Oliveira ]
   * Reversed changes done to done to circunvent Gtk integration.
@@ -21,8 +29,15 @@
   * Bump debhelper compat level to 5.
   * Adjust dh_strip call in debian/rules for new debhelper version.
   * Remove libhildonfm2-dbg.install as it is obsolete.
-
- -- Tollef Fog Heen <tfheen at debian.org>  Mon, 04 Jun 2007 13:44:56 +0200
+  * Add --copy to auto* calls in autogen.sh
+  * Pass --enable-gtk-doc to build documentation.
+
+  [ Matt Zimmerman ]
+  * Change dependency on hildon-l10n-mr to hildon-l10n-english to allow
+    installation
+  * Set Maintainer to Tollef
+
+ -- Matt Zimmerman <mdz at ubuntu.com>  Mon, 11 Jun 2007 19:44:16 +0100
 
 libhildonfm (1:1.9.23ubuntu1) UNRELEASED; urgency=low
 

=== modified file 'debian/rules'
--- a/debian/rules	2007-06-05 12:19:44 +0000
+++ b/debian/rules	2007-06-08 12:07:16 +0000
@@ -32,7 +32,7 @@
 	if [ ! -x configure ]; then ./autogen.sh; fi
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-gtk-doc
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-gtk-doc
 
 
 build: build-stamp