[Pkg-cli-apps-commits] [SCM] Packaging for f-spot branch, master, updated. debian/0.6.0.0-1-7-gebc833b

[Iain Lane]

The following commit has been merged in the master branch:
commit 88320c79ccb6bc432bf0a0cfd8eb4937eb3cd737
Author: Iain Lane <laney at ubuntu.com>
Date:   Sat Aug 29 14:31:36 2009 +0100

    New Upstream Version 0.6.1.1
    
    * New Upstream Version 0.6.1.1
      - some files were missing from the tarball
      - fix SendEmail for thunderbird3beta
    * New Upstream Version 0.6.1.0
      - fix some crashers
      - reduce the both the package size and installed size by a few Megs
      - works on gtk+ > 2.17
      - load .pcx files
      - extendable slideshow
      - ~30 bugs fixed
      - updated translations
    * debian/patches/debian_link-system-flickrnet.patch,
      debian/patches/debian_link-system-gnome-keyring.patch
      debian/patches/debian_link-system-mono-addins.patch
      debian/patches/ubuntu_nofuse_fix_photo_import.patch: Update to apply cleanly

diff --git a/debian/changelog b/debian/changelog
index 24042d0..416e07f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+f-spot (0.6.1.1-1) karmic; urgency=low
+
+  * New Upstream Version 0.6.1.1
+    - some files were missing from the tarball
+    - fix SendEmail for thunderbird3beta
+  * New Upstream Version 0.6.1.0
+    - fix some crashers
+    - reduce the both the package size and installed size by a few Megs
+    - works on gtk+ > 2.17
+    - load .pcx files
+    - extendable slideshow
+    - ~30 bugs fixed
+    - updated translations
+  * debian/patches/debian_link-system-flickrnet.patch,
+    debian/patches/debian_link-system-gnome-keyring.patch
+    debian/patches/debian_link-system-mono-addins.patch
+    debian/patches/ubuntu_nofuse_fix_photo_import.patch: Update to apply cleanly
+
+
+ -- Iain Lane <laney at ubuntu.com>  Sat, 29 Aug 2009 14:21:00 +0100
+
 f-spot (0.6.0.0-1) unstable; urgency=low
 
   * New Upstream Version 0.6.0.0
diff --git a/debian/patches/debian_link-system-flickrnet.patch b/debian/patches/debian_link-system-flickrnet.patch
index 26ab182..6b585b2 100644
--- a/debian/patches/debian_link-system-flickrnet.patch
+++ b/debian/patches/debian_link-system-flickrnet.patch
@@ -8,7 +8,7 @@
 @DPATCH@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -323,7 +323,6 @@
+@@ -318,7 +318,6 @@
  extensions/Exporters/CDExport/Makefile
  extensions/Exporters/DefaultExporters/Makefile
  extensions/Exporters/FlickrExport/Makefile
@@ -18,15 +18,15 @@
  extensions/Exporters/FolderExport/Makefile
 --- a/extensions/Exporters/FlickrExport/Makefile.am
 +++ b/extensions/Exporters/FlickrExport/Makefile.am
-@@ -19,16 +19,13 @@
- 	$(LINK_GPHOTO2)				\
+@@ -20,16 +20,13 @@
  	$(LINK_GIOSHARP)				\
  	$(LINK_GTKSHARPBEANS)		\
+ 	$(LINK_DBUS)				\
 -	-r:FlickrNet/FlickrNet.dll	\
  	-r:Mono.Posix
  
  PKGS =					\
-+	-pkg:flickrnet-2.1.5		\
++    -pkg:flickrnet-2.1.5    \
  	-pkg:gtk-sharp-2.0		\
  	-pkg:glade-sharp-2.0
  
@@ -36,7 +36,7 @@
  RESOURCES =				\
  	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
  	-resource:$(srcdir)/$(PLUGIN_NAME).glade
-@@ -39,7 +36,6 @@
+@@ -40,7 +37,6 @@
  	mautil p $(PLUGIN_ASSEMBLY)
  
  $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
diff --git a/debian/patches/debian_link-system-gnome-keyring.patch b/debian/patches/debian_link-system-gnome-keyring.patch
index 63110b0..b676dd0 100644
--- a/debian/patches/debian_link-system-gnome-keyring.patch
+++ b/debian/patches/debian_link-system-gnome-keyring.patch
@@ -6,7 +6,7 @@
 
 --- a/Makefile.include
 +++ b/Makefile.include
-@@ -22,7 +22,7 @@
+@@ -18,7 +18,7 @@
  
  ## Links
  
diff --git a/debian/patches/debian_link-system-mono-addins.patch b/debian/patches/debian_link-system-mono-addins.patch
index f758653..fdb3898 100644
--- a/debian/patches/debian_link-system-mono-addins.patch
+++ b/debian/patches/debian_link-system-mono-addins.patch
@@ -17,7 +17,7 @@
  DIR_DOCS = $(top_builddir)/docs
  DIR_EXTENSIONS = $(top_builddir)/extensions
  DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-@@ -28,10 +25,10 @@
+@@ -24,10 +21,10 @@
  LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
@@ -30,8 +30,8 @@
 +	-pkg:mono-addins-setup		\
 +	-pkg:mono-addins-gui
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = 								\
- 	-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll				\
+ LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+ LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
 --- a/configure.ac
 +++ b/configure.ac
 @@ -302,10 +302,6 @@
@@ -43,8 +43,8 @@
 -lib/mono-addins/Mono.Addins/Makefile
 -lib/mono-addins/Mono.Addins.Setup/Makefile
  lib/semweb/Makefile
- lib/Tao/Makefile
- lib/Tao/Tao.GlPostProcess/Makefile
+ docs/Makefile
+ icons/Makefile
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
 @@ -10,7 +10,6 @@
@@ -52,6 +52,6 @@
  	libfspot			\
  	libgphoto2-sharp	\
 -	mono-addins			\
- 	semweb				\
- 	Tao
+ 	semweb
  
+ # Depending on whether the packaged ndesk-dbus is used, we might not want to
diff --git a/debian/patches/ubuntu_nofuse_fix_photo_import.patch b/debian/patches/ubuntu_nofuse_fix_photo_import.patch
index f293507..53b88b9 100644
--- a/debian/patches/ubuntu_nofuse_fix_photo_import.patch
+++ b/debian/patches/ubuntu_nofuse_fix_photo_import.patch
@@ -9,7 +9,7 @@
 +++ b/f-spot-import.desktop.in
 @@ -15,3 +15,4 @@
  X-GNOME-Bugzilla-Component=General
- X-GNOME-Bugzilla-Version=0.6.0.0
+ X-GNOME-Bugzilla-Version=0.6.1.1
  X-GNOME-DocPath=f-spot/f-spot.xml
 +X-GIO-NoFuse=true
 --- a/f-spot-import.desktop.in.in

-- 
Packaging for f-spot