r43066 - in /desktop/unstable/vinagre/debian: changelog control control.in patches/ patches/revert-appstream-usage.patch patches/series

ah at users.alioth.debian.org ah at users.alioth.debian.org
Tue Sep 23 17:43:47 UTC 2014


Author: ah
Date: Tue Sep 23 17:43:47 2014
New Revision: 43066

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43066
Log:
* New upstream release.
* Update build-dependencies according to configure.ac changes:
  - Switch from libvte-2.90-dev to libvte-2.91-dev
  - Bump libfreerdp-dev to >= 1.1
* Drop gnome-icon-theme recommends
  - it's now called adwaita-icon-theme and we'll just rely on
    gtk+ pulling in a decent icon theme for us from now on.
* Drop debian/patches (all of them included in new upstream release)
  - 01_Use-FreeRDP-API-in-RDP.patch
  - 02_Request-RDP-certificate-verification.patch
  - 03_Avoid-yes-no-buttons-in-certificate-dialogs.patch
* Add debian/patches/revert-appstream-usage.patch
  - reverts upstream switch to appstream-glib which is not yet
    in Debian, see #752900

Added:
    desktop/unstable/vinagre/debian/patches/
    desktop/unstable/vinagre/debian/patches/revert-appstream-usage.patch
    desktop/unstable/vinagre/debian/patches/series
Modified:
    desktop/unstable/vinagre/debian/changelog
    desktop/unstable/vinagre/debian/control
    desktop/unstable/vinagre/debian/control.in

Modified: desktop/unstable/vinagre/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vinagre/debian/changelog?rev=43066&op=diff
==============================================================================
--- desktop/unstable/vinagre/debian/changelog	[utf-8] (original)
+++ desktop/unstable/vinagre/debian/changelog	[utf-8] Tue Sep 23 17:43:47 2014
@@ -1,3 +1,22 @@
+vinagre (3.14.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Update build-dependencies according to configure.ac changes:
+    - Switch from libvte-2.90-dev to libvte-2.91-dev
+    - Bump libfreerdp-dev to >= 1.1
+  * Drop gnome-icon-theme recommends
+    - it's now called adwaita-icon-theme and we'll just rely on
+      gtk+ pulling in a decent icon theme for us from now on.
+  * Drop debian/patches (all of them included in new upstream release)
+    - 01_Use-FreeRDP-API-in-RDP.patch
+    - 02_Request-RDP-certificate-verification.patch
+    - 03_Avoid-yes-no-buttons-in-certificate-dialogs.patch
+  * Add debian/patches/revert-appstream-usage.patch
+    - reverts upstream switch to appstream-glib which is not yet
+      in Debian, see #752900
+
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 23 Sep 2014 18:45:01 +0200
+
 vinagre (3.12.2-2) unstable; urgency=medium
 
   * d/p/01_Use-FreeRDP-API-in-RDP.patch,

Modified: desktop/unstable/vinagre/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vinagre/debian/control?rev=43066&op=diff
==============================================================================
--- desktop/unstable/vinagre/debian/control	[utf-8] (original)
+++ desktop/unstable/vinagre/debian/control	[utf-8] Tue Sep 23 17:43:47 2014
@@ -2,7 +2,6 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: vinagre
 Section: gnome
 Priority: optional
@@ -25,12 +24,12 @@
                libsecret-1-dev,
                valac (>= 0.12.0),
                yelp-tools,
-               libvte-2.90-dev (>= 0.20),
+               libvte-2.91-dev (>= 0.20),
                libxml2-dev (>= 2.6.31),
                libtelepathy-glib-dev (>= 0.11.6),
                openssh-client,
                docbook-xml,
-               libfreerdp-dev
+               libfreerdp-dev (>= 1.1)
 Standards-Version: 3.9.5
 Homepage: https://wiki.gnome.org/Apps/Vinagre
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/vinagre
@@ -40,8 +39,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Recommends: gnome-icon-theme,
-            freerdp-x11
+Recommends: freerdp-x11
 Description: remote desktop client for the GNOME Desktop
  Vinagre is a remote desktop client integrated into the GNOME Desktop.
  .

Modified: desktop/unstable/vinagre/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vinagre/debian/control.in?rev=43066&op=diff
==============================================================================
--- desktop/unstable/vinagre/debian/control.in	[utf-8] (original)
+++ desktop/unstable/vinagre/debian/control.in	[utf-8] Tue Sep 23 17:43:47 2014
@@ -20,12 +20,12 @@
                libsecret-1-dev,
                valac (>= 0.12.0),
                yelp-tools,
-               libvte-2.90-dev (>= 0.20),
+               libvte-2.91-dev (>= 0.20),
                libxml2-dev (>= 2.6.31),
                libtelepathy-glib-dev (>= 0.11.6),
                openssh-client,
                docbook-xml,
-               libfreerdp-dev
+               libfreerdp-dev (>= 1.1)
 Standards-Version: 3.9.5
 Homepage: https://wiki.gnome.org/Apps/Vinagre
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/vinagre
@@ -35,8 +35,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Recommends: gnome-icon-theme,
-            freerdp-x11
+Recommends: freerdp-x11
 Description: remote desktop client for the GNOME Desktop
  Vinagre is a remote desktop client integrated into the GNOME Desktop.
  .

Added: desktop/unstable/vinagre/debian/patches/revert-appstream-usage.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vinagre/debian/patches/revert-appstream-usage.patch?rev=43066&op=file
==============================================================================
--- desktop/unstable/vinagre/debian/patches/revert-appstream-usage.patch	(added)
+++ desktop/unstable/vinagre/debian/patches/revert-appstream-usage.patch	[utf-8] Tue Sep 23 17:43:47 2014
@@ -0,0 +1,64 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: revert to appdata
+
+This reverts upstream commit
+"Use APPSTREAM_XML instead of APPDATA_XML"
+
+
+diff --git a/Makefile.am b/Makefile.am
+index eebb8ce..09ff61e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ SUBDIRS = help po
+ 
+ DISTCHECK_CONFIGURE_FLAGS = \
+-	--enable-appstream-util \
++	--enable-appdata-validate \
+ 	--enable-compile-warnings=maximum \
+ 	--enable-rdp
+ 
+@@ -256,9 +256,9 @@ nodist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ mimedir = $(datadir)/mime/packages
+ nodist_mime_DATA = data/vinagre-mime.xml
+ 
+- at APPSTREAM_XML_RULES@
+-appstream_in_files = data/vinagre.appdata.xml.in
+-appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
++ at APPDATA_XML_RULES@
++appdata_in_files = data/vinagre.appdata.xml.in
++appdata_XML = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
+ 
+ gsettings_SCHEMAS = data/org.gnome.Vinagre.gschema.xml
+ 
+@@ -296,7 +296,7 @@ dist-changelog:
+ 	else rm -f .ChangeLog.tmp; exit 1; fi
+ 
+ dist_noinst_DATA = \
+-	$(appstream_in_files) \
++	$(appdata_in_files) \
+ 	$(noinst_vinagreh_headers) \
+ 	$(vinagre_vala_sources) \
+ 	vinagre/vinagre-vala.h \
+@@ -314,7 +314,7 @@ dist_noinst_DATA = \
+ 	vinagre.doap
+ 
+ CLEANFILES = \
+-	$(appstream_XML) \
++	$(appdata_XML) \
+ 	$(nodist_desktop_DATA) \
+ 	$(nodist_mime_DATA) \
+ 	$(nodist_pkgconfig_DATA) \
+diff --git a/configure.ac b/configure.ac
+index 2a351c1..0d3344d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -214,7 +214,7 @@ YELP_HELP_INIT
+ 
+ GLIB_GSETTINGS
+ 
+-APPSTREAM_XML
++APPDATA_XML
+ 
+ AC_CONFIG_FILES([
+ Makefile

Added: desktop/unstable/vinagre/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vinagre/debian/patches/series?rev=43066&op=file
==============================================================================
--- desktop/unstable/vinagre/debian/patches/series	(added)
+++ desktop/unstable/vinagre/debian/patches/series	[utf-8] Tue Sep 23 17:43:47 2014
@@ -0,0 +1 @@
+revert-appstream-usage.patch




More information about the pkg-gnome-commits mailing list