r20557 - in /desktop/unstable/rarian/debian: changelog control control.in patches/01_info_shortnames.patch patches/02_crash_no_extension.patch rules
pochu-guest at users.alioth.debian.org
pochu-guest at users.alioth.debian.org
Thu Jul 2 22:05:17 UTC 2009
Author: pochu-guest
Date: Thu Jul 2 22:05:03 2009
New Revision: 20557
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20557
Log:
* debian/patches/02_crash_no_extension.patch: Patch by Loïc Minier to
fix a crash when opening files without dots in their filename.
Closes: #535433.
* debian/rules: Reorder includes.
* debian/control.in: Wrap depends.
* Standards-Version is 3.8.2, no changes needed.
* Add Vcs-* fields.
* debian/control.in: Inherit the Section from the source stanza where
it's duplicated.
Added:
desktop/unstable/rarian/debian/patches/02_crash_no_extension.patch
Modified:
desktop/unstable/rarian/debian/changelog
desktop/unstable/rarian/debian/control
desktop/unstable/rarian/debian/control.in
desktop/unstable/rarian/debian/patches/01_info_shortnames.patch
desktop/unstable/rarian/debian/rules
Modified: desktop/unstable/rarian/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/rarian/debian/changelog?rev=20557&op=diff
==============================================================================
--- desktop/unstable/rarian/debian/changelog (original)
+++ desktop/unstable/rarian/debian/changelog Thu Jul 2 22:05:03 2009
@@ -1,3 +1,17 @@
+rarian (0.8.1-3) unstable; urgency=low
+
+ * debian/patches/02_crash_no_extension.patch: Patch by Loïc Minier to
+ fix a crash when opening files without dots in their filename.
+ Closes: #535433.
+ * debian/rules: Reorder includes.
+ * debian/control.in: Wrap depends.
+ * Standards-Version is 3.8.2, no changes needed.
+ * Add Vcs-* fields.
+ * debian/control.in: Inherit the Section from the source stanza where
+ it's duplicated.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com> Thu, 02 Jul 2009 23:56:34 +0200
+
rarian (0.8.1-2) unstable; urgency=low
* debian/*.dtd: ship the DTDs currently in the scrollkeeper package to
Modified: desktop/unstable/rarian/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/rarian/debian/control?rev=20557&op=diff
==============================================================================
--- desktop/unstable/rarian/debian/control (original)
+++ desktop/unstable/rarian/debian/control Thu Jul 2 22:05:03 2009
@@ -2,37 +2,46 @@
Section: doc
Priority: extra
Maintainer: Frederic Peters <fpeters 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,
debhelper (>= 5),
autotools-dev,
xsltproc,
xml-core (>= 0.06),
gnome-pkg-tools
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/rarian
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/rarian
Homepage: http://rarian.freedesktop.org/
Package: librarian0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Conflicts: yelp (<< 2.21)
Description: Rarian is a documentation meta-data library (library package)
Rarian (formerly Spoon) is a documentation meta-data library,
designed as a replacement for Scrollkeeper.
+ .
+ This package ships the shared library.
Package: librarian-dev
Section: libdevel
Architecture: any
-Depends: librarian0 (= ${binary:Version})
+Depends: ${misc:Depends},
+ librarian0 (= ${binary:Version})
Description: Rarian is a documentation meta-data library (header files)
Rarian (formerly Spoon) is a documentation meta-data library, designed
as a replacement for Scrollkeeper.
+ .
+ This packages ships the development files.
Package: rarian-compat
-Section: doc
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, docbook-xml
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ docbook-xml
Provides: scrollkeeper
Conflicts: scrollkeeper
Replaces: scrollkeeper
Modified: desktop/unstable/rarian/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/rarian/debian/control.in?rev=20557&op=diff
==============================================================================
--- desktop/unstable/rarian/debian/control.in (original)
+++ desktop/unstable/rarian/debian/control.in Thu Jul 2 22:05:03 2009
@@ -9,30 +9,39 @@
xsltproc,
xml-core (>= 0.06),
gnome-pkg-tools
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/rarian
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/rarian
Homepage: http://rarian.freedesktop.org/
Package: librarian0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Conflicts: yelp (<< 2.21)
Description: Rarian is a documentation meta-data library (library package)
Rarian (formerly Spoon) is a documentation meta-data library,
designed as a replacement for Scrollkeeper.
+ .
+ This package ships the shared library.
Package: librarian-dev
Section: libdevel
Architecture: any
-Depends: librarian0 (= ${binary:Version})
+Depends: ${misc:Depends},
+ librarian0 (= ${binary:Version})
Description: Rarian is a documentation meta-data library (header files)
Rarian (formerly Spoon) is a documentation meta-data library, designed
as a replacement for Scrollkeeper.
+ .
+ This packages ships the development files.
Package: rarian-compat
-Section: doc
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, docbook-xml
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ docbook-xml
Provides: scrollkeeper
Conflicts: scrollkeeper
Replaces: scrollkeeper
Modified: desktop/unstable/rarian/debian/patches/01_info_shortnames.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/rarian/debian/patches/01_info_shortnames.patch?rev=20557&op=diff
==============================================================================
--- desktop/unstable/rarian/debian/patches/01_info_shortnames.patch (original)
+++ desktop/unstable/rarian/debian/patches/01_info_shortnames.patch Thu Jul 2 22:05:03 2009
@@ -1,3 +1,5 @@
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=22602
+
--- librarian/rarian-info.c.orig 2008-09-02 16:38:09.982622444 +0200
+++ librarian/rarian-info.c 2008-09-02 17:07:36.206700155 +0200
@@ -665,8 +665,9 @@
Added: desktop/unstable/rarian/debian/patches/02_crash_no_extension.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/rarian/debian/patches/02_crash_no_extension.patch?rev=20557&op=file
==============================================================================
--- desktop/unstable/rarian/debian/patches/02_crash_no_extension.patch (added)
+++ desktop/unstable/rarian/debian/patches/02_crash_no_extension.patch Thu Jul 2 22:05:03 2009
@@ -1,0 +1,23 @@
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=22363
+
+Index: librarian/rarian-main.c
+===================================================================
+--- librarian/rarian-main.c (revision 62)
++++ librarian/rarian-main.c (working copy)
+@@ -294,10 +294,12 @@
+ char *suffix = NULL;
+
+ suffix = strrchr (full_name, '.');
+- if (!strcmp (suffix, ".document")) {
+- process_file (full_name);
+- } else if (!strcmp (suffix, ".section")) {
+- process_section (full_name);
++ if (suffix) {
++ if (!strcmp (suffix, ".document")) {
++ process_file (full_name);
++ } else if (!strcmp (suffix, ".section")) {
++ process_section (full_name);
++ }
+ }
+ } else if (S_ISDIR(buf.st_mode) && strcmp (dp->d_name, ".") &&
+ strcmp (dp->d_name, "..") &&
Modified: desktop/unstable/rarian/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/rarian/debian/rules?rev=20557&op=diff
==============================================================================
--- desktop/unstable/rarian/debian/rules (original)
+++ desktop/unstable/rarian/debian/rules Thu Jul 2 22:05:03 2009
@@ -1,13 +1,10 @@
#!/usr/bin/make -f
-# Gnome Team
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
DEB_CONFIGURE_EXTRA_FLAGS += --enable-skdb-update=no
DEB_DH_MAKESHLIBS_ARGS_librarian0 := -V 'librarian0 (>= 0.8.0)'
More information about the pkg-gnome-commits
mailing list