r23203 - in /packages/unstable/gnet/debian: changelog control control.in libgnet-dev.install patches/01_move_define.patch

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Sat Mar 6 18:37:57 UTC 2010


Author: pochu
Date: Sat Mar  6 18:37:56 2010
New Revision: 23203

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23203
Log:
* debian/libgnet-dev.install:
  - Ship the documentation in libgnet-dev. Closes: #325182.
* debian/patches/01_move_define.patch:
  - Fix FTBFS by moving a #define before it's used. Closes: #569378.
* debian/control.in:
  - Standards-Version is 3.8.4, no changes needed.

Added:
    packages/unstable/gnet/debian/patches/01_move_define.patch
Modified:
    packages/unstable/gnet/debian/changelog
    packages/unstable/gnet/debian/control
    packages/unstable/gnet/debian/control.in
    packages/unstable/gnet/debian/libgnet-dev.install

Modified: packages/unstable/gnet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnet/debian/changelog?rev=23203&op=diff
==============================================================================
--- packages/unstable/gnet/debian/changelog [utf-8] (original)
+++ packages/unstable/gnet/debian/changelog [utf-8] Sat Mar  6 18:37:56 2010
@@ -1,8 +1,17 @@
-gnet (2.0.8-2) UNRELEASED; urgency=low
-
+gnet (2.0.8-2) unstable; urgency=low
+
+  [ Josselin Mouette ]
   * Drop .la file, it’s not referenced anywhere.
 
- -- Josselin Mouette <joss at debian.org>  Tue, 25 Aug 2009 13:13:08 +0200
+  [ Emilio Pozuelo Monfort ]
+  * debian/libgnet-dev.install:
+    - Ship the documentation in libgnet-dev. Closes: #325182.
+  * debian/patches/01_move_define.patch:
+    - Fix FTBFS by moving a #define before it's used. Closes: #569378.
+  * debian/control.in:
+    - Standards-Version is 3.8.4, no changes needed.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 06 Mar 2010 19:32:24 +0100
 
 gnet (2.0.8-1) unstable; urgency=high
 

Modified: packages/unstable/gnet/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnet/debian/control?rev=23203&op=diff
==============================================================================
--- packages/unstable/gnet/debian/control [utf-8] (original)
+++ packages/unstable/gnet/debian/control [utf-8] Sat Mar  6 18:37:56 2010
@@ -1,8 +1,13 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: gnet
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Sebastian Dröge <slomo at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 5),
                cdbs  (>= 0.4.41),
                gnome-pkg-tools (>= 0.11),
@@ -10,7 +15,7 @@
                gtk-doc-tools (>= 1.2),
                check (>= 0.9.4),
                pkg-config
-Standards-Version: 3.7.3
+Standards-Version: 3.8.4
 
 Package: libgnet-dev
 Section: libdevel
@@ -53,4 +58,3 @@
    * IP Multicast
    * Internet address abstraction
    * IPv6
-

Modified: packages/unstable/gnet/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnet/debian/control.in?rev=23203&op=diff
==============================================================================
--- packages/unstable/gnet/debian/control.in [utf-8] (original)
+++ packages/unstable/gnet/debian/control.in [utf-8] Sat Mar  6 18:37:56 2010
@@ -10,7 +10,7 @@
                gtk-doc-tools (>= 1.2),
                check (>= 0.9.4),
                pkg-config
-Standards-Version: 3.7.3
+Standards-Version: 3.8.4
 
 Package: libgnet-dev
 Section: libdevel
@@ -53,4 +53,3 @@
    * IP Multicast
    * Internet address abstraction
    * IPv6
-

Modified: packages/unstable/gnet/debian/libgnet-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnet/debian/libgnet-dev.install?rev=23203&op=diff
==============================================================================
--- packages/unstable/gnet/debian/libgnet-dev.install [utf-8] (original)
+++ packages/unstable/gnet/debian/libgnet-dev.install [utf-8] Sat Mar  6 18:37:56 2010
@@ -4,3 +4,4 @@
 debian/tmp/usr/lib/libgnet-2.0.so
 debian/tmp/usr/lib/libgnet-2.0.a
 debian/tmp/usr/share/aclocal
+debian/tmp/usr/share/gtk-doc

Added: packages/unstable/gnet/debian/patches/01_move_define.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnet/debian/patches/01_move_define.patch?rev=23203&op=file
==============================================================================
--- packages/unstable/gnet/debian/patches/01_move_define.patch (added)
+++ packages/unstable/gnet/debian/patches/01_move_define.patch [utf-8] Sat Mar  6 18:37:56 2010
@@ -1,0 +1,26 @@
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=569378
+Author: Emilio Pozuelo Monfort <pochu at debian.org>
+
+Move the define before using it to fix a build failure.
+
+diff -ruNp gnet-2.0.8/tests/check/gnetcheck.h gnet-2.0.8.new/tests/check/gnetcheck.h
+--- gnet-2.0.8/tests/check/gnetcheck.h	2008-02-03 13:04:41.000000000 +0100
++++ gnet-2.0.8.new/tests/check/gnetcheck.h	2010-03-06 19:23:28.000000000 +0100
+@@ -310,6 +310,8 @@ int main (int argc, char **argv)				\
+ 
+ gboolean _gnet_check_run_test_func (const gchar * func_name);
+ 
++#define _tcase_add_test  __gnet_tcase_add_test
++
+ static inline void
+ __gnet_tcase_add_test (TCase * tc, TFun tf, const gchar * func_name,
+     int sig, int start, int end)
+@@ -319,8 +321,6 @@ __gnet_tcase_add_test (TCase * tc, TFun
+   }
+ }
+ 
+-#define _tcase_add_test  __gnet_tcase_add_test
+-
+ G_END_DECLS
+ 
+ #endif /* __GNET_CHECK_H__ */




More information about the pkg-gnome-commits mailing list