r29263 - in /packages/unstable/libnotify: ./ debian/ debian/patches/
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Sat Jul 30 21:39:27 UTC 2011
Author: bigon
Date: Sat Jul 30 21:39:27 2011
New Revision: 29263
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29263
Log:
Merge with experimental branch
Added:
packages/unstable/libnotify/debian/control.in
- copied unchanged from r29262, packages/experimental/libnotify/debian/control.in
packages/unstable/libnotify/debian/gir1.2-notify-0.7.install
- copied unchanged from r29262, packages/experimental/libnotify/debian/gir1.2-notify-0.7.install
packages/unstable/libnotify/debian/libnotify4.install
- copied unchanged from r29262, packages/experimental/libnotify/debian/libnotify4.install
packages/unstable/libnotify/debian/libnotify4.symbols
- copied unchanged from r29262, packages/experimental/libnotify/debian/libnotify4.symbols
Removed:
packages/unstable/libnotify/debian/libnotify1.install
packages/unstable/libnotify/debian/patches/01_notify-get-server-info-out-parameter-NULL.patch
Modified:
packages/unstable/libnotify/ (props changed)
packages/unstable/libnotify/debian/ (props changed)
packages/unstable/libnotify/debian/changelog
packages/unstable/libnotify/debian/control
packages/unstable/libnotify/debian/copyright
packages/unstable/libnotify/debian/libnotify-dev.install
packages/unstable/libnotify/debian/patches/99_ltmain_as-needed.patch
packages/unstable/libnotify/debian/patches/series
packages/unstable/libnotify/debian/rules
packages/unstable/libnotify/debian/watch
Propchange: packages/unstable/libnotify/
------------------------------------------------------------------------------
svn:mergeinfo = /packages/experimental/libnotify:25561-29262
Propchange: packages/unstable/libnotify/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Modified: packages/unstable/libnotify/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libnotify/debian/changelog?rev=29263&op=diff
==============================================================================
--- packages/unstable/libnotify/debian/changelog [utf-8] (original)
+++ packages/unstable/libnotify/debian/changelog [utf-8] Sat Jul 30 21:39:27 2011
@@ -1,3 +1,114 @@
+libnotify (0.7.3-2) UNRELEASED; urgency=low
+
+ * debian/watch:
+ - Switch to .bz2 tarballs.
+
+ -- Laurent Bigonville <bigon at debian.org> Mon, 25 Jul 2011 19:22:37 +0200
+
+libnotify (0.7.3-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/libnotify4.symbols: Add new symbol from 0.7.3.
+
+ -- Martin Pitt <mpitt at debian.org> Thu, 19 May 2011 17:14:37 +0200
+
+libnotify (0.7.2-1) experimental; urgency=low
+
+ [ Josselin Mouette ]
+ * Make the -dev package depend on the gir package.
+
+ [ Martin Pitt ]
+ * New upstream release.
+ * debian/libnotify4.symbols: Add new symbol from 0.7.2.
+ * debian/control.in: Add missing Vcs-* headers.
+ * debian/copyright: Update for current FSF address, thanks lintian.
+ * debian/control.in: Bump Standards-Version to 3.9.2, no changes necessary.
+
+ -- Martin Pitt <mpitt at debian.org> Thu, 19 May 2011 10:15:26 +0200
+
+libnotify (0.7.1-2) experimental; urgency=low
+
+ * debian/control.in:
+ + Update the gtk+ 3 package names.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Mon, 07 Mar 2011 19:09:59 +0000
+
+libnotify (0.7.1-1) experimental; urgency=low
+
+ * New upstream release.
+ + debian/patches/01_upstream_fix_license_header.patch,
+ debian/patches/02_upstream_ref_pixbuf.patch,
+ debian/patches/03_libtool_dont_export_private_symbols.patch:
+ - Removed, included upstream.
+ + debian/patches/90_autoreconf.patch:
+ - Removed, no longer needed.
+ + debian/control.in,
+ debian/gir1.2-notify-0.7.install,
+ debian/libnotify-dev.install:
+ - Add a gir1.2-notify-0.7 package.
+ + debian/rules:
+ - Make the shlibs file always depend on the latest version.
+ Manually bumping the version when there are API changes is
+ error-prone and we have a symbols file anyway.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Sun, 16 Jan 2011 16:08:25 +0000
+
+libnotify (0.7.0-3) experimental; urgency=low
+
+ [ Laurent Bigonville ]
+ * debian/control.in: Bump Standards-Version to 3.9.1 (no further changes)
+
+ [ Emilio Pozuelo Monfort ]
+ * debian/patches/03_libtool_dont_export_private_symbols.patch:
+ - Use libtool's -export-symbols-regex to not export private
+ symbols.
+ debian/patches/90_autoreconf.patch:
+ - Run autoreconf on top of the above patch.
+ * debian/rules,
+ debian/libnotify4.symbols:
+ - Add a symbols file for libnotify.so.4.
+ * debian/control:
+ - Remove libnotify-dev dependency on libgtk2.0-dev. Thanks Laurent
+ Bigonville.
+ - Let libnotify-dev depend on libgdk-pixbuf2.0-dev and bump the
+ libglib2.0-dev requirement to >= 2.26.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Wed, 01 Dec 2010 23:07:56 +0100
+
+libnotify (0.7.0-2) experimental; urgency=low
+
+ * debian/patches/02_upstream_ref_pixbuf.patch:
+ + Patch from upstream GIT, take a reference on the pixbuf to avoid
+ crashes on clients.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Mon, 22 Nov 2010 14:41:42 +0100
+
+libnotify (0.7.0-1) experimental; urgency=low
+
+ * New upstream release. Closes: #603635.
+ * debian/watch,
+ debian/copyright:
+ + Updated for the new location.
+ * debian/control:
+ + Update build dependencies.
+ * debian/control,
+ debian/rules,
+ debian/libnotify[14].install:
+ + Rename the library package for the new SONAME.
+ * debian/copyright:
+ + Updated.
+ * debian/patches/01_notify-get-server-info-out-parameter-NULL.patch:
+ + Removed, not needed anymore.
+ * debian/control.in,
+ debian/rules:
+ + Add GNOME magic for Uploaders generation.
+ + Include check-dist.mk to prevent accidental uploads to unstable.
+ * debian/patches/01_upstream_fix_license_header.patch:
+ + Backport patch from upstream git to fix a license header which
+ was mistakenly GPL.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 20 Nov 2010 12:44:59 +0100
+
libnotify (0.5.0-2) unstable; urgency=low
* debian/patches/01_notify-get-server-info-out-parameter-NULL.patch:
Modified: packages/unstable/libnotify/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libnotify/debian/control?rev=29263&op=diff
==============================================================================
--- packages/unstable/libnotify/debian/control [utf-8] (original)
+++ packages/unstable/libnotify/debian/control [utf-8] Sat Jul 30 21:39:27 2011
@@ -1,28 +1,37 @@
+# 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: libnotify
Priority: optional
-Maintainer: Andre Filipe de Assuncao e Brito <decko at noisemakers.org>
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Build-Depends: gnome-pkg-tools (>= 0.7),
- cdbs (>= 0.4.41),
+ cdbs (>= 0.4.90),
debhelper (>= 7),
- libglib2.0-dev (>= 2.6),
- libgtk2.0-dev (>= 2.18),
- libdbus-glib-1-dev (>= 0.76),
- libpopt-dev
-Uploaders: Loic Minier <lool at dooz.org>,
- Riccardo Setti <giskard at debian.org>,
- Sebastian Dröge <slomo at debian.org>
-Standards-Version: 3.8.4
+ libglib2.0-dev (>= 2.26),
+ libgtk-3-dev (>= 3.0.0),
+ libpopt-dev,
+ gobject-introspection (>= 0.9.12-5~),
+ libgirepository1.0-dev (>= 0.9.12),
+ gir1.2-glib-2.0,
+ gir1.2-gdkpixbuf-2.0,
+ gtk-doc-tools (>= 1.14)
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Standards-Version: 3.9.2
Section: libs
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libnotify
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/libnotify
Package: libnotify-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends},
- libnotify1 (= ${binary:Version}),
+ libnotify4 (= ${binary:Version}),
+ gir1.2-notify-0.7 (= ${binary:Version}),
libdbus-glib-1-dev (>= 0.76),
- libgtk2.0-dev (>= 2.18),
- libglib2.0-dev (>= 2.6)
-Provides: libnotify-dev-gtk2.10
+ libglib2.0-dev (>= 2.26),
+ libgdk-pixbuf2.0-dev
Description: sends desktop notifications to a notification daemon
A library that sends desktop notifications to a notification daemon, as
defined in the Desktop Notifications spec. These notifications can be
@@ -31,12 +40,11 @@
.
This package contains the include files and static library.
-Package: libnotify1
+Package: libnotify4
Section: libs
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
-Provides: libnotify1-gtk2.10
Recommends: notification-daemon
Description: sends desktop notifications to a notification daemon
A library that sends desktop notifications to a notification daemon, as
@@ -72,6 +80,20 @@
used to inform the user about an event or display some form of
information without getting in the user's way.
.
- This package contains the documentation for libnotify1 in
+ This package contains the documentation for libnotify4 in
/usr/share/gtk-doc/html/libnotify .
+Package: gir1.2-notify-0.7
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ ${gir:Depends}
+Description: sends desktop notifications to a notification daemon
+ A library that sends desktop notifications to a notification daemon, as
+ defined in the Desktop Notifications spec. These notifications can be
+ used to inform the user about an event or display some form of
+ information without getting in the user's way.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings.
Modified: packages/unstable/libnotify/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libnotify/debian/copyright?rev=29263&op=diff
==============================================================================
--- packages/unstable/libnotify/debian/copyright [utf-8] (original)
+++ packages/unstable/libnotify/debian/copyright [utf-8] Sat Jul 30 21:39:27 2011
@@ -1,51 +1,33 @@
This package was debianized by Sebastien Bacher <seb128 at debian.org> on
Thu, 28 Jul 2005 15:26:46 +0200.
-It was downloaded from http://www.galago-project.org/files/releases/source/
+It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libnotify/
The libnotify library is under the following conditions:
-Copyright Holder: Christian Hammond <chipx86 at chipx86.com>
- Mike Hearn <mike at navi.cx>
+Copyright:
+ Copyright 2004-2006 Christian Hammond
+ Copyright 2006 John Palmieri
+ Copyright 2010 Christian Persch
+ Copyright 2004-2006 Mike Hearn <mike at navi.cx>
+ Copyright 2010 Red Hat, Inc
License:
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301 USA
On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-The notify-send binary, built from the source at tools/notify-send.c is
-the following conditions:
-
-Copyright Holder: 2004, Christian Hammond <chipx86 at chipx86.com>
-
-License:
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 dated June, 1991.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
Modified: packages/unstable/libnotify/debian/libnotify-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libnotify/debian/libnotify-dev.install?rev=29263&op=diff
==============================================================================
--- packages/unstable/libnotify/debian/libnotify-dev.install [utf-8] (original)
+++ packages/unstable/libnotify/debian/libnotify-dev.install [utf-8] Sat Jul 30 21:39:27 2011
@@ -3,3 +3,4 @@
debian/tmp/usr/lib/lib*.so
debian/tmp/usr/lib/pkgconfig/*
debian/tmp/usr/lib/*.la
+debian/tmp/usr/share/gir-1.0
Modified: packages/unstable/libnotify/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libnotify/debian/patches/99_ltmain_as-needed.patch?rev=29263&op=diff
==============================================================================
--- packages/unstable/libnotify/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ packages/unstable/libnotify/debian/patches/99_ltmain_as-needed.patch [utf-8] Sat Jul 30 21:39:27 2011
@@ -1,7 +1,7 @@
Index: libnotify-0.5.0/ltmain.sh
===================================================================
---- libnotify-0.5.0.orig/ltmain.sh 2010-06-24 10:01:38.000000000 +0200
-+++ libnotify-0.5.0/ltmain.sh 2010-06-29 07:27:27.202952725 +0200
+--- libnotify-0.5.0.orig/build-aux/ltmain.sh 2010-06-24 10:01:38.000000000 +0200
++++ libnotify-0.5.0/build-aux/ltmain.sh 2010-06-29 07:27:27.202952725 +0200
@@ -4716,6 +4716,11 @@
arg=$func_stripname_result
;;
Modified: packages/unstable/libnotify/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libnotify/debian/patches/series?rev=29263&op=diff
==============================================================================
--- packages/unstable/libnotify/debian/patches/series [utf-8] (original)
+++ packages/unstable/libnotify/debian/patches/series [utf-8] Sat Jul 30 21:39:27 2011
@@ -1,2 +1,1 @@
-01_notify-get-server-info-out-parameter-NULL.patch
99_ltmain_as-needed.patch
Modified: packages/unstable/libnotify/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libnotify/debian/rules?rev=29263&op=diff
==============================================================================
--- packages/unstable/libnotify/debian/rules [utf-8] (original)
+++ packages/unstable/libnotify/debian/rules [utf-8] Sat Jul 30 21:39:27 2011
@@ -3,9 +3,12 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_libnotify1 := -V "libnotify1 (>= 0.5.0), libnotify1-gtk2.10"
-
+DEB_DH_MAKESHLIBS_ARGS_libnotify4 := -V -- -c4
Modified: packages/unstable/libnotify/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libnotify/debian/watch?rev=29263&op=diff
==============================================================================
--- packages/unstable/libnotify/debian/watch [utf-8] (original)
+++ packages/unstable/libnotify/debian/watch [utf-8] Sat Jul 30 21:39:27 2011
@@ -1,2 +1,3 @@
version=2
-http://www.galago-project.org/files/releases/source/libnotify/libnotify-(.*)\.tar\.gz debian uupdate
+http://ftp.gnome.org/pub/GNOME/sources/libnotify/([\d\.]+)/ \
+libnotify-([\d\.]+)\.tar\.bz2
More information about the pkg-gnome-commits
mailing list