[Pkg-xfce-commits] r5217 - desktop/trunk/exo/debian

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Thu Mar 31 04:57:21 UTC 2011


Author: mrpouit-guest
Date: 2011-03-31 16:57:14 +0000 (Thu, 31 Mar 2011)
New Revision: 5217

Modified:
   desktop/trunk/exo/debian/changelog
Log:
cleanup duplicate entries from the merge

Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog	2011-03-31 13:57:52 UTC (rev 5216)
+++ desktop/trunk/exo/debian/changelog	2011-03-31 16:57:14 UTC (rev 5217)
@@ -17,82 +17,8 @@
 
 exo (0.6.0-1) experimental; urgency=low
 
-  * New upstream release.
-  * debian/patches:
-    - 01_fix-treeview-gtk2.20.patch dropped, included upstream.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 23 May 2010 13:26:28 +0200
-
-exo (0.3.107-1) unstable; urgency=low
-
-  * debian/control:
-    - drop debhelper build-conflict, not supported for that purpose and 8.1.0
-      is not available anywhere anymore anyway.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 20 Feb 2011 18:43:40 +0100
-
-exo (0.3.106-2) unstable; urgency=low
-
-  [ Lionel Le Folgoc ]
-  * debian/control: fix typos in exo-utils-dbg and libexo-common long descs.
-  * debian/patches:
-    - 01_fix-treeview-gtk2.20.patch: make the treeview work again with gtk 2.20
-      (Xfce #6230, lp: #520118, closes: #576706).
-    - series: add this patch.
-  * debian/control:
-    - add myself to Uploaders.
-
-  [Stefan Ott]
-  * debian/watch edited to track Xfce archive reorganisation.
-
   [ Yves-Alexis Perez ]
-  * debian/control:
-    - update standards version to 3.8.4.
-    - add ${misc:Depends} to Depends.
-    - update conflicts relation forms.
-  * switch format to 3.0 (quilt).
-
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 11 May 2010 23:26:05 +0200
-
-exo (0.3.106-1) unstable; urgency=low
-
   * New upstream release.
-  * debian/control:
-    - fix typo in -dbg long description.                        closes: #557529
-    - drop build-dep on quilt.
-    - update Homepage url to point to xfce.org.
-  * debian/patches:
-    - 01_mount-async dropped, merged upstream.
-  * debian/rules:
-    - drop quilt rules.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 12 Dec 2009 16:06:26 +0100
-
-exo (0.3.105-3) unstable; urgency=low
-
-  * debian/control:
-    - add an exo-utils-dbg package containing debug symbols for the exo-utils
-      binaries.
-  * debian/rules:
-    - use variables for library name, soversion and version.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 19 Oct 2009 14:30:01 +0200
-
-exo (0.3.105-2) unstable; urgency=low
-
-  * debian/control:
-    - add build-dep on quilt
-  * debian/rules:
-    - call {,un}patch targets when needed, include quilt rules.
-  * debian/patches:
-    - 01_mount-async added, don't mount all volumes with sync.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 18 Oct 2009 23:20:26 +0200
-
-exo (0.3.105-1) unstable; urgency=low
-
-  * New upstream release.
-=======
     - this releases doesn't use HAL anymore.                    closes: #604793
   * debian/rules:
     - adapt rules to changed soname.
@@ -215,7 +141,6 @@
 exo (0.3.105-1) unstable; urgency=low
 
   * New upstream release.
->>>>>>> .merge-right.r5159
   * add a new libexo-common packages containing mount options file,
     documentation, helper files.
   * debian/rules:




More information about the Pkg-xfce-commits mailing list