r37789 - in /desktop/experimental/gnome-photos/debian: changelog control control.in copyright patches/90_drop-onlyshowin.patch patches/git-avoid-bashisms.patch patches/series

jbicha-guest at users.alioth.debian.org jbicha-guest at users.alioth.debian.org
Sat May 18 22:14:39 UTC 2013


Author: jbicha-guest
Date: Sat May 18 22:14:38 2013
New Revision: 37789

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37789
Log:
update to 3.8.2, update dependencies and copyright info
add git-avoid-bashisms.patch

Added:
    desktop/experimental/gnome-photos/debian/patches/git-avoid-bashisms.patch
Modified:
    desktop/experimental/gnome-photos/debian/changelog
    desktop/experimental/gnome-photos/debian/control
    desktop/experimental/gnome-photos/debian/control.in
    desktop/experimental/gnome-photos/debian/copyright
    desktop/experimental/gnome-photos/debian/patches/90_drop-onlyshowin.patch
    desktop/experimental/gnome-photos/debian/patches/series

Modified: desktop/experimental/gnome-photos/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-photos/debian/changelog?rev=37789&op=diff
==============================================================================
--- desktop/experimental/gnome-photos/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-photos/debian/changelog [utf-8] Sat May 18 22:14:38 2013
@@ -1,5 +1,5 @@
-gnome-photos (3.7.2-1) UNRELEASED; urgency=low
+gnome-photos (3.8.2-1) UNRELEASED; urgency=low
 
   * Initial release
 
- -- Jeremy Bicha <jbicha at ubuntu.com>  Wed, 07 Nov 2012 20:58:30 -0500
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Sat, 18 May 2013 18:14:44 -0400

Modified: desktop/experimental/gnome-photos/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-photos/debian/control?rev=37789&op=diff
==============================================================================
--- desktop/experimental/gnome-photos/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-photos/debian/control [utf-8] Sat May 18 22:14:38 2013
@@ -6,23 +6,23 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jeremy Bicha <jbicha at ubuntu.com>
+Uploaders: Jeremy Bicha <jbicha at ubuntu.com>
 Build-Depends: cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),
                gnome-common,
                dh-autoreconf,
                debhelper (>= 9),
-               libclutter-gtk-1.0-dev (>= 1.3.2),
                libexempi-dev (>= 1.99.5),
                libexif-dev (>= 0.6.14),
-               libglib2.0-dev (>= 2.28),
+               libgegl-dev,
+               libglib2.0-dev (>= 2.35.1),
                libgnome-desktop-3-dev,
                libgoa-1.0-dev (>= 3.4.0),
-               libgtk-3-dev (>= 3.4.0),
+               libgtk-3-dev (>= 3.8.0),
                liblcms2-dev,
                librsvg2-dev (>= 2.26.0),
-               libtracker-miner-0.14-dev (>= 0.14.0),
-               libtracker-sparql-0.14-dev (>= 0.14.0)
+               libtracker-miner-0.16-dev,
+               libtracker-sparql-0.16-dev
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/experimental/gnome-photos
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/gnome-photos/
@@ -31,6 +31,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Description: Basic photo manager for GNOME
- GNOME Photos is a simple standalone application to find, organize and
- view your photos.
+Description: Photo manager for GNOME
+ GNOME Photos is a simple standalone application to find, organize and view
+ your photos.

Modified: desktop/experimental/gnome-photos/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-photos/debian/control.in?rev=37789&op=diff
==============================================================================
--- desktop/experimental/gnome-photos/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-photos/debian/control.in [utf-8] Sat May 18 22:14:38 2013
@@ -8,17 +8,17 @@
                gnome-common,
                dh-autoreconf,
                debhelper (>= 9),
-               libclutter-gtk-1.0-dev (>= 1.3.2),
                libexempi-dev (>= 1.99.5),
                libexif-dev (>= 0.6.14),
-               libglib2.0-dev (>= 2.28),
+               libgegl-dev,
+               libglib2.0-dev (>= 2.35.1),
                libgnome-desktop-3-dev,
                libgoa-1.0-dev (>= 3.4.0),
-               libgtk-3-dev (>= 3.4.0),
+               libgtk-3-dev (>= 3.8.0),
                liblcms2-dev,
                librsvg2-dev (>= 2.26.0),
-               libtracker-miner-0.14-dev (>= 0.14.0),
-               libtracker-sparql-0.14-dev (>= 0.14.0)
+               libtracker-miner-0.16-dev,
+               libtracker-sparql-0.16-dev
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/experimental/gnome-photos
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/gnome-photos/
@@ -28,5 +28,5 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Description: Photo manager for GNOME
- GNOME Photos is a standalone application to find, organize and view
+ GNOME Photos is a simple standalone application to find, organize and view
  your photos.

Modified: desktop/experimental/gnome-photos/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-photos/debian/copyright?rev=37789&op=diff
==============================================================================
--- desktop/experimental/gnome-photos/debian/copyright [utf-8] (original)
+++ desktop/experimental/gnome-photos/debian/copyright [utf-8] Sat May 18 22:14:38 2013
@@ -3,26 +3,11 @@
 Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-photos/
 
 Files: *
-Copyright: 2012 Red Hat, Inc.
+Copyright: 2012-2013 Red Hat, Inc.
 License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 Files: libgd/*
-Copyright: 2011 Red Hat, Inc.
+Copyright: 2011-2013 Red Hat, Inc.
 License: LGPL-2.1+
  This package is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -40,3 +25,45 @@
  .
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in /usr/share/common-licenses/LGPL-2.1'.
+
+Files: src/eog-*
+Copyright: The Free Software Foundation
+License: GPL-2+
+
+Files: src/gegl-gtk*
+Copyright: 2011 Jon Nordby <jononor at gmail.com>
+           2003, 2004, 2006 Øyvind Kolås <pippin at gimp.org>
+License: LGPL-3+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-3'.
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.

Modified: desktop/experimental/gnome-photos/debian/patches/90_drop-onlyshowin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-photos/debian/patches/90_drop-onlyshowin.patch?rev=37789&op=diff
==============================================================================
--- desktop/experimental/gnome-photos/debian/patches/90_drop-onlyshowin.patch [utf-8] (original)
+++ desktop/experimental/gnome-photos/debian/patches/90_drop-onlyshowin.patch [utf-8] Sat May 18 22:14:38 2013
@@ -1,13 +1,13 @@
 Description: Show GNOME Photos in menus everywhere
 Author: Jeremy Bicha <jbicha at ubuntu.com>
-Index: gnome-photos-3.7.2/data/gnome-photos.desktop.in.in
+Index: gnome-photos-3.8.0/data/gnome-photos.desktop.in.in
 ===================================================================
---- gnome-photos-3.7.2.orig/data/gnome-photos.desktop.in.in	2012-04-30 16:25:00.000000000 -0400
-+++ gnome-photos-3.7.2/data/gnome-photos.desktop.in.in	2012-11-18 09:53:17.991567089 -0500
+--- gnome-photos-3.8.0.orig/data/gnome-photos.desktop.in.in	2012-11-18 13:46:35.000000000 -0500
++++ gnome-photos-3.8.0/data/gnome-photos.desktop.in.in	2013-04-15 15:49:54.488817893 -0400
 @@ -6,6 +6,5 @@
  StartupNotify=true
  Terminal=false
  Type=Application
--OnlyShowIn=GNOME
+-OnlyShowIn=GNOME;
  Categories=GNOME;GTK;Utility;Core;
  _Keywords=Photos;Pictures;

Added: desktop/experimental/gnome-photos/debian/patches/git-avoid-bashisms.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-photos/debian/patches/git-avoid-bashisms.patch?rev=37789&op=file
==============================================================================
--- desktop/experimental/gnome-photos/debian/patches/git-avoid-bashisms.patch (added)
+++ desktop/experimental/gnome-photos/debian/patches/git-avoid-bashisms.patch [utf-8] Sat May 18 22:14:38 2013
@@ -1,0 +1,45 @@
+From e94086c55d669e989b54b86f20458541e3598bba Mon Sep 17 00:00:00 2001
+From: Adam Dingle <adam at yorba.org>
+Date: Sun, 05 May 2013 19:55:10 +0000
+Subject: Avoid bash-specific syntax in photos-generate-about
+
+https://bugzilla.gnome.org/show_bug.cgi?id=698086
+---
+diff --git a/src/photos-generate-about b/src/photos-generate-about
+index e5fda33..48e4ee9 100755
+--- a/src/photos-generate-about
++++ b/src/photos-generate-about
+@@ -20,7 +20,7 @@
+ #
+ 
+ 
+-[[ "$1" = "--header" ]] &&
++[ "$1" = "--header" ] &&
+     echo "#ifndef PHOTOS_ABOUT_DATA_H" &&
+     echo "#define PHOTOS_ABOUT_DATA_H" &&
+     echo "#include <glib.h>" &&
+@@ -33,9 +33,9 @@
+ 
+ echo "const gchar *PHOTOS_ARTISTS[] = {"
+ while read line; do
+-    [[ $(echo "$line" | cut -c1) = "#" ]] &&
++    [ "$(echo "$line" | cut -c1)" = "#" ] &&
+         continue
+-    [[ ${#line} -eq 0 ]] &&
++    [ ${#line} -eq 0 ] &&
+         continue
+     echo "  \"$line\","
+ done < $2/ARTISTS
+@@ -44,9 +44,9 @@ echo "};"
+ 
+ echo "const gchar *PHOTOS_AUTHORS[] = {"
+ while read line; do
+-    [[ $(echo "$line" | cut -c1) = "#" ]] &&
++    [ "$(echo "$line" | cut -c1)" = "#" ] &&
+         continue
+-    [[ ${#line} -eq 0 ]] &&
++    [ ${#line} -eq 0 ] &&
+         continue
+     echo "  \"$line\","
+ done < $2/AUTHORS
+

Modified: desktop/experimental/gnome-photos/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-photos/debian/patches/series?rev=37789&op=diff
==============================================================================
--- desktop/experimental/gnome-photos/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-photos/debian/patches/series [utf-8] Sat May 18 22:14:38 2013
@@ -1,1 +1,2 @@
 90_drop-onlyshowin.patch
+git-avoid-bashisms.patch




More information about the pkg-gnome-commits mailing list