[Pkg-telepathy-commits] [SCM] Empathy packaging branch, ubuntu-jaunty, created. ubuntu/2.26.2-1ubuntu1

[Laurent Bigonville]

The branch, ubuntu-jaunty has been created
        at  696e7e10ef774f117757e76c0d40b4df0b32a8ea (commit)

- Shortlog ------------------------------------------------------------
commit 696e7e10ef774f117757e76c0d40b4df0b32a8ea
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed May 20 09:12:01 2009 +0200

    Release to jaunty-proposed

commit dc4f97162e4f4f3b6986372fbb8a9037d078b5d4
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed May 20 09:10:11 2009 +0200

    Explicitly say that it's a SRU upload

commit 83fe1addd50332c2ed8f620b639101e3eba90050
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Mon May 18 22:49:49 2009 +0200

    Add changelog entry

commit bf696f4b948290c00489289533fe063ce735c431
Merge: b3aacce89576ca337d28c7ef2cb0ea8ba05d3ff4 3e4574bff03c8d92ee5b29adaa7bdc18dc35ffac
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Mon May 18 22:33:04 2009 +0200

    Merge branch 'debian-squeeze' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/control

commit b3aacce89576ca337d28c7ef2cb0ea8ba05d3ff4
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Apr 14 12:03:39 2009 +0200

    Release to jaunty

commit e4aa46779b1ed61270764e408393cbaab16f5bca
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Apr 14 12:03:07 2009 +0200

    Merge from debian unstable
    
    * Merge from debian unstable, remaining changes:
      - Add Recommends on telepathy-butterfly and telepathy-haze
      - Add Suggests on telepathy-idle

commit b8ef9d733e41e4fcae4bb38e13b5281527ed2467
Merge: 44add35d99a2dbb3ec43499f7f2607b3dd10d6fa ff93e58e57c31fe6328c1afdef37b7427cc34917
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Apr 14 12:00:07 2009 +0200

    Merge branch 'debian' into ubuntu
    
    Conflicts:
    	debian/changelog

commit 44add35d99a2dbb3ec43499f7f2607b3dd10d6fa
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Apr 1 20:24:28 2009 +0200

    Add LP bug

commit 5ba89b437a4d2f3563d4129a2e96970d3372ef9d
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Apr 1 20:18:48 2009 +0200

    Release to jaunty

commit d4bda8f2a895ae9e17ca4d7c0b28bd1647fefd26
Merge: d2c69fc772b30a76e8c03cfc8f75ccdeabbbea92 7d0c94108a67aafc4c8a366266b1181e994f9ae7
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Apr 1 20:16:05 2009 +0200

    Merge branch 'debian' into ubuntu
    
    Conflicts:
    	debian/changelog

commit d2c69fc772b30a76e8c03cfc8f75ccdeabbbea92
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Mar 18 13:43:19 2009 +0100

    Release to jaunty

commit 2d585534fd06a774700dfecbdcf55afd74ce245f
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Mar 18 13:27:28 2009 +0100

    Merge from debian unstable, remaining changes:
    
    * Merge from debian unstable, remaining changes:
      - Add Recommends on telepathy-butterfly and telepathy-haze
      - Add Suggests on telepathy-idle

commit d03286f9ce2fe4b4873255ce89b8fef81c7ba5fb
Merge: 6e7e4f9aa9193cad1c6b618bbc6c36cc1abcf18e c8eb84ffa15676133e867e4f804162de423f2981
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Mar 18 13:26:06 2009 +0100

    Merge branch 'debian' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/control

commit 6e7e4f9aa9193cad1c6b618bbc6c36cc1abcf18e
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Mar 11 01:29:21 2009 +0100

    Fix FTBFS with python >= 2.6

commit b7b088654671d444b2f6864143ba0296b5a3eee0
Merge: 01f4f57e563a7941af4c8cb921ce1f082467f2ca 56b62041ef3d81a5dffab7deebf2a23e782d0cd3
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sat Mar 7 17:48:55 2009 +0100

    Merge branch 'debian' into ubuntu
    
    Conflicts:
    	debian/changelog

commit 01f4f57e563a7941af4c8cb921ce1f082467f2ca
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Mar 3 10:57:16 2009 +0100

    Add minimal version for libtelepathy-farsight-dev build-dep

commit 7d118de6832e06cd8d58d2948ba730b5f579ba10
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Mar 3 10:29:07 2009 +0100

    Release to jaunty

commit 78709ee1a8041ae0030dcf28c2e5882371415dac
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Mar 3 10:20:48 2009 +0100

    Some debian/changelog cleanup

commit 2d13448777995d9a104d1cfd2b1891023664efe6
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Mar 3 10:17:32 2009 +0100

    Merge from debian experimental
    
    * Merge from debian experimental, remaining changes:
      - Add Recommends on telepathy-butterfly and telepathy-haze
      - Add Suggests on telepathy-idle

commit a7e2b4c5fb5aba7ad13c10b21cfc5cc1f72007e9
Merge: 53c8845ddc10e29c3d7371cc02050e938d02d8ba 8403f7b07b7dcfda27abb62d63218b2be5ca08aa
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sat Feb 28 18:45:48 2009 +0100

    Merge branch 'debian' into ubuntu
    
    Conflicts:
    	debian/changelog

commit 53c8845ddc10e29c3d7371cc02050e938d02d8ba
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sun Jan 18 14:32:12 2009 +0100

    Release to jaunty

commit 72b962aed80d481f78290919154100c08f850aad
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sun Jan 18 14:22:41 2009 +0100

    Merge from debian experimental, remaining changes:
    
    * Merge from debian experimental, remaining changes:
      - Add Recommends on telepathy-butterfly and telepathy-haze
      - Add Suggests on telepathy-idle
    * Drop debian/patches/01fixtabbehavour.diff: Upstream is not happy
      with this patch.

commit 7b4410067e9bc0ebd1c9002693d132411b2fd8c6
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sun Jan 18 14:07:58 2009 +0100

    Merge ubuntu changes

-----------------------------------------------------------------------

-- 
Empathy packaging