Merge lp:~ubuntu-branches/ubuntu/oneiric/gnome-tweak-tool/oneiric-201108220805 into lp:ubuntu/oneiric/gnome-tweak-tool

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/gnome-tweak-tool reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/gnome-tweak-tool/oneiric-201108220805. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

6. By Martin Pitt on 2011-08-22

releasing version 3.1.0-0ubuntu1

5. By Martin Pitt on 2011-08-22

* New upstream release.
  - Show in Unity also (LP: #803519)
  - New focus follows mouse tweak
  - New window focus mode tweak
  - New desktop item visibility tweaks
  - Window theme tweak moved to Interface panel
  - Change tweakgroup architecture
  - Translatable
  - Renamed in menus as 'Advanced Settings'
  - Change tweakgroup architecture
  - Translatable
  - Appearance improvements (theme install, sorted combo boxes)
  - Add a -v,--verbose option that prints changed settings
  - Add a -d,--debug option
* debian/control: Manually create m4 directory
* debian/patches/01_menu_category.patch: Refreshed
* debian/watch: Watch unstable releases also

=== modified file 'data/gnome-tweak-tool.desktop.in'
--- data/gnome-tweak-tool.desktop.in	2011-08-22 09:31:04 +0000
+++ data/gnome-tweak-tool.desktop.in	2011-08-22 08:10:26 +0000
@@ -6,5 +6,10 @@
 Terminal=false
 Type=Application
 StartupNotify=true
+<<<<<<< TREE
 Categories=GNOME;GTK;Settings;
 OnlyShowIn=GNOME;Unity;
+=======
+Categories=GNOME;GTK;Utility;
+OnlyShowIn=GNOME;Unity;
+>>>>>>> MERGE-SOURCE
 
=== modified file 'debian/control'
--- debian/control	2011-08-22 09:31:04 +0000
+++ debian/control	2011-08-22 08:10:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # This file is autogenerated. DO NOT EDIT!
 # 
 # Modifications should be made to debian/control.in instead.
@@ -32,3 +33,39 @@
  interest to ordinary users. This includes things like the fonts used in 
  user interface elements, alternative user interface themes, changes in 
  window management behaviour and others.
+=======
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
+Source: gnome-tweak-tool
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Uploaders: Josselin Mouette <[e-mail]>
+Build-Depends: debhelper (>= 7),
+               cdbs (>= 0.4.41),
+               gnome-pkg-tools,
+               gsettings-desktop-schemas-dev (>= 2.91.92),
+               python-gobject-dev (>= 2.28.0),
+               libgconf2-dev,
+               intltool (>= 0.40.0),
+               gettext (>= 0.17),
+               python (>= 2.6.5)
+Standards-Version: 3.9.2
+
+Package: gnome-tweak-tool
+Architecture: all
+Depends: ${python:Depends},
+         ${misc:Depends},
+         gnome-shell,
+         gsettings-desktop-schemas (>= 2.91.92)
+Description: tool to adjust advanced configuration settings for GNOME
+ GNOME Tweak Tool (pronounced [kræptuːl]) allows the adjustment of a 
+ number of GNOME configuration settings that is felt would not be of 
+ interest to ordinary users. This includes things like the fonts used in 
+ user interface elements, alternative user interface themes, changes in 
+ window management behaviour and others.
+>>>>>>> MERGE-SOURCE