[Pkg-cli-apps-commits] [SCM] basenji branch, master, updated. debian/0.8.0-3-5-g81c45de
Patrick Ulbrich
zulu99 at gmx.net
Sun Feb 19 13:32:09 UTC 2012
The following commit has been merged in the master branch:
commit 81c45de35b89288636f3b43dc2016f55fae6536f
Author: Patrick Ulbrich <zulu99 at gmx.net>
Date: Sun Feb 19 14:31:24 2012 +0100
drop patches that have been applied upstream
diff --git a/debian/patches/bundle_gio-sharp_assembly b/debian/patches/bundle_gio-sharp_assembly
deleted file mode 100644
index f0abd39..0000000
--- a/debian/patches/bundle_gio-sharp_assembly
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: basenji_0.8.0/Basenji/custom-hooks.make
-===================================================================
---- basenji_0.8.0.orig/Basenji/custom-hooks.make 2011-10-09 15:30:01.222287869 +0200
-+++ basenji_0.8.0/Basenji/custom-hooks.make 2011-10-09 15:30:16.902124704 +0200
-@@ -10,9 +10,8 @@
- cp -R $(BUILD_DIR)/data/* $(DESTDIR)$(datadir)/$(PACKAGE); \
- \
- gio_assembly_path="`pkg-config --variable=Libraries gio-sharp-2.0`"; \
-- gio_assembly_name="`basename $$gio_assembly_path`"; \
-- ln -sf "$$gio_assembly_path" -n $(DESTDIR)$(libdir)/$(PACKAGE)/"$$gio_assembly_name"; \
-- ln -sf "$$gio_assembly_path.config" -n $(DESTDIR)$(libdir)/$(PACKAGE)/"$$gio_assembly_name.config";
-+ cp "$$gio_assembly_path" $(DESTDIR)$(libdir)/$(PACKAGE); \
-+ cp "$$gio_assembly_path.config" -n $(DESTDIR)$(libdir)/$(PACKAGE);
-
- post-uninstall-local-hook:
- # remove prefix/share/basenji
diff --git a/debian/patches/check_thumbnailers b/debian/patches/check_thumbnailers
deleted file mode 100644
index 052bec8..0000000
--- a/debian/patches/check_thumbnailers
+++ /dev/null
@@ -1,186 +0,0 @@
-Index: basenji_0.8.0/Basenji/basenji
-===================================================================
---- basenji_0.8.0.orig/Basenji/basenji 2011-10-09 20:34:05.312672827 +0200
-+++ basenji_0.8.0/Basenji/basenji 2011-10-09 20:34:32.170093516 +0200
-@@ -1,4 +1,87 @@
--#!/bin/sh
-+#!/bin/bash
-+
-+# Import GNOME 3 thumbnailers into GConf.
-+# Workaround for bug lp:864615.
-+# https://bugs.launchpad.net/ubuntu/+source/gconf2/+bug/864615
-+function check_thumbnailers()
-+{
-+ THUMBNAILER_DIR=/usr/share/thumbnailers
-+ GCONF_PATH=/desktop/gnome/thumbnailers
-+
-+ if [ $(gconftool-2 --all-dirs $GCONF_PATH | wc -l) -gt 0 ]; then
-+ # All good - thumbnailers are available in GConf
-+ return
-+ fi
-+
-+ if [ ! -d $THUMBNAILER_DIR ]; then
-+ echo "Error: Can't import thumbnailers - directory '$THUMBNAILER_DIR' not found."
-+ return
-+ fi
-+
-+ echo "Importing thumbnailers into GConf..."
-+
-+ cnt=0
-+ commands=
-+ mimetypes=
-+
-+ for f in $(ls $THUMBNAILER_DIR); do
-+
-+ echo "* Importing $f"
-+
-+ cmd=$(grep -w Exec "$THUMBNAILER_DIR/$f" | cut -d '=' -f2)
-+ mimestr=$(grep -w MimeType "$THUMBNAILER_DIR/$f" | cut -d '=' -f2)
-+
-+ for m in $( echo $mimestr | tr ";" "\n"); do
-+ commands[$cnt]=$cmd
-+ mimetypes[$cnt]=$(echo $m | tr "/" "@" | tr "+" "@")
-+ ((cnt++))
-+ done
-+ done
-+
-+ echo "* Writing to GConf"
-+ entries=
-+
-+ for (( i = 0 ; i < ${#mimetypes[@]} ; i++ )); do
-+ read -d '' entry <<EOF
-+ <entry>
-+ <key>${mimetypes[$i]}/command</key>
-+ <schema_key>/schemas$GCONF_PATH/${mimetypes[$i]}/command</schema_key>
-+ <value>
-+ <string>${commands[$i]}</string>
-+ </value>
-+ </entry>
-+ <entry>
-+ <key>${mimetypes[$i]}/enable</key>
-+ <schema_key>/schemas$GCONF_PATH/${mimetypes[$i]}/enable</schema_key>
-+ <value>
-+ <bool>true</bool>
-+ </value>
-+ </entry>
-+EOF
-+ entries=$entries$entry
-+ done
-+
-+ read -d '' xml <<EOF
-+ <gconfentryfile>
-+ <entrylist base="$GCONF_PATH">
-+ <entry>
-+ <key>disable_all</key>
-+ <schema_key>/schemas$GCONF_PATH/disable_all</schema_key>
-+ <value>
-+ <bool>false</bool>
-+ </value>
-+ </entry>
-+ $entries
-+ </entrylist>
-+ </gconfentryfile>
-+EOF
-+
-+ echo $xml | gconftool-2 --load -
-+
-+ echo "Done."
-+}
-+
-+check_thumbnailers
-
- cd "@ProgramFiles@"
- exec mono Basenji.exe "$@"
-Index: basenji_0.8.0/Basenji/basenji.in
-===================================================================
---- basenji_0.8.0.orig/Basenji/basenji.in 2011-10-09 20:34:13.756892414 +0200
-+++ basenji_0.8.0/Basenji/basenji.in 2011-10-09 20:34:42.195103025 +0200
-@@ -1,4 +1,87 @@
--#!/bin/sh
-+#!/bin/bash
-+
-+# Import GNOME 3 thumbnailers into GConf.
-+# Workaround for bug lp:864615.
-+# https://bugs.launchpad.net/ubuntu/+source/gconf2/+bug/864615
-+function check_thumbnailers()
-+{
-+ THUMBNAILER_DIR=/usr/share/thumbnailers
-+ GCONF_PATH=/desktop/gnome/thumbnailers
-+
-+ if [ $(gconftool-2 --all-dirs $GCONF_PATH | wc -l) -gt 0 ]; then
-+ # All good - thumbnailers are available in GConf
-+ return
-+ fi
-+
-+ if [ ! -d $THUMBNAILER_DIR ]; then
-+ echo "Error: Can't import thumbnailers - directory '$THUMBNAILER_DIR' not found."
-+ return
-+ fi
-+
-+ echo "Importing thumbnailers into GConf..."
-+
-+ cnt=0
-+ commands=
-+ mimetypes=
-+
-+ for f in $(ls $THUMBNAILER_DIR); do
-+
-+ echo "* Importing $f"
-+
-+ cmd=$(grep -w Exec "$THUMBNAILER_DIR/$f" | cut -d '=' -f2)
-+ mimestr=$(grep -w MimeType "$THUMBNAILER_DIR/$f" | cut -d '=' -f2)
-+
-+ for m in $( echo $mimestr | tr ";" "\n"); do
-+ commands[$cnt]=$cmd
-+ mimetypes[$cnt]=$(echo $m | tr "/" "@" | tr "+" "@")
-+ ((cnt++))
-+ done
-+ done
-+
-+ echo "* Writing to GConf"
-+ entries=
-+
-+ for (( i = 0 ; i < ${#mimetypes[@]} ; i++ )); do
-+ read -d '' entry <<EOF
-+ <entry>
-+ <key>${mimetypes[$i]}/command</key>
-+ <schema_key>/schemas$GCONF_PATH/${mimetypes[$i]}/command</schema_key>
-+ <value>
-+ <string>${commands[$i]}</string>
-+ </value>
-+ </entry>
-+ <entry>
-+ <key>${mimetypes[$i]}/enable</key>
-+ <schema_key>/schemas$GCONF_PATH/${mimetypes[$i]}/enable</schema_key>
-+ <value>
-+ <bool>true</bool>
-+ </value>
-+ </entry>
-+EOF
-+ entries=$entries$entry
-+ done
-+
-+ read -d '' xml <<EOF
-+ <gconfentryfile>
-+ <entrylist base="$GCONF_PATH">
-+ <entry>
-+ <key>disable_all</key>
-+ <schema_key>/schemas$GCONF_PATH/disable_all</schema_key>
-+ <value>
-+ <bool>false</bool>
-+ </value>
-+ </entry>
-+ $entries
-+ </entrylist>
-+ </gconfentryfile>
-+EOF
-+
-+ echo $xml | gconftool-2 --load -
-+
-+ echo "Done."
-+}
-+
-+check_thumbnailers
-
- cd "@expanded_libdir@/@PACKAGE@"
- exec mono Basenji.exe "$@"
diff --git a/debian/patches/fix_libextractor_dll_config b/debian/patches/fix_libextractor_dll_config
deleted file mode 100644
index 55bdc31..0000000
--- a/debian/patches/fix_libextractor_dll_config
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: basenji_0.8.0/Basenji/LibExtractor.dll.config
-===================================================================
---- basenji_0.8.0.orig/Basenji/LibExtractor.dll.config 2011-10-09 15:23:19.769640429 +0200
-+++ basenji_0.8.0/Basenji/LibExtractor.dll.config 2011-10-09 15:23:28.766136917 +0200
-@@ -1,3 +1,3 @@
- <configuration>
-- <dllmap dll="libextractor-1" target="libextractor.so.1.1.1"/>
-+ <dllmap dll="libextractor-1" target="libextractor.so.1"/>
- </configuration>
diff --git a/debian/patches/series b/debian/patches/series
index 3474e43..1336e13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-check_thumbnailers
use_mono-csc_compiler
-fix_libextractor_dll_config
-bundle_gio-sharp_assembly
allow_minimal_configure_for_clean
--
basenji
More information about the Pkg-cli-apps-commits
mailing list