Ubuntu
glib-networking package

Merge lp:~rodrigo-moya/ubuntu/natty/glib-networking/fix-ftbf into lp:ubuntu/natty/glib-networking

  1. Natty (11.04)
  2. fix-ftbf
  3. Merge into natty
Proposed by Rodrigo Moya
Status: Merged
Merged at revision: 6
Proposed branch: lp:~rodrigo-moya/ubuntu/natty/glib-networking/fix-ftbf
Merge into: lp:ubuntu/natty/glib-networking
Diff against target: 27 lines (+10/-1)
2 files modified
debian/changelog (+7/-0)
debian/rules (+3/-1)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/natty/glib-networking/fix-ftbf
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+55588@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-22 20:21:29 +0000
3+++ debian/changelog 2011-03-30 16:22:32 +0000
4@@ -1,3 +1,10 @@
5+glib-networking (2.28.0-2) UNRELEASED; urgency=low
6+
7+ * debian/rules:
8+ - Remove *.a files in the correct arch-specific dir
9+
10+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Wed, 30 Mar 2011 17:22:57 +0200
11+
12 glib-networking (2.28.0-1) unstable; urgency=low
13
14 * New upstream stable release.
15
16=== modified file 'debian/rules'
17--- debian/rules 2011-02-22 20:21:29 +0000
18+++ debian/rules 2011-03-30 16:22:32 +0000
19@@ -8,5 +8,7 @@
20
21 DEB_MAKE_CHECK_TARGET = check
22
23+GIO_MODULE_DIR = `pkg-config --variable giomoduledir gio-2.0`
24+
25 binary-install/glib-networking::
26- rm debian/glib-networking/usr/lib/gio/modules/*a
27+ rm debian/glib-networking$(GIO_MODULE_DIR)/*a

Subscribers

People subscribed via source and target branches

to all changes: