[Pkg-cli-apps-commits] r3543 - in /packages/f-spot/trunk/debian: changelog control patches/00list patches/fix_libfspot_linkage.dpatch patches/fix_libfspoteog_linkage.dpatch patches/fix_libfspotjpegtran_linkage.dpatch rules

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Sun Dec 9 23:52:12 UTC 2007 

Author: meebey
Date: Sun Dec  9 23:52:12 2007
New Revision: 3543

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3543
Log:
- fix linking (I wonder if anyone used the libraries as so many references are missing).


Added:
    packages/f-spot/trunk/debian/patches/fix_libfspot_linkage.dpatch   (with props)
    packages/f-spot/trunk/debian/patches/fix_libfspoteog_linkage.dpatch   (with props)
    packages/f-spot/trunk/debian/patches/fix_libfspotjpegtran_linkage.dpatch   (with props)
Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/control
    packages/f-spot/trunk/debian/patches/00list
    packages/f-spot/trunk/debian/rules

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3543&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Sun Dec  9 23:52:12 2007
@@ -3,7 +3,20 @@
   [ Mirco Bauer ]
   * Added myself to Uploaders.
   * Updated cli-common-dev build-dependency to >= 0.4.4.
-
+  * Updated Standards-Version to 3.7.3, no changed needed.
+  * debian/patches/01_build-system.dpatch:
+    + Disabled as upstream allows to link against system ndesk-dbus now.
+  * debian/patches/10_cs-changes.dpatch:
+    + Disabled as PicasaWeb export, .kdc file support and sqlite3 handling are
+      already fixed upstream.
+  * Added beagle-dev to build-dependencies for beagle support.
+  * debian/patches/fix_libfspot_linkage.dpatch
+    debian/patches/fix_libfspoteog_linkage.dpatch
+    debian/patches/fix_libfspotjpegtran_linkage.dpatch:
+    + Created patch to link correctly against used libraries.
+  * debian/rules:
+    + Pass --as-needed to linker for lesser dependencies.
+  
   [ Tim Retout ]
   * New upstream version. (Closes: #436298, #446409)
   * New maintainer. (Closes: #453474)

Modified: packages/f-spot/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/control?rev=3543&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/control (original)
+++ packages/f-spot/trunk/debian/control Sun Dec  9 23:52:12 2007
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Tim Retout <tim at retout.co.uk>, Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 5.0.0), cdbs, mono-gmcs (>= 1.1.17) | c-sharp-2.0-compiler, cli-common-dev (>= 0.4.4), libgnome2.0-cil (>= 2.7.90), libxml-parser-perl, libmono-dev (>= 1.1.2), libgnomeui-dev, libexif-dev (>= 0.6.12), libsqlite3-dev, libgphoto2-2-dev (>= 2.1.4), liblcms1-dev, libmono-sqlite2.0-cil, libmono-system-runtime2.0-cil, libmono-cairo2.0-cil, libusb-dev, gnome-doc-utils (>= 0.3.2), libgl1-mesa-dev | libgl-dev, libndesk-dbus1.0-cil, libndesk-dbus-glib1.0-cil, gnome-screensaver, libgconf2.0-cil, libglade2.0-cil, docbook-xml
-Standards-Version: 3.7.2
-Homepage: http://f-spot.org/
-Vcs-SVN: http://svn.debian.org/svn/pkg-cli-apps/packages/f-spot/trunk/
+Build-Depends: debhelper (>= 5.0.0), cdbs, mono-gmcs (>= 1.1.17) | c-sharp-2.0-compiler, cli-common-dev (>= 0.4.4), libgnome2.0-cil (>= 2.7.90), libxml-parser-perl, libmono-dev (>= 1.1.2), libgnomeui-dev, libexif-dev (>= 0.6.12), libsqlite3-dev, libgphoto2-2-dev (>= 2.1.4), liblcms1-dev, libmono-sqlite2.0-cil, libmono-system-runtime2.0-cil, libmono-cairo2.0-cil, libusb-dev, gnome-doc-utils (>= 0.3.2), libgl1-mesa-dev | libgl-dev, libndesk-dbus1.0-cil, libndesk-dbus-glib1.0-cil, gnome-screensaver, libgconf2.0-cil, libglade2.0-cil, beagle-dev, docbook-xml
+Standards-Version: 3.7.3
+Homepage: http://www.f-spot.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/f-spot/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/
 
 Package: f-spot

Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3543&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Sun Dec  9 23:52:12 2007
@@ -1,4 +1,4 @@
-01_build-system
-02_autoreconf
-10_cs-changes
 11_screensaver-path
+fix_libfspot_linkage
+fix_libfspoteog_linkage
+fix_libfspotjpegtran_linkage

Added: packages/f-spot/trunk/debian/patches/fix_libfspot_linkage.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/fix_libfspot_linkage.dpatch?rev=3543&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/fix_libfspot_linkage.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/fix_libfspot_linkage.dpatch Sun Dec  9 23:52:12 2007
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_libfspot_linkage.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad f-spot-0.4.1~/libfspot/Makefile.am f-spot-0.4.1/libfspot/Makefile.am
+--- f-spot-0.4.1~/libfspot/Makefile.am	2007-12-10 00:15:27.000000000 +0100
++++ f-spot-0.4.1/libfspot/Makefile.am	2007-12-10 00:17:55.000000000 +0100
+@@ -30,6 +30,8 @@
+ 	f-utils.h
+ 
+ libfspot_la_LIBADD = 					\
++	-lX11						\
++	$(F_LIBS)					\
+ 	$(LCMS_LIBS)					\
+ 	$(EXIF_LIBS)					\
+ 	$(top_builddir)/libjpegtran/libfspotjpegtran.la	\
+diff -urNad f-spot-0.4.1~/libfspot/Makefile.in f-spot-0.4.1/libfspot/Makefile.in
+--- f-spot-0.4.1~/libfspot/Makefile.in	2007-12-10 00:15:27.000000000 +0100
++++ f-spot-0.4.1/libfspot/Makefile.in	2007-12-10 00:18:11.000000000 +0100
+@@ -311,6 +311,8 @@
+ 	f-utils.h
+ 
+ libfspot_la_LIBADD = \
++	-lX11						\
++	$(F_LIBS)					\
+ 	$(LCMS_LIBS)					\
+ 	$(EXIF_LIBS)					\
+ 	$(top_builddir)/libjpegtran/libfspotjpegtran.la	\

Propchange: packages/f-spot/trunk/debian/patches/fix_libfspot_linkage.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/f-spot/trunk/debian/patches/fix_libfspoteog_linkage.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/fix_libfspoteog_linkage.dpatch?rev=3543&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/fix_libfspoteog_linkage.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/fix_libfspoteog_linkage.dpatch Sun Dec  9 23:52:12 2007
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_libfspoteog_linkage.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad f-spot-0.4.1~/libeog/Makefile.am f-spot-0.4.1/libeog/Makefile.am
+--- f-spot-0.4.1~/libeog/Makefile.am	2007-12-10 00:06:42.000000000 +0100
++++ f-spot-0.4.1/libeog/Makefile.am	2007-12-10 00:07:08.000000000 +0100
+@@ -44,6 +44,7 @@
+ 
+ libfspoteog_la_SOURCES = $(libfspoteog_files)
+ 
++libfspoteog_la_LIBADD = $(F_LIBS) $(LCMS_LIBS)
+ 
+ # GLib marshalling cruft
+ 
+diff -urNad f-spot-0.4.1~/libeog/Makefile.in f-spot-0.4.1/libeog/Makefile.in
+--- f-spot-0.4.1~/libeog/Makefile.in	2007-12-10 00:06:42.000000000 +0100
++++ f-spot-0.4.1/libeog/Makefile.in	2007-12-10 00:07:15.000000000 +0100
+@@ -51,7 +51,7 @@
+ am__installdirs = "$(DESTDIR)$(fspotlibdir)"
+ fspotlibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(fspotlib_LTLIBRARIES)
+-libfspoteog_la_LIBADD =
++libfspoteog_la_LIBADD = $(F_LIBS) $(LCMS_LIBS)
+ am__objects_1 = access.lo accessible-image-view-factory.lo \
+ 	accessible-image-view.lo eog-file-selection.lo eog-image.lo \
+ 	eog-pixbuf-util.lo eog-scroll-view.lo image-view.lo \

Propchange: packages/f-spot/trunk/debian/patches/fix_libfspoteog_linkage.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/f-spot/trunk/debian/patches/fix_libfspotjpegtran_linkage.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/fix_libfspotjpegtran_linkage.dpatch?rev=3543&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/fix_libfspotjpegtran_linkage.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/fix_libfspotjpegtran_linkage.dpatch Sun Dec  9 23:52:12 2007
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_libfspotjpegtran_linkage.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad f-spot-0.4.1~/libjpegtran/Makefile.am f-spot-0.4.1/libjpegtran/Makefile.am
+--- f-spot-0.4.1~/libjpegtran/Makefile.am	2007-12-04 13:19:23.000000000 +0100
++++ f-spot-0.4.1/libjpegtran/Makefile.am	2007-12-09 23:51:33.000000000 +0100
+@@ -18,5 +18,6 @@
+ libfspotjpegtran_la_SOURCES =			\
+ 	$(libfspotjpegtran_files)
+ 
++libfspotjpegtran_la_LIBADD = $(F_LIBS)
+ 
+ EXTRA_DIST = README
+diff -urNad f-spot-0.4.1~/libjpegtran/Makefile.in f-spot-0.4.1/libjpegtran/Makefile.in
+--- f-spot-0.4.1~/libjpegtran/Makefile.in	2007-12-04 13:20:33.000000000 +0100
++++ f-spot-0.4.1/libjpegtran/Makefile.in	2007-12-09 23:52:08.000000000 +0100
+@@ -51,7 +51,7 @@
+ am__installdirs = "$(DESTDIR)$(fspotlibdir)"
+ fspotlibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(fspotlib_LTLIBRARIES)
+-libfspotjpegtran_la_LIBADD =
++libfspotjpegtran_la_LIBADD = $(F_LIBS)
+ am__objects_1 = jpeg-data.lo jpeg-marker.lo jpegtran.lo transupp.lo
+ am_libfspotjpegtran_la_OBJECTS = $(am__objects_1)
+ libfspotjpegtran_la_OBJECTS = $(am_libfspotjpegtran_la_OBJECTS)

Propchange: packages/f-spot/trunk/debian/patches/fix_libfspotjpegtran_linkage.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/f-spot/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/rules?rev=3543&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/rules (original)
+++ packages/f-spot/trunk/debian/rules Sun Dec  9 23:52:12 2007
@@ -1,7 +1,7 @@
 #! /usr/bin/make -f
 
+#export DH_VERBOSE=1
 export MONO_SHARED_DIR=$(CURDIR)
-export DH_VERBOSE=1
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
@@ -11,16 +11,10 @@
 
 export DEB_DH_MAKESHLIBS_ARGS="-n"
 
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
-
 CFLAGS := -Wall -g
 
-# Ensure at build time that the library has no dependencies on undefined
-# symbols.
-LDFLAGS += -Wl,-z,defs
-
-# Speed up loading.
-LDFLAGS += -Wl,-O1
+DEB_CONFIGURE_SCRIPT_ENV := LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
 
 common-configure-indep::
 	mkdir -p $(MONO_SHARED_DIR)/.wapi

More information about the Pkg-cli-apps-commits mailing list