[Pkg-gpe-maintainers] Ubuntu libgpewidget 0.117-2ubuntu1
Ubuntu Merge-o-Matic
mom at ubuntu.com
Fri Dec 17 23:55:39 UTC 2010
This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes. It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Fri, 17 Dec 2010 21:17:56 +0100
Source: libgpewidget
Binary: libgpewidget1 libgpewidget-dev libgpewidget1-dbg libgpewidget-doc
Architecture: source
Version: 0.117-2ubuntu1
Distribution: natty
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Stefan Potyra <sistpoty at ubuntu.com>
Description:
libgpewidget-dev - Development files for libgpewidget
libgpewidget-doc - GPE Palmtop Environment widget library Reference Manual
libgpewidget1 - GPE Palmtop Environment widget library
libgpewidget1-dbg - debug symbols for libgpewidget
Changes:
libgpewidget (0.117-2ubuntu1) natty; urgency=low
.
* Adjust Makefile.{am|in} with debian/patches/missing-linkage-X11
to also link infoprint against it. (cf. DBTS: #555182).
Checksums-Sha1:
1791a188aec67f1f2b69e65a6f94181b13b283f4 1688 libgpewidget_0.117-2ubuntu1.dsc
63db8a171428c28b285fdb52eefa281132e527c6 7476 libgpewidget_0.117-2ubuntu1.debian.tar.gz
Checksums-Sha256:
91bb927a6a3d28b89923ee300a55037ef066de04d057aa6cdefbaf82fc7d198b 1688 libgpewidget_0.117-2ubuntu1.dsc
a6ec745982e2a9a29eb426d9beeab395c8f759b645352e3ad2b2ffcd0965f504 7476 libgpewidget_0.117-2ubuntu1.debian.tar.gz
Files:
41c867116b2ee827aad1c823886afce2 1688 libs optional libgpewidget_0.117-2ubuntu1.dsc
941c6442cd08a9a8f2577f284b8e4bf8 7476 libs optional libgpewidget_0.117-2ubuntu1.debian.tar.gz
Original-Maintainer: Neil Williams <codehelp at debian.org>
-------------- next part --------------
diff -pruN 0.117-2/debian/changelog 0.117-2ubuntu1/debian/changelog
--- 0.117-2/debian/changelog 2010-03-01 18:42:50.000000000 +0000
+++ 0.117-2ubuntu1/debian/changelog 2010-12-17 20:19:06.000000000 +0000
@@ -1,3 +1,10 @@
+libgpewidget (0.117-2ubuntu1) natty; urgency=low
+
+ * Adjust Makefile.{am|in} with debian/patches/missing-linkage-X11
+ to also link infoprint against it. (cf. DBTS: #555182).
+
+ -- Stefan Potyra <sistpoty at ubuntu.com> Fri, 17 Dec 2010 21:17:56 +0100
+
libgpewidget (0.117-2) unstable; urgency=low
* Migrate to source format 3.0 (quilt) for .tar.bz2 support.
diff -pruN 0.117-2/debian/control 0.117-2ubuntu1/debian/control
--- 0.117-2/debian/control 2010-03-01 18:44:55.000000000 +0000
+++ 0.117-2ubuntu1/debian/control 2010-12-17 20:31:05.000000000 +0000
@@ -1,7 +1,8 @@
Source: libgpewidget
Section: libs
Priority: optional
-Maintainer: Neil Williams <codehelp at debian.org>
+XSBC-Original-Maintainer: Neil Williams <codehelp at debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Uploaders: Debian GPE team <pkg-gpe-maintainers at lists.alioth.debian.org>,
Moray Allan <moray at debian.org>, Phil Blundell <pb at debian.org>,
Philippe De Swert <philippedeswert at scarlet.be>
diff -pruN 0.117-2/debian/patches/missing-linkage-X11 0.117-2ubuntu1/debian/patches/missing-linkage-X11
--- 0.117-2/debian/patches/missing-linkage-X11 2010-03-01 19:17:23.000000000 +0000
+++ 0.117-2ubuntu1/debian/patches/missing-linkage-X11 2010-12-17 20:17:53.000000000 +0000
@@ -4,9 +4,11 @@ Bug-Debian: http://bugs.debian.org/55518
---
---- libgpewidget-0.117.orig/Makefile.in
-+++ libgpewidget-0.117/Makefile.in
-@@ -304,7 +304,7 @@ libgpewidget_la_SOURCES = gtkdatecombo.c
+Index: libgpewidget-0.117/Makefile.in
+===================================================================
+--- libgpewidget-0.117.orig/Makefile.in 2008-07-11 13:03:46.000000000 +0200
++++ libgpewidget-0.117/Makefile.in 2010-12-17 21:17:50.980175731 +0100
+@@ -304,7 +304,7 @@
color-slider.c colordialog.c link-warning.h \
colorrenderer.c
@@ -15,9 +17,20 @@ Bug-Debian: http://bugs.debian.org/55518
gpeincludedir = $(includedir)/gpe
gpeinclude_HEADERS = gpe/init.h gpe/errorbox.h gpe/smallbox.h gpe/pixmaps.h gpe/gtkdatecombo.h \
gpe/dirbrowser.h gpe/stylus.h gpe/picturebutton.h gpe/spacing.h \
---- libgpewidget-0.117.orig/Makefile.am
-+++ libgpewidget-0.117/Makefile.am
-@@ -30,7 +30,7 @@ libgpewidget_la_SOURCES = gtkdatecombo.c
+@@ -321,7 +321,7 @@
+ pixmap_DATA = pixmaps/clock.png pixmaps/clock24.png pixmaps/day-night-wheel.png
+ infoprint_DEPENDENCIES = libgpewidget.la
+ infoprint_SOURCES = infoprint-main.c
+-infoprint_LDADD = -lgpewidget
++infoprint_LDADD = -lgpewidget -lX11
+ EXTRA_DIST = $(pixmap_DATA) \
+ intltool-extract.in \
+ intltool-merge.in \
+Index: libgpewidget-0.117/Makefile.am
+===================================================================
+--- libgpewidget-0.117.orig/Makefile.am 2008-07-11 12:45:28.000000000 +0200
++++ libgpewidget-0.117/Makefile.am 2010-12-17 21:17:38.370175731 +0100
+@@ -30,7 +30,7 @@
color-slider.c colordialog.c link-warning.h \
colorrenderer.c
@@ -26,3 +39,12 @@ Bug-Debian: http://bugs.debian.org/55518
gpeincludedir = $(includedir)/gpe
gpeinclude_HEADERS = gpe/init.h gpe/errorbox.h gpe/smallbox.h gpe/pixmaps.h gpe/gtkdatecombo.h \
+@@ -52,7 +52,7 @@
+ bin_PROGRAMS = infoprint
+ infoprint_DEPENDENCIES = libgpewidget.la
+ infoprint_SOURCES = infoprint-main.c
+-infoprint_LDADD = -lgpewidget
++infoprint_LDADD = -lgpewidget -lX11
+
+ EXTRA_DIST = $(pixmap_DATA) \
+ intltool-extract.in \
diff -pruN 0.117-2/Makefile.am 0.117-2ubuntu1/Makefile.am
--- 0.117-2/Makefile.am 2010-12-17 23:47:23.000000000 +0000
+++ 0.117-2ubuntu1/Makefile.am 2010-12-17 23:47:23.000000000 +0000
@@ -52,7 +52,7 @@ pixmap_DATA = pixmaps/clock.png pixmaps/
bin_PROGRAMS = infoprint
infoprint_DEPENDENCIES = libgpewidget.la
infoprint_SOURCES = infoprint-main.c
-infoprint_LDADD = -lgpewidget
+infoprint_LDADD = -lgpewidget -lX11
EXTRA_DIST = $(pixmap_DATA) \
intltool-extract.in \
diff -pruN 0.117-2/Makefile.in 0.117-2ubuntu1/Makefile.in
--- 0.117-2/Makefile.in 2010-12-17 23:47:23.000000000 +0000
+++ 0.117-2ubuntu1/Makefile.in 2010-12-17 23:47:23.000000000 +0000
@@ -321,7 +321,7 @@ pixmapdir = $(datadir)/libgpewidget
pixmap_DATA = pixmaps/clock.png pixmaps/clock24.png pixmaps/day-night-wheel.png
infoprint_DEPENDENCIES = libgpewidget.la
infoprint_SOURCES = infoprint-main.c
-infoprint_LDADD = -lgpewidget
+infoprint_LDADD = -lgpewidget -lX11
EXTRA_DIST = $(pixmap_DATA) \
intltool-extract.in \
intltool-merge.in \
More information about the Pkg-gpe-maintainers
mailing list