[svn-buildpackage] Tagging gnome-shell-extensions 3.8.2-1

2013-05-23 08:11:09 +00:00
9 changed files with 12 additions and 121 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,66 +1,3 @@
-gnome-shell-extensions (3.12.0-1) experimental; urgency=low
-
-  [ Jean Schurger ]
-  * New upstream release (3.10.1)
-  * debian/rules: remove one of the 'windowsNavigator' extension listed twice
-    and the 'alternative-system-menu' extension (does not exists anymore)
-  * debian/copyright: Update 'Format:' line
-
-  [ Andreas Henriksson ]
-  * New upstream release (3.12.0)
-  * debian/local/gnome-session-classic,
-    debian/patches/gnome-session-classic-wrapper-script.patch:
-    - update script to include new GNOME_SHELL_SESSION_MODE env variable
-      and update patch to apply again.
-
- -- Andreas Henriksson <andreas@fatal.se>  Fri, 04 Apr 2014 21:43:18 +0200
-
-gnome-shell-extensions (3.8.4-2) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 13 Oct 2013 18:11:33 +0200
-
-gnome-shell-extensions (3.8.4-1) experimental; urgency=low
-
-  [ Jeremy Bicha ]
-  * New upstream release
-  * Dropped patches applied in new version:
-    - fix-hibernate.patch
-    - fix-applications-menu-resolution-change.patch
-    - look-in-data-home-for-themes.patch
-
-  [ Michael Biebl ]
-  * Add a wrapper script to start the GNOME Classic session as currently
-    Xsession doesn't allow to run gnome-session with custom arguments due to
-    #653327.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 11 Oct 2013 18:55:23 +0200
-
-gnome-shell-extensions (3.8.3.1-1) experimental; urgency=low
-
-  [ Jeremy Bicha ]
-  * New upstream release
-    - default-min-max and static-workspaces extensions have been dropped.
-      Use Classic Mode or tweak org.gnome.shell.overrides in dconf-editor
-  * debian/control.in:
-    - Depend on gnome-session 3.8, required for the new Classic mode.
-    - Update homepage
-  * debian/patches/dont-require-nautilus-classic.patch:
-    - Don't require nautilus-classic since it forces desktop icons
-  * debian/patches/fix-applications-menu-resolution-change.patch:
-    - Backport commit to not break applications menu when screen resolution
-      changes
-  * debian/patches/fix-hibernate.patch:
-    - Backport patch to fix checking whether hibernate is allowed
-  * debian/patches/look-in-data-home-for-themes.patch:
-    - Backport commit to also look in XDG_DATA_HOME (usually ~/.local/share/)
-      for user themes
-  * debian/rules:
-    - Run autoreconf
-
- -- Andreas Henriksson <andreas@fatal.se>  Fri, 16 Aug 2013 20:25:30 +0200
-
 gnome-shell-extensions (3.8.2-1) experimental; urgency=low

  * Team upload
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Source: gnome-shell-extensions
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Victor Seva <linuxmaniac@torreviejawireless.org>, Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Michael Biebl <biebl@debian.org>
+Uploaders: Victor Seva <linuxmaniac@torreviejawireless.org>, Michael Biebl <biebl@debian.org>
 Build-Depends: debhelper (>= 8.0.0),
               cdbs,
               dh-autoreconf,
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 8.0.0),
               libgnome-desktop-3-dev (>= 3.2.0),
               libgtop2-dev (>= 2.28.3)
 Standards-Version: 3.9.4
-Homepage: https://wiki.gnome.org/GnomeShell/Extensions
+Homepage: http://live.gnome.org/GnomeShell/Extensions
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-shell-extensions
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gnome-shell-extensions

@@ -27,8 +27,7 @@ Depends: ${misc:Depends},
         gnome-shell (>= ${gnome:Version}),
         gnome-shell (<< ${gnome:NextVersion}),
         gir1.2-gtop-2.0,
-         gvfs (>= 1.16.0),
-         gnome-session (>= 3.8)
+         gvfs (>= 1.16.0)
 Recommends: gnome-tweak-tool (>= ${gnome:Version})
 Description: Extensions to extend functionality of GNOME Shell
 The GNOME Shell redefines user interactions with the GNOME desktop. In
--- a/debian/control.in
+++ b/debian/control.in
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 8.0.0),
               libgnome-desktop-3-dev (>= 3.2.0),
               libgtop2-dev (>= 2.28.3)
 Standards-Version: 3.9.4
-Homepage: https://wiki.gnome.org/GnomeShell/Extensions
+Homepage: http://live.gnome.org/GnomeShell/Extensions
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-shell-extensions
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gnome-shell-extensions

@@ -22,8 +22,7 @@ Depends: ${misc:Depends},
         gnome-shell (>= ${gnome:Version}),
         gnome-shell (<< ${gnome:NextVersion}),
         gir1.2-gtop-2.0,
-         gvfs (>= 1.16.0),
-         gnome-session (>= 3.8)
+         gvfs (>= 1.16.0)
 Recommends: gnome-tweak-tool (>= ${gnome:Version})
 Description: Extensions to extend functionality of GNOME Shell
 The GNOME Shell redefines user interactions with the GNOME desktop. In
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: http://dep.debian.net/deps/dep5
 Upstream-Name: gnome-shell-extensions
 Upstream-Contact: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
 Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell-extensions/
--- a/debian/local/gnome-session-classic
+++ b/debian/local/gnome-session-classic
@@ -1,2 +0,0 @@
-#! /bin/sh
-env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic "$@"
--- a/debian/patches/dont-require-nautilus-classic.patch
+++ b/debian/patches/dont-require-nautilus-classic.patch
@@ -1,13 +0,0 @@
-Description: Don't use nautilus-classic since it forces desktop icons
-Author: Jeremy Bicha <jbicha@ubuntu.com>
-Bug: https://bugzilla.gnome.org/695088
-
-Index: gnome-shell-extensions-3.8.3.1/data/gnome-classic.session.desktop.in.in
-===================================================================
--- gnome-shell-extensions-3.8.3.1.orig/data/gnome-classic.session.desktop.in.in	2013-06-17 15:42:43.000000000 -0400
-+++ gnome-shell-extensions-3.8.3.1/data/gnome-classic.session.desktop.in.in	2013-06-19 10:31:47.900318151 -0400
-@@ -1,3 +1,3 @@
- [GNOME Session]
- _Name=GNOME Classic
-RequiredComponents=gnome-shell-classic;gnome-settings-daemon;nautilus-classic;
-+RequiredComponents=gnome-shell-classic;gnome-settings-daemon;
--- a/debian/patches/gnome-session-classic-wrapper-script.patch
+++ b/debian/patches/gnome-session-classic-wrapper-script.patch
@@ -1,25 +0,0 @@
-Description: Use a wrapper script to start GNOME classic session
- Xsession currently doesn't allow to pass more then one argument, as it
- otherwise fails with
- Xsession: unable to launch "gnome-session --session classic" X session ---
- "gnome-session --session classic" not found; falling back to default session.
- .
- This is due to [1]. Add a wrapper script to start the GNOME classic session
- as a workaround. Once [1] is fixed, this should be removed again.
- .
- [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653327.
-Author: Michael Biebl <biebl@debian.org>
-
-Index: gnome-shell-extensions-3.8.4/data/gnome-classic.desktop.in
-===================================================================
--- gnome-shell-extensions-3.8.4.orig/data/gnome-classic.desktop.in	2013-07-16 13:12:50.000000000 +0200
-+++ gnome-shell-extensions-3.8.4/data/gnome-classic.desktop.in	2013-10-11 18:45:36.749513420 +0200
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=GNOME Classic
- _Comment=This session logs you into GNOME Classic
-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
-+Exec=gnome-session-classic
- TryExec=gnome-session
- Icon=
- Type=Application
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-dont-require-nautilus-classic.patch
-gnome-session-classic-wrapper-script.patch
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f

-include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
@@ -8,15 +7,14 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk

 EXTENSIONS_ENABLED="alternate-tab auto-move-windows workspace-indicator\
- native-window-placement user-theme apps-menu drive-menu places-menu\
- windowsNavigator systemMonitor launch-new-instance window-list"
+ alternative-status-menu native-window-placement user-theme\
+ apps-menu drive-menu places-menu windowsNavigator systemMonitor\
+ default-min-max launch-new-instance static-workspaces window-list\
+ windowsNavigator"

 EXTENSIONS_DISABLED="example xrandr-indicator"

 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-extensions=$(EXTENSIONS_ENABLED) \
-	--enable-classic-mode
-
-binary-install/gnome-shell-extensions::
-	install -m 755 -D debian/local/gnome-session-classic \
-		debian/$(cdbs_curpkg)/usr/bin/gnome-session-classic
+	--enable-classic-mode \
+	$(NULL)