From a4fffa22737e89c1fc4833d078eb79c72d37a2c5 Mon Sep 17 00:00:00 2001
From: Gustavo Franco <stratus@debian.org>
Date: Fri, 1 Dec 2006 18:42:03 +0000
Subject: [PATCH]   * debian/control:     - Set Maintainer field to me.     -
 Set Uploaders to current debian-desktop members.   * debian/control.in:
 removed

---
 debian/changelog  |  9 +++++++++
 debian/control    |  4 ++--
 debian/control.in | 19 -------------------
 3 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 debian/control.in

diff --git a/debian/changelog b/debian/changelog
index 3436405..ff8ecff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+desktop-base (0.3.21) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Set Maintainer field to me.
+    - Set Uploaders to current debian-desktop members.
+  * debian/control.in: removed
+
+ -- Gustavo Franco <stratus@debian.org>  Fri,  1 Dec 2006 16:35:08 -0200
+
 desktop-base (0.3.20) unstable; urgency=high
 
   [ Yves-Alexis Perez ]
diff --git a/debian/control b/debian/control
index 85dc4f4..96f0934 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: desktop-base
 Section: x11
 Priority: optional
-Maintainer: Gustavo Noronha Silva <kov@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Clément Stenac <zorglub@debian.org>, Dafydd Harries <daf@debian.org>, Guilherme de S. Pastore <gpastore@debian.org>, Gustavo Franco <stratus@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Marc 'HE' Brockschmidt <he@debian.org>, Marco Cabizza <marco87@gmail.com>, Oystein Gisnas <oystein@gisnas.net>, Ondřej Surý <ondrej@debian.org>, Ross Burton <ross@debian.org>, Sebastien Bacher <seb128@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Maintainer: Gustavo Franco <stratus@debian.org>
+Uploaders: Loïc Minier <lool@dooz.org>, Fathi Boudra <fboudra@free.fr>, Yves-Alexis Perez <corsac@corsac.net>
 Build-Depends: cdbs, debhelper (>= 5.0.13), gnome-pkg-tools
 Standards-Version: 3.7.2
 
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 769cdef..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: desktop-base
-Section: x11
-Priority: optional
-Maintainer: Gustavo Noronha Silva <kov@debian.org>
-Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs, debhelper (>= 5.0.13), gnome-pkg-tools
-Standards-Version: 3.7.2
-
-Package: desktop-base
-Architecture: all
-Recommends: epiphany-browser | konqueror | www-browser
-Suggests: gnome | kde | xfce4 | wmaker
-Description: common files for the Debian Desktop
- This package contains various miscellaneous files which are used by
- Debian Desktop installations.  Currently, it provides some
- Debian-related artwork and themes, .desktop files containing links to
- Debian related material (suitable for placement on a user's desktop),
- and other common files between the available desktop environments
- such as GNOME and KDE.