diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-28 01:18:25 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-28 01:23:38 +0800 |
| commit | cf401b3897d7d4eba4e8dbe5fec9e85079e17446 (patch) | |
| tree | c3d118e51d105df88dc6a17f3272beaf0d17abbd | |
| parent | 7b3b4eeffb16c4c57a02706e336f645dea1ea036 (diff) | |
| download | gsoc2013-empathy-cf401b3897d7d4eba4e8dbe5fec9e85079e17446.tar gsoc2013-empathy-cf401b3897d7d4eba4e8dbe5fec9e85079e17446.tar.gz gsoc2013-empathy-cf401b3897d7d4eba4e8dbe5fec9e85079e17446.tar.bz2 gsoc2013-empathy-cf401b3897d7d4eba4e8dbe5fec9e85079e17446.tar.lz gsoc2013-empathy-cf401b3897d7d4eba4e8dbe5fec9e85079e17446.tar.xz gsoc2013-empathy-cf401b3897d7d4eba4e8dbe5fec9e85079e17446.tar.zst gsoc2013-empathy-cf401b3897d7d4eba4e8dbe5fec9e85079e17446.zip | |
New upstream snapshot
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/build_yell_statically.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 7 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog index 6fb87ee91..1e621dfd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +empathy (2.34.0+git.20110427.ea8d26-0ubuntu0+easton1) natty; urgency=low + + * New upstream snapshot. + * debian/patches/build_yell_statically.patch: removed. + + -- Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> Wed, 27 Apr 2011 18:17:39 +0100 + empathy (2.34.0+git.20110425.93f10e-0ubuntu0+easton1) natty; urgency=low * New upstream snapshot. diff --git a/debian/patches/build_yell_statically.patch b/debian/patches/build_yell_statically.patch deleted file mode 100644 index d70f1251b..000000000 --- a/debian/patches/build_yell_statically.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 6986cd6..86d6b80 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -59,8 +59,11 @@ GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4 - - # telepathy-yell - prev_top_build_prefix=$ac_top_build_prefix -+prev_ac_configure_args=$ac_configure_args -+ac_configure_args="$ac_configure_args --disable-shared-library" - AX_CONFIG_DIR([telepathy-yell]) - ac_top_build_prefix=$prev_top_build_prefix -+ac_configure_args=$prev_ac_configure_args - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-yell/telepathy-yell - - AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/patches/series b/debian/patches/series index 57de13e21..3670f45d4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,4 +12,3 @@ 38_lp_569289.patch 40_unity_launcher_count.patch 41_unity_launcher_progress.patch -build_yell_statically.patch |