rev 19768 - in kde-extras/digikam/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2013-12-15 11:49:20 +0000 (Sun, 15 Dec 2013)
New Revision: 19768

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/patches/changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff
   kde-extras/digikam/trunk/debian/rules
Log:
Pull upstream changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2013-12-15 07:01:33 UTC (rev 19767)
+++ kde-extras/digikam/trunk/debian/changelog	2013-12-15 11:49:20 UTC (rev 19768)
@@ -1,12 +1,10 @@
-digikam (4:4.0.0~beta1-1) UNRELEASED; urgency=low
+digikam (4:4.0.0~beta1-1) experimental; urgency=low
 
-  * NOT RELEASED YET
   * New upstream release
   * quilt refresh sendimages-icedove.diff
-  * Pull upstream
-    +changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff
+  * Pull upstream changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff
 
- -- Mark Purcell <msp at debian.org>  Wed, 11 Dec 2013 20:02:59 +1100
+ -- Mark Purcell <msp at debian.org>  Sun, 15 Dec 2013 22:15:27 +1100
 
 digikam (4:3.5.0-3) unstable; urgency=low
 

Modified: kde-extras/digikam/trunk/debian/patches/changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff	2013-12-15 07:01:33 UTC (rev 19767)
+++ kde-extras/digikam/trunk/debian/patches/changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff	2013-12-15 11:49:20 UTC (rev 19768)
@@ -6,8 +6,8 @@
 
 diff --git a/libs/widgets/metadata/exifwidget.cpp b/libs/widgets/metadata/exifwidget.cpp
 index 5bd0e04..23729ca 100644
---- a/libs/widgets/metadata/exifwidget.cpp
-+++ b/libs/widgets/metadata/exifwidget.cpp
+--- a/core/libs/widgets/metadata/exifwidget.cpp
++++ b/core/libs/widgets/metadata/exifwidget.cpp
 @@ -112,7 +112,7 @@ bool ExifWidget::decodeMetadata()
      }
  
@@ -19,8 +19,8 @@
  
 diff --git a/libs/widgets/metadata/xmpwidget.cpp b/libs/widgets/metadata/xmpwidget.cpp
 index d14a471..6e0690d 100644
---- a/libs/widgets/metadata/xmpwidget.cpp
-+++ b/libs/widgets/metadata/xmpwidget.cpp
+--- a/core/libs/widgets/metadata/xmpwidget.cpp
++++ b/core/libs/widgets/metadata/xmpwidget.cpp
 @@ -123,7 +123,7 @@ bool XmpWidget::decodeMetadata()
      }
  

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2013-12-15 07:01:33 UTC (rev 19767)
+++ kde-extras/digikam/trunk/debian/rules	2013-12-15 11:49:20 UTC (rev 19768)
@@ -33,7 +33,6 @@
 	rm -r --verbose debian/tmp/usr/lib/cmake
 	rm -r --verbose debian/tmp/usr/lib/pkgconfig
 	rm --verbose debian/tmp/usr/lib/*.so
-	rm --verbose debian/tmp/usr/lib/*.a
 	# remove potentially conflicting oxygen icons in global icon theme
 	rm -r --verbose debian/tmp/usr/share/icons/oxygen
 	# remove libkipi translations, provided by kde-l10n-*