r32226 - in /packages/experimental/gnome-documents/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Tue Dec 20 10:08:05 UTC 2011
Author: biebl
Date: Tue Dec 20 10:08:04 2011
New Revision: 32226
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32226
Log:
* Move libgdprivate and typelib file out of the system directories into a
package private directory:
- Add debian/patches/01-privlib.patch.
- Use dh-autoreconf to update the build system.
- Stop splitting libgdprivate into separate binary packages.
Added:
packages/experimental/gnome-documents/debian/patches/01-privlib.patch
packages/experimental/gnome-documents/debian/patches/02-no-gettext.patch
Removed:
packages/experimental/gnome-documents/debian/gir1.2-gd-1.0.install
packages/experimental/gnome-documents/debian/gnome-documents.install
packages/experimental/gnome-documents/debian/libgdprivate-1.0-0.install
packages/experimental/gnome-documents/debian/libgdprivate-dev.install
Modified:
packages/experimental/gnome-documents/debian/changelog
packages/experimental/gnome-documents/debian/control
packages/experimental/gnome-documents/debian/control.in
packages/experimental/gnome-documents/debian/patches/series
packages/experimental/gnome-documents/debian/rules
Modified: packages/experimental/gnome-documents/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-documents/debian/changelog?rev=32226&op=diff
==============================================================================
--- packages/experimental/gnome-documents/debian/changelog [utf-8] (original)
+++ packages/experimental/gnome-documents/debian/changelog [utf-8] Tue Dec 20 10:08:04 2011
@@ -2,6 +2,11 @@
* debian/watch:
- Track .xz tarballs.
+ * Move libgdprivate and typelib file out of the system directories into a
+ package private directory:
+ - Add debian/patches/01-privlib.patch.
+ - Use dh-autoreconf to update the build system.
+ - Stop splitting libgdprivate into separate binary packages.
-- Michael Biebl <biebl at debian.org> Sun, 20 Nov 2011 18:57:56 +0100
Modified: packages/experimental/gnome-documents/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-documents/debian/control?rev=32226&op=diff
==============================================================================
--- packages/experimental/gnome-documents/debian/control [utf-8] (original)
+++ packages/experimental/gnome-documents/debian/control [utf-8] Tue Dec 20 10:08:04 2011
@@ -7,10 +7,11 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Jeremy Bicha <jbicha at ubuntu.com>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Jeremy Bicha <jbicha at ubuntu.com>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: cdbs (>= 0.4.41),
gnome-pkg-tools (>= 0.10),
gnome-common,
+ dh-autoreconf,
debhelper (>= 8),
gir1.2-gdata-0.0,
gobject-introspection,
@@ -35,49 +36,11 @@
Depends: ${shlibs:Depends},
${misc:Depends},
gir1.2-gdata-0.0,
- gir1.2-gd-1.0,
gir1.2-gtkclutter-1.0,
gir1.2-tracker-0.12,
- tracker (>= 0.12.0)
+ tracker (>= 0.12.0),
+ gjs
Recommends: unoconv
Description: Document manager for GNOME
GNOME Documents is a standalone application to find, organize and view
your documents.
-
-Package: libgdprivate-1.0-0
-Section: libs
-Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends}
-Description: Utility library for GNOME Documents
- This library is used by GNOME Documents.
-
-Package: libgdprivate-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends},
- gir1.2-gd-1.0 (= ${binary:Version}),
- libgdprivate-1.0-0 (= ${binary:Version})
-Description: Utility library for GNOME Documents
- This package provides the include files and static library for GNOME
- Documents.
-
-Package: gir1.2-gd-1.0
-Section: libs
-Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends},
- ${gir:Depends}
-Description: Introspection data for GNOME Documents
- This package contains introspection data for GNOME Documents. It
- can be used by packages using the GIRepository format to generate
- dynamic bindings.
-
-Package: libgdprivate-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libgdprivate-1.0-0 (= ${binary:Version}),
- ${misc:Depends}
-Description: Utility library for GNOME Documents (debug symbols)
- This package contains the debugging symbols for libgnome-documents.
Modified: packages/experimental/gnome-documents/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-documents/debian/control.in?rev=32226&op=diff
==============================================================================
--- packages/experimental/gnome-documents/debian/control.in [utf-8] (original)
+++ packages/experimental/gnome-documents/debian/control.in [utf-8] Tue Dec 20 10:08:04 2011
@@ -6,6 +6,7 @@
Build-Depends: cdbs (>= 0.4.41),
gnome-pkg-tools (>= 0.10),
gnome-common,
+ dh-autoreconf,
debhelper (>= 8),
gir1.2-gdata-0.0,
gobject-introspection,
@@ -30,7 +31,6 @@
Depends: ${shlibs:Depends},
${misc:Depends},
gir1.2-gdata-0.0,
- gir1.2-gd-1.0,
gir1.2-gtkclutter-1.0,
gir1.2-tracker-0.12,
tracker (>= 0.12.0)
@@ -38,41 +38,3 @@
Description: Document manager for GNOME
GNOME Documents is a standalone application to find, organize and view
your documents.
-
-Package: libgdprivate-1.0-0
-Section: libs
-Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends}
-Description: Utility library for GNOME Documents
- This library is used by GNOME Documents.
-
-Package: libgdprivate-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends},
- gir1.2-gd-1.0 (= ${binary:Version}),
- libgdprivate-1.0-0 (= ${binary:Version})
-Description: Utility library for GNOME Documents
- This package provides the include files and static library for GNOME
- Documents.
-
-Package: gir1.2-gd-1.0
-Section: libs
-Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends},
- ${gir:Depends}
-Description: Introspection data for GNOME Documents
- This package contains introspection data for GNOME Documents. It
- can be used by packages using the GIRepository format to generate
- dynamic bindings.
-
-Package: libgdprivate-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libgdprivate-1.0-0 (= ${binary:Version}),
- ${misc:Depends}
-Description: Utility library for GNOME Documents (debug symbols)
- This package contains the debugging symbols for libgnome-documents.
Added: packages/experimental/gnome-documents/debian/patches/01-privlib.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-documents/debian/patches/01-privlib.patch?rev=32226&op=file
==============================================================================
--- packages/experimental/gnome-documents/debian/patches/01-privlib.patch (added)
+++ packages/experimental/gnome-documents/debian/patches/01-privlib.patch [utf-8] Tue Dec 20 10:08:04 2011
@@ -1,0 +1,63 @@
+Index: gnome-documents-0.2.1/src/Makefile-lib.am
+===================================================================
+--- gnome-documents-0.2.1.orig/src/Makefile-lib.am 2011-10-13 16:48:18.000000000 +0200
++++ gnome-documents-0.2.1/src/Makefile-lib.am 2011-12-20 03:26:33.923345592 +0100
+@@ -21,11 +21,14 @@
+ lib/gd-two-lines-renderer.c \
+ $(NULL)
+
+-lib_LTLIBRARIES += libgdprivate-1.0.la
++pkglib_LTLIBRARIES += libgdprivate-1.0.la
+
+ libgdprivate_1_0_la_LIBADD = \
+ $(DOCUMENTS_LIBS)
+
++libgdprivate_1_0_la_LDFLAGS = \
++ -avoid-version
++
+ libgdprivate_1_0_la_CPPFLAGS = \
+ $(gdprivate_cflags)
+
+Index: gnome-documents-0.2.1/src/Makefile.am
+===================================================================
+--- gnome-documents-0.2.1.orig/src/Makefile.am 2011-10-13 16:48:18.000000000 +0200
++++ gnome-documents-0.2.1/src/Makefile.am 2011-12-20 03:25:43.327347380 +0100
+@@ -8,13 +8,13 @@
+ -DGNOME_DOCUMENTS_TOP_SRCDIR=\"$(abs_top_srcdir)\" \
+ -DGNOME_DOCUMENTS_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 =
+Index: gnome-documents-0.2.1/src/gnome-documents.in
+===================================================================
+--- gnome-documents-0.2.1.orig/src/gnome-documents.in 2011-10-13 16:48:18.000000000 +0200
++++ gnome-documents-0.2.1/src/gnome-documents.in 2011-12-20 03:25:43.331347383 +0100
+@@ -7,9 +7,15 @@
+ 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
+
+ /usr/bin/env gjs -I @pkgdatadir@/js -c "const Main = imports.main; Main.start();"
Added: packages/experimental/gnome-documents/debian/patches/02-no-gettext.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-documents/debian/patches/02-no-gettext.patch?rev=32226&op=file
==============================================================================
--- packages/experimental/gnome-documents/debian/patches/02-no-gettext.patch (added)
+++ packages/experimental/gnome-documents/debian/patches/02-no-gettext.patch [utf-8] Tue Dec 20 10:08:04 2011
@@ -1,0 +1,14 @@
+diff --git a/configure.ac b/configure.ac
+index c41a7de..84809cf 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
Modified: packages/experimental/gnome-documents/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-documents/debian/patches/series?rev=32226&op=diff
==============================================================================
--- packages/experimental/gnome-documents/debian/patches/series [utf-8] (original)
+++ packages/experimental/gnome-documents/debian/patches/series [utf-8] Tue Dec 20 10:08:04 2011
@@ -1,1 +1,3 @@
+01-privlib.patch
+02-no-gettext.patch
90_drop-onlyshowin.patch
Modified: packages/experimental/gnome-documents/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-documents/debian/rules?rev=32226&op=diff
==============================================================================
--- packages/experimental/gnome-documents/debian/rules [utf-8] (original)
+++ packages/experimental/gnome-documents/debian/rules [utf-8] Tue Dec 20 10:08:04 2011
@@ -2,6 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.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-version.mk
@@ -13,9 +14,10 @@
DEB_CONFIGURE_EXTRA_FLAGS +=
+DEB_DH_MAKESHLIBS_ARGS += -X/usr/lib/gnome-documents
+
# List any files which are not installed
common-binary-post-install-arch:: list-missing
-DEB_DH_MAKESHLIBS_ARGS_libgnome-documents0 += -V -- -c4
-
-DEB_DH_STRIP_ARGS_libgnome-documents0 += --dbg-package=libgnome-documents-dbg
+binary-install/gnome-documents::
+ find debian/$(cdbs_curpkg) -name '*.la' -delete
More information about the pkg-gnome-commits
mailing list