r17886 - in /desktop/experimental/gucharmap/debian: changelog control control.in copyright gucharmap.1 gucharmap.links libgucharmap-dev.install libgucharmap2-dev.install libgucharmap6.install libgucharmap7.install rules watch
pochu-guest at users.alioth.debian.org
pochu-guest at users.alioth.debian.org
Tue Dec 9 17:13:28 UTC 2008
Author: pochu-guest
Date: Tue Dec 9 17:13:28 2008
New Revision: 17886
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17886
Log:
* New upstream release.
- Scrolling with the wheel now updates the scrollbar. Closes: #427387.
- Character detail window closed too fast in some cases, now fixed.
Closes: #368134.
- Update build-dependencies.
- Rename libgucharmap6 package to libgucharmap7.
- Rename libgucharmap-dev to libgucharmap2-dev, as the pkgconfig file
has been renamed (and the /usr/include directory) and packages need
porting.
- Update libgucharmap2-dev.install for the new include directory.
* debian/watch: Don't uupdate.
* debian/rules:
- Don't hardcode libgucharmap's SONAME all over the place,
extract it from debian/control instead.
- Update the shlibs version.
* debian/control.in:
- Add Vcs-* and Homepage fields.
- Remove old conflicts/replaces for packages that are not shipped
in Etch.
* debian/copyright: Add copyright holders.
* debian/gucharmap.1: Fix WHATIS entry.
* debian/gucharmap.links:
- Make links for charmap.1 and gnome-character-map.1 to the gucharmap
manpage.
Added:
desktop/experimental/gucharmap/debian/gucharmap.links
desktop/experimental/gucharmap/debian/libgucharmap2-dev.install (contents, props changed)
- copied, changed from r17885, desktop/experimental/gucharmap/debian/libgucharmap-dev.install
desktop/experimental/gucharmap/debian/libgucharmap7.install (props changed)
- copied unchanged from r17885, desktop/experimental/gucharmap/debian/libgucharmap6.install
Removed:
desktop/experimental/gucharmap/debian/libgucharmap-dev.install
desktop/experimental/gucharmap/debian/libgucharmap6.install
Modified:
desktop/experimental/gucharmap/debian/changelog
desktop/experimental/gucharmap/debian/control
desktop/experimental/gucharmap/debian/control.in
desktop/experimental/gucharmap/debian/copyright
desktop/experimental/gucharmap/debian/gucharmap.1
desktop/experimental/gucharmap/debian/rules
desktop/experimental/gucharmap/debian/watch
Modified: desktop/experimental/gucharmap/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/changelog?rev=17886&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/changelog (original)
+++ desktop/experimental/gucharmap/debian/changelog Tue Dec 9 17:13:28 2008
@@ -1,3 +1,32 @@
+gucharmap (1:2.24.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - Scrolling with the wheel now updates the scrollbar. Closes: #427387.
+ - Character detail window closed too fast in some cases, now fixed.
+ Closes: #368134.
+ - Update build-dependencies.
+ - Rename libgucharmap6 package to libgucharmap7.
+ - Rename libgucharmap-dev to libgucharmap2-dev, as the pkgconfig file
+ has been renamed (and the /usr/include directory) and packages need
+ porting.
+ - Update libgucharmap2-dev.install for the new include directory.
+ * debian/watch: Don't uupdate.
+ * debian/rules:
+ - Don't hardcode libgucharmap's SONAME all over the place,
+ extract it from debian/control instead.
+ - Update the shlibs version.
+ * debian/control.in:
+ - Add Vcs-* and Homepage fields.
+ - Remove old conflicts/replaces for packages that are not shipped
+ in Etch.
+ * debian/copyright: Add copyright holders.
+ * debian/gucharmap.1: Fix WHATIS entry.
+ * debian/gucharmap.links:
+ - Make links for charmap.1 and gnome-character-map.1 to the gucharmap
+ manpage.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com> Tue, 09 Dec 2008 17:56:46 +0100
+
gucharmap (1:2.22.3-2) unstable; urgency=low
* Remove dependency on scrollkeeper. Closes: #491718.
Modified: desktop/experimental/gucharmap/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/control?rev=17886&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/control (original)
+++ desktop/experimental/gucharmap/debian/control Tue Dec 9 17:13:28 2008
@@ -2,26 +2,28 @@
Section: x11
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at ubuntu.com>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: cdbs (>= 0.2.6),
debhelper (>= 5),
- libgtk2.0-dev (>= 2.12.0),
- libglib2.0-dev (>= 2.3.0),
+ libgtk2.0-dev (>= 2.13.6),
+ libglib2.0-dev (>= 2.16.3),
libgconf2-dev,
libpopt-dev,
gnome-pkg-tools,
scrollkeeper,
- libxml-parser-perl,
gnome-doc-utils (>= 0.9.0),
- intltool (>= 0.3.5),
+ intltool (>= 0.40),
gconf2
Standards-Version: 3.8.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/gucharmap
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/gucharmap
+Homepage: http://live.gnome.org/Gucharmap
Package: gucharmap
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libgucharmap6 (= ${binary:Version}),
+ libgucharmap7 (= ${binary:Version}),
libgtk2.0-bin
Recommends: yelp
Conflicts: charmap
@@ -32,20 +34,16 @@
their detailed properties. It is an easy way to find the character
you might only know by its Unicode name or code point.
-Package: libgucharmap-dev
+Package: libgucharmap2-dev
Section: libdevel
Architecture: any
-Depends: libgucharmap6 (= ${binary:Version}),
+Depends: libgucharmap7 (= ${binary:Version}),
${misc:Depends},
libgtk2.0-dev (>= 2.12.0),
libgconf2-dev
-Replaces: libgucharmap0-dev (= 1:1.0.0-1),
- libgucharmap3-dev,
- libgucharmap4-dev,
+Replaces: libgucharmap4-dev,
libgucharmap5-dev
-Conflicts: libgucharmap0-dev (= 1:1.0.0-1),
- libgucharmap3-dev,
- libgucharmap4-dev,
+Conflicts: libgucharmap4-dev,
libgucharmap5-dev
Description: Unicode browser widget library (development headers)
The libgucharmap library contains a Unicode browser widget; it is
@@ -54,13 +52,11 @@
.
This package contains the development headers.
-Package: libgucharmap6
+Package: libgucharmap7
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: libgucharmap0 (= 1:1.0.0-1)
-Conflicts: libgucharmap0 (= 1:1.0.0-1)
Description: Unicode browser widget library (shared library)
The libgucharmap library contains a Unicode browser widget; it is
most prominently used by the "gucharmap" program. See the package of
Modified: desktop/experimental/gucharmap/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/control.in?rev=17886&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/control.in (original)
+++ desktop/experimental/gucharmap/debian/control.in Tue Dec 9 17:13:28 2008
@@ -5,23 +5,25 @@
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs (>= 0.2.6),
debhelper (>= 5),
- libgtk2.0-dev (>= 2.12.0),
- libglib2.0-dev (>= 2.3.0),
+ libgtk2.0-dev (>= 2.13.6),
+ libglib2.0-dev (>= 2.16.3),
libgconf2-dev,
libpopt-dev,
gnome-pkg-tools,
scrollkeeper,
- libxml-parser-perl,
gnome-doc-utils (>= 0.9.0),
- intltool (>= 0.3.5),
+ intltool (>= 0.40),
gconf2
Standards-Version: 3.8.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/gucharmap
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/gucharmap
+Homepage: http://live.gnome.org/Gucharmap
Package: gucharmap
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libgucharmap6 (= ${binary:Version}),
+ libgucharmap7 (= ${binary:Version}),
libgtk2.0-bin
Recommends: yelp
Conflicts: charmap
@@ -32,20 +34,16 @@
their detailed properties. It is an easy way to find the character
you might only know by its Unicode name or code point.
-Package: libgucharmap-dev
+Package: libgucharmap2-dev
Section: libdevel
Architecture: any
-Depends: libgucharmap6 (= ${binary:Version}),
+Depends: libgucharmap7 (= ${binary:Version}),
${misc:Depends},
libgtk2.0-dev (>= 2.12.0),
libgconf2-dev
-Replaces: libgucharmap0-dev (= 1:1.0.0-1),
- libgucharmap3-dev,
- libgucharmap4-dev,
+Replaces: libgucharmap4-dev,
libgucharmap5-dev
-Conflicts: libgucharmap0-dev (= 1:1.0.0-1),
- libgucharmap3-dev,
- libgucharmap4-dev,
+Conflicts: libgucharmap4-dev,
libgucharmap5-dev
Description: Unicode browser widget library (development headers)
The libgucharmap library contains a Unicode browser widget; it is
@@ -54,13 +52,11 @@
.
This package contains the development headers.
-Package: libgucharmap6
+Package: libgucharmap7
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: libgucharmap0 (= 1:1.0.0-1)
-Conflicts: libgucharmap0 (= 1:1.0.0-1)
Description: Unicode browser widget library (shared library)
The libgucharmap library contains a Unicode browser widget; it is
most prominently used by the "gucharmap" program. See the package of
Modified: desktop/experimental/gucharmap/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/copyright?rev=17886&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/copyright (original)
+++ desktop/experimental/gucharmap/debian/copyright Tue Dec 9 17:13:28 2008
@@ -3,9 +3,13 @@
It was downloaded from http://download.gnome.org/sources/gucharmap/
-Copyright Holders (Upstream Authors):
- Behdad Esfahbod <behdad at gnome.org>
- Noah Levitt <nlevitt at users.sourceforge.net>
+Copyright:
+ Copyright (C) 200 Behdad Esfahbod <behdad at gnome.org>
+ Copyright (C) 2003-2004 Noah Levitt <nlevitt at users.sourceforge.net>
+ Copyright (C) 2007-2008 Christian Persch
+ Copyright (C) 2005 Jason Allen
+ Copyright (C) 2002, 2004 Anders Carlsson <andersca at gnu.org>
+ Copyright (C) 2003 Sun Microsystems Inc.
License:
Modified: desktop/experimental/gucharmap/debian/gucharmap.1
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/gucharmap.1?rev=17886&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/gucharmap.1 (original)
+++ desktop/experimental/gucharmap/debian/gucharmap.1 Tue Dec 9 17:13:28 2008
@@ -15,7 +15,7 @@
.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
.TH gucharmap 1 "2007\-05\-05" "GNOME"
.SH NAME
-GNOME Character map \- Unicode character picker and font browser
+gucharmap \- Unicode character picker and font browser
.SH SYNOPSIS
.B gucharmap
.RI [ OPTION... ]
Added: desktop/experimental/gucharmap/debian/gucharmap.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/gucharmap.links?rev=17886&op=file
==============================================================================
--- desktop/experimental/gucharmap/debian/gucharmap.links (added)
+++ desktop/experimental/gucharmap/debian/gucharmap.links Tue Dec 9 17:13:28 2008
@@ -1,0 +1,2 @@
+usr/share/man/man1/gucharmap.1.gz usr/share/man/man1/charmap.1.gz
+usr/share/man/man1/gucharmap.1.gz usr/share/man/man1/gnome-character-map.1.gz
Copied: desktop/experimental/gucharmap/debian/libgucharmap2-dev.install (from r17885, desktop/experimental/gucharmap/debian/libgucharmap-dev.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/libgucharmap2-dev.install?rev=17886&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/libgucharmap-dev.install (original)
+++ desktop/experimental/gucharmap/debian/libgucharmap2-dev.install Tue Dec 9 17:13:28 2008
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/gucharmap/*
+debian/tmp/usr/include/gucharmap-2/
debian/tmp/usr/lib/libgucharmap*.so
debian/tmp/usr/lib/pkgconfig/
Propchange: desktop/experimental/gucharmap/debian/libgucharmap2-dev.install
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: desktop/experimental/gucharmap/debian/libgucharmap7.install
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: desktop/experimental/gucharmap/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/rules?rev=17886&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/rules (original)
+++ desktop/experimental/gucharmap/debian/rules Tue Dec 9 17:13:28 2008
@@ -1,9 +1,6 @@
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
# Copyright © 2003 Colin Walters <walters at verbum.org>
-
-# ensure gucharmap is built after libgucharmap6
-binary/gucharmap:: binary/libgucharmap6
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
@@ -12,7 +9,12 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+libgucharmap := $(shell sed -nr 's/^Package:[[:space:]]*(libgucharmap[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+
DEB_SHLIBDEPS_INCLUDE_gucharmap += debian/libgucharmap6/usr/lib/
+
+# ensure gucharmap is built after libgucharmap
+binary/gucharmap:: binary/$(libgucharmap)
clean::
rm -f intltool-extract intltool-merge intltool-update
@@ -22,4 +24,4 @@
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_libgucharmap6 += -V 'libgucharmap6 (>= 1:2.22.0)'
+DEB_DH_MAKESHLIBS_ARGS_$(libgucharmap) += -V '$(libgucharmap) (>= 1:2.24.0)'
Modified: desktop/experimental/gucharmap/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/watch?rev=17886&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/watch (original)
+++ desktop/experimental/gucharmap/debian/watch Tue Dec 9 17:13:28 2008
@@ -1,4 +1,3 @@
version=2
http://download.gnome.org/sources/gucharmap/([\d\.]+)[02468]/ \
- gucharmap-(.*)\.tar\.gz \
- debian uupdate
+ gucharmap-(.*)\.tar\.gz
More information about the pkg-gnome-commits
mailing list