[Pkg-cli-apps-commits] [SCM] tangerine branch, master, updated. upstream/0.3.2.2-34-g6250c7a

Tue Aug 18 13:40:09 UTC 2009

The following commit has been merged in the master branch:
commit 6250c7a14c6ea3a14dddbc22bf05e7b7a5ce03b8
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Tue Aug 18 21:39:07 2009 +0800

    Drop amarok patch and patch system

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 8646078..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
-    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-                export QUILT_PATCHES=debian/patches
-        fi
-    done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-    quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-    quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-    quilt add <file>
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-    quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-    quilt import -P <patch> /path/to/patch
-    quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-    quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
diff --git a/debian/changelog b/debian/changelog
index 4f42746..2d6f487 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,6 @@
 tangerine (0.3.2.2-1) UNRELEASED; urgency=low
 
   [ Jo Shields ]
-  * debian/patches/06_no_amarok.patch,
-    debian/control:
-    + Don't build Amarok support, we don't support Amarok 2
-      (Thanks to Scott Kitterman)
-    + Drop Amarok from Suggests
   * debian/control:
     + No-change bump to Standards 3.8.1
 
@@ -21,10 +16,10 @@ tangerine (0.3.2.2-1) UNRELEASED; urgency=low
       - Update order to reflect configure.ac order
       - Drop libavahi1.0-cil, libmono-sqlite2.0-cil, cdbs
       - Add banshee, libmono-zeroconf1.0-cil, libndesk-dbus-glib1.0-cil
-      - Use DH7 and quilt
+      - Use DH7
     + Add a debug package, tangerine-dbg
   * debian/rules:
-    + Rewrite to use DH7 and quilt
+    + Rewrite to use DH7
     + Clean up get-orig-source rule
     + Add some custom configure flags
     + Add dh_{,cli}strip overrides to strip into tangerine-dbg
@@ -38,18 +33,13 @@ tangerine (0.3.2.2-1) UNRELEASED; urgency=low
     + Added manpages for tangerine and tangerine-properties.
   * debian/tangerine.examples:
     + Install sample.conf as a sample conf file for ~/.tangerine
-  * debian/patches, debian/README.source:
-    + series: Use quilt
-    + 01_new-db4o.patch, 02_new-taglib-sharp.patch,
-      03_use_external_libs.patch, 04_fix_music_dir_delimiter.patch,
-      05_add_configurable_file_types.patch:
-      - Dropped, applied upstream
-    + 06_no_amarok.patch: Update and add DEP-3 header
-    + 99_autoreconf.patch: Dropped, no longer relevant
+  * debian/patches:
+    + Drop all patches, since they are either applied upstream or no
+      longer relevant.
   * debian/*.dll.config:
     + Dropped, no longer needed
 
- -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 16 Aug 2009 22:22:26 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 18 Aug 2009 21:38:02 +0800
 
 tangerine (0.3.0+dfsg-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index af3a5dc..7587858 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>,
            Sebastian Dröge <slomo at debian.org>,
            Chow Loong Jin <hyperair at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50),
-               quilt (>= 0.46-7~),
                mono-devel (>= 2.4.2),
                cli-common-dev (>= 0.5.7),
                pkg-config,
@@ -31,7 +30,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/tangerine.git
 Package: tangerine
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
-Suggests: banshee, beagle, rhythmbox
+Suggests: amarok (>= 2.0), banshee (>= 1.4.2), beagle (>= 0.1.4), rhythmbox
 Description: music server using DAAP
  Tangerine is a simple music sharing server that uses DAAP to share your music
  over the local network.
diff --git a/debian/patches/06_no_amarok.patch b/debian/patches/06_no_amarok.patch
deleted file mode 100644
index 14a1fca..0000000
--- a/debian/patches/06_no_amarok.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# Description: Don't build or install Amarok plugin because Amarok 2.0 isn't
-#  supported yet
-# Origin: vendor
-# Forwarded: not-needed
-# Author: Scott Kitterman <ubuntu at kitterman.com>
-# Reviewed-By: Chow Loong Jin <hyperair at ubuntu.com>
-Index: tangerine/Makefile.am
-===================================================================
---- tangerine.orig/Makefile.am	2009-08-16 17:27:33.000000000 +0800
-+++ tangerine/Makefile.am	2009-08-16 17:27:49.000000000 +0800
-@@ -15,7 +15,6 @@
- 	TangerinePrefPane \
- 	TangerineProperties \
- 	plugins/File \
--	plugins/Amarok \
- 	plugins/Banshee \
- 	plugins/Beagle \
- 	plugins/LSongs \
-Index: tangerine/Makefile.in
-===================================================================
---- tangerine.orig/Makefile.in	2009-08-16 17:27:33.000000000 +0800
-+++ tangerine/Makefile.in	2009-08-16 17:27:59.000000000 +0800
-@@ -317,7 +317,6 @@
- 	TangerinePrefPane \
- 	TangerineProperties \
- 	plugins/File \
--	plugins/Amarok \
- 	plugins/Banshee \
- 	plugins/Beagle \
- 	plugins/LSongs \
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 80a8ae9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-06_no_amarok.patch
diff --git a/debian/rules b/debian/rules
index 92da701..1a59018 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,4 +41,4 @@ override_dh_auto_install:
 	rm debian/tangerine/usr/share/doc/tangerine/sample.conf
 
 %:
-	dh --with=quilt $@
+	dh $@

-- 
tangerine

