r33898 - in /desktop/unstable/gnome-sushi/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sun Apr 1 03:41:46 UTC 2012
Author: biebl
Date: Sun Apr 1 03:41:45 2012
New Revision: 33898
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33898
Log:
* Don't install the private libsushi library and its introspection files
system wide as they are not supposed to be used outside of sushi.
* Drop all binary packages besides gnome-sushi.
* Add the necessary Breaks/Replaces for proper upgrades.
* Use dh-autoreconf to update the build system.
Added:
desktop/unstable/gnome-sushi/debian/patches/
desktop/unstable/gnome-sushi/debian/patches/01-privlib.patch
desktop/unstable/gnome-sushi/debian/patches/02-no-gettext.patch
desktop/unstable/gnome-sushi/debian/patches/series
Removed:
desktop/unstable/gnome-sushi/debian/gir1.2-sushi-1.0.install
desktop/unstable/gnome-sushi/debian/gnome-sushi-common.install
desktop/unstable/gnome-sushi/debian/gnome-sushi.install
desktop/unstable/gnome-sushi/debian/libsushi-1.0-0.install
desktop/unstable/gnome-sushi/debian/libsushi-1.0-dev.install
Modified:
desktop/unstable/gnome-sushi/debian/changelog
desktop/unstable/gnome-sushi/debian/control
desktop/unstable/gnome-sushi/debian/control.in
desktop/unstable/gnome-sushi/debian/rules
Modified: desktop/unstable/gnome-sushi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/changelog?rev=33898&op=diff
==============================================================================
--- desktop/unstable/gnome-sushi/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-sushi/debian/changelog [utf-8] Sun Apr 1 03:41:45 2012
@@ -1,8 +1,13 @@
gnome-sushi (0.4.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Don't install the private libsushi library and its introspection files
+ system wide as they are not supposed to be used outside of sushi.
+ * Drop all binary packages besides gnome-sushi.
+ * Add the necessary Breaks/Replaces for proper upgrades.
+ * Use dh-autoreconf to update the build system.
- -- Michael Biebl <biebl at debian.org> Sun, 01 Apr 2012 04:56:09 +0200
+ -- Michael Biebl <biebl at debian.org> Sun, 01 Apr 2012 05:37:48 +0200
gnome-sushi (0.3.92-1) experimental; urgency=low
Modified: desktop/unstable/gnome-sushi/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/control?rev=33898&op=diff
==============================================================================
--- desktop/unstable/gnome-sushi/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-sushi/debian/control [utf-8] Sun Apr 1 03:41:45 2012
@@ -11,6 +11,7 @@
Build-Depends: debhelper (>= 8.0.0),
autotools-dev,
cdbs (>= 0.4.90~),
+ dh-autoreconf,
gnome-pkg-tools (>= 0.11),
gobject-introspection (>= 0.9.6),
intltool,
@@ -36,12 +37,12 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- gnome-sushi-common (= ${source:Version}),
- libsushi-1.0-0 (= ${binary:Version}),
- gir1.2-sushi-1.0 (= ${binary:Version}),
+ ${gir:Depends},
nautilus (>= 3.2),
gir1.2-clutter-gst-1.0,
gir1.2-gtkclutter-1.0
+Breaks: gnome-sushi-common (<< 0.4.0-1)
+Replaces: gnome-sushi-common (<< 0.4.0-1)
Description: sushi is a quick previewer for nautilus
Sushi is a GtkClutter and Javascript-based quick previewer
for Nautilus, the GNOME desktop file manager.
@@ -51,77 +52,3 @@
.
To activate the preview, left-click the file and hit space.
The preview can be closed by hitting space again, or escape.
- .
- This package contains the main executable.
-
-Package: gnome-sushi-common
-Architecture: all
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: common files for sushi.
- Sushi is a GtkClutter and Javascript-based quick previewer
- for Nautilus, the GNOME desktop file manager.
- Sushi is a DBus-activated service. It is capable of previewing
- documents, PDFs, sound and video files (using Gstreamer),
- some text files, and possibly others in the future.
- .
- This package contains arch-independent files located in /usr/share.
-
-Package: libsushi-1.0-0
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: shared libs provided by sushi
- Sushi is a GtkClutter and Javascript-based quick previewer
- for Nautilus, the GNOME desktop file manager.
- Sushi is a DBus-activated service. It is capable of previewing
- documents, PDFs, sound and video files (using Gstreamer),
- some text files, and possibly others in the future.
- .
- This package contains Sushi's shared libs.
-
-Package: gir1.2-sushi-1.0
-Architecture: any
-Section: introspection
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${gir:Depends}
-Description: sushi's typelib files
- Sushi is a GtkClutter and Javascript-based quick previewer
- for Nautilus, the GNOME desktop file manager.
- Sushi is a DBus-activated service. It is capable of previewing
- documents, PDFs, sound and video files (using Gstreamer),
- some text files, and possibly others in the future.
- .
- This package contains Sushi's Typelib file.
-
-Package: libsushi-1.0-dev
-Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libsushi-1.0-0 (= ${binary:Version}),
- gir1.2-sushi-1.0 (= ${binary:Version})
-Description: development files for sushi
- Sushi is a GtkClutter and Javascript-based quick previewer
- for Nautilus, the GNOME desktop file manager.
- Sushi is a DBus-activated service. It is capable of previewing
- documents, PDFs, sound and video files (using Gstreamer),
- some text files, and possibly others in the future.
- .
- This package contains Sushi's development files.
-
-Package: libsushi-1.0-0-dbg
-Architecture: any
-Section: debug
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libsushi-1.0-0 (= ${binary:Version})
-Description: debugging symbols for libsushi0
- Sushi is a GtkClutter and Javascript-based quick previewer
- for Nautilus, the GNOME desktop file manager.
- Sushi is a DBus-activated service. It is capable of previewing
- documents, PDFs, sound and video files (using Gstreamer),
- some text files, and possibly others in the future.
- .
- This package contains Sushi's debugging symbols.
Modified: desktop/unstable/gnome-sushi/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/control.in?rev=33898&op=diff
==============================================================================
--- desktop/unstable/gnome-sushi/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-sushi/debian/control.in [utf-8] Sun Apr 1 03:41:45 2012
@@ -6,6 +6,7 @@
Build-Depends: debhelper (>= 8.0.0),
autotools-dev,
cdbs (>= 0.4.90~),
+ dh-autoreconf,
gnome-pkg-tools (>= 0.11),
gobject-introspection (>= 0.9.6),
intltool,
@@ -31,12 +32,12 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- gnome-sushi-common (= ${source:Version}),
- libsushi-1.0-0 (= ${binary:Version}),
- gir1.2-sushi-1.0 (= ${binary:Version}),
+ ${gir:Depends},
nautilus (>= 3.2),
gir1.2-clutter-gst-1.0,
gir1.2-gtkclutter-1.0
+Breaks: gnome-sushi-common (<< 0.4.0-1)
+Replaces: gnome-sushi-common (<< 0.4.0-1)
Description: sushi is a quick previewer for nautilus
Sushi is a GtkClutter and Javascript-based quick previewer
for Nautilus, the GNOME desktop file manager.
@@ -46,77 +47,3 @@
.
To activate the preview, left-click the file and hit space.
The preview can be closed by hitting space again, or escape.
- .
- This package contains the main executable.
-
-Package: gnome-sushi-common
-Architecture: all
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: common files for sushi.
- Sushi is a GtkClutter and Javascript-based quick previewer
- for Nautilus, the GNOME desktop file manager.
- Sushi is a DBus-activated service. It is capable of previewing
- documents, PDFs, sound and video files (using Gstreamer),
- some text files, and possibly others in the future.
- .
- This package contains arch-independent files located in /usr/share.
-
-Package: libsushi-1.0-0
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: shared libs provided by sushi
- Sushi is a GtkClutter and Javascript-based quick previewer
- for Nautilus, the GNOME desktop file manager.
- Sushi is a DBus-activated service. It is capable of previewing
- documents, PDFs, sound and video files (using Gstreamer),
- some text files, and possibly others in the future.
- .
- This package contains Sushi's shared libs.
-
-Package: gir1.2-sushi-1.0
-Architecture: any
-Section: introspection
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${gir:Depends}
-Description: sushi's typelib files
- Sushi is a GtkClutter and Javascript-based quick previewer
- for Nautilus, the GNOME desktop file manager.
- Sushi is a DBus-activated service. It is capable of previewing
- documents, PDFs, sound and video files (using Gstreamer),
- some text files, and possibly others in the future.
- .
- This package contains Sushi's Typelib file.
-
-Package: libsushi-1.0-dev
-Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libsushi-1.0-0 (= ${binary:Version}),
- gir1.2-sushi-1.0 (= ${binary:Version})
-Description: development files for sushi
- Sushi is a GtkClutter and Javascript-based quick previewer
- for Nautilus, the GNOME desktop file manager.
- Sushi is a DBus-activated service. It is capable of previewing
- documents, PDFs, sound and video files (using Gstreamer),
- some text files, and possibly others in the future.
- .
- This package contains Sushi's development files.
-
-Package: libsushi-1.0-0-dbg
-Architecture: any
-Section: debug
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libsushi-1.0-0 (= ${binary:Version})
-Description: debugging symbols for libsushi0
- Sushi is a GtkClutter and Javascript-based quick previewer
- for Nautilus, the GNOME desktop file manager.
- Sushi is a DBus-activated service. It is capable of previewing
- documents, PDFs, sound and video files (using Gstreamer),
- some text files, and possibly others in the future.
- .
- This package contains Sushi's debugging symbols.
Added: desktop/unstable/gnome-sushi/debian/patches/01-privlib.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/patches/01-privlib.patch?rev=33898&op=file
==============================================================================
--- desktop/unstable/gnome-sushi/debian/patches/01-privlib.patch (added)
+++ desktop/unstable/gnome-sushi/debian/patches/01-privlib.patch [utf-8] Sun Apr 1 03:41:45 2012
@@ -1,0 +1,63 @@
+diff --git a/src/Makefile-sushi.am b/src/Makefile-sushi.am
+index feca2db..bb311a5 100644
+--- a/src/Makefile-sushi.am
++++ b/src/Makefile-sushi.am
+@@ -53,11 +53,14 @@ sushi-enum-types.c: stamp-sushi-enum-types.h libsushi/sushi-enum-types.c.in
+ cp xgen-betc sushi-enum-types.c && \
+ rm -f xgen-betc
+
+-lib_LTLIBRARIES += libsushi-1.0.la
++pkglib_LTLIBRARIES += libsushi-1.0.la
+
+ libsushi_1_0_la_LIBADD = \
+ $(SUSHI_LIBS)
+
++libsushi_1_0_la_LDFLAGS = \
++ -avoid-version
++
+ libsushi_1_0_la_CPPFLAGS = \
+ $(sushi_cflags)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3683789..3188a60 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -8,13 +8,13 @@ AM_CPPFLAGS = \
+ -DSUSHI_TOP_SRCDIR=\"$(abs_top_srcdir)\" \
+ -DSUSHI_BUILDDIR=\"$(abs_top_builddir)\"
+
+-girdir = $(datadir)/gir-1.0
+-typelibdir = $(libdir)/girepository-1.0
++girdir = $(pkgdatadir)/gir-1.0
++typelibdir = $(pkglibdir)/girepository-1.0
+
+ BUILT_SOURCES =
+ EXTRA_DIST =
+ CLEANFILES =
+-lib_LTLIBRARIES =
++pkglib_LTLIBRARIES =
+ INTROSPECTION_GIRS =
+ gir_DATA =
+ typelib_DATA =
+diff --git a/src/sushi.in b/src/sushi.in
+index c22fe98..e170972 100644
+--- a/src/sushi.in
++++ b/src/sushi.in
+@@ -7,9 +7,15 @@ else
+ fi
+
+ if test x"$GI_TYPELIB_PATH" = x ; then
+- export GI_TYPELIB_PATH=@libdir@/girepository-1.0
++ export GI_TYPELIB_PATH=@pkglibdir@/girepository-1.0
+ else
+- export GI_TYPELIB_PATH=@libdir@/girepository-1.0:$GI_TYPELIB_PATH
++ export GI_TYPELIB_PATH=@pkglibdir@/girepository-1.0:$GI_TYPELIB_PATH
++fi
++
++if test x"$LD_LIBRARY_PATH" = x ; then
++ export LD_LIBRARY_PATH=@pkglibdir@
++else
++ export LD_LIBRARY_PATH=@pkglibdir@:$LD_LIBRARY_PATH
+ fi
+
+ @libexecdir@/sushi-start
Added: desktop/unstable/gnome-sushi/debian/patches/02-no-gettext.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/patches/02-no-gettext.patch?rev=33898&op=file
==============================================================================
--- desktop/unstable/gnome-sushi/debian/patches/02-no-gettext.patch (added)
+++ desktop/unstable/gnome-sushi/debian/patches/02-no-gettext.patch [utf-8] Sun Apr 1 03:41:45 2012
@@ -1,0 +1,14 @@
+diff --git a/configure.ac b/configure.ac
+index b00f31f..ae53499 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,9 +21,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext d
+ IT_PROG_INTLTOOL(0.40.0)
+ PKG_PROG_PKG_CONFIG([0.22])
+
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
+-
+ GOBJECT_INTROSPECTION_REQUIRE([0.9.6])
+
+ ## don't rerun to this point if we abort
Added: desktop/unstable/gnome-sushi/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/patches/series?rev=33898&op=file
==============================================================================
--- desktop/unstable/gnome-sushi/debian/patches/series (added)
+++ desktop/unstable/gnome-sushi/debian/patches/series [utf-8] Sun Apr 1 03:41:45 2012
@@ -1,0 +1,2 @@
+01-privlib.patch
+02-no-gettext.patch
Modified: desktop/unstable/gnome-sushi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/rules?rev=33898&op=diff
==============================================================================
--- desktop/unstable/gnome-sushi/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-sushi/debian/rules [utf-8] Sun Apr 1 03:41:45 2012
@@ -3,6 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
@@ -10,7 +11,10 @@
# List any files which are not installed
common-binary-post-install-arch:: list-missing
-DEB_DH_MAKESHLIBS_ARGS_libsushi-1.0-0 += -V -- -c4
+GNOME_MODULE := sushi
-DEB_DH_STRIP_ARGS := --dbg-package=libsushi-1.0-0-dbg
-GNOME_MODULE := sushi
+DEB_DH_MAKESHLIBS_ARGS += -X/usr/lib/sushi
+DEB_DH_GIREPOSITORY_ARGS_ALL += -ldebian/gnome-sushi/usr/share/sushi/gir-1.0 /usr/lib/sushi/ /usr/lib/sushi/girepository-1.0/
+
+binary-install/gnome-sushi::
+ find debian/$(cdbs_curpkg) -name '*.la' -delete
More information about the pkg-gnome-commits
mailing list