Prepare new experimental upload.

diff --git a/debian/changelog b/debian/changelog
index 10abbfd129d89a4d62f5c3ec641759f49aaef09f..523c3936d9c1245499fd7483f45ce2354ccb6007 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-dtkcore (2.0.15-1) unstable; urgency=medium
+dtkcore (2.1.1-1~exp1) experimental; urgency=medium
 
-  * Upload to unstable.
-    + Correctly cross-build. (Closes: #924234)
+  * New upstream release 2.1.1.
+  * debian/shlibs: Bump minimum version requirement to 2.1.1.
+  * Correctly cross-build. (Closes: #924234)
+  * debian/patches: Add patch to fix incorrect script
+    interpreter line.
 
- -- Boyuan Yang <byang@debian.org>  Sun, 14 Jul 2019 17:24:35 -0400
+ -- Boyuan Yang <byang@debian.org>  Mon, 05 Aug 2019 16:40:11 -0400
 
 dtkcore (2.0.15-1~exp1) experimental; urgency=medium
 

diff --git a/debian/libdtkcore-bin.install b/debian/libdtkcore-bin.install
index b808e55803f78a64ab818b75e7ac375310db1e50..0ca22cce5d79dbff89e8c0181fa9fd1f166f7968 100644 (file)
--- a/debian/libdtkcore-bin.install
+++ b/debian/libdtkcore-bin.install
@@ -1 +1 @@
-usr/lib/dtk2/*
+usr/lib/*/*/DCore/bin/*

diff --git a/debian/libdtkcore2.install b/debian/libdtkcore2.install
index e1964fcf97e4853e0a05118f986f071b38b7bfb5..5ea551deb9179792177e1bdd8421a35e86b82f3d 100644 (file)
--- a/debian/libdtkcore2.install
+++ b/debian/libdtkcore2.install
@@ -1,3 +1,2 @@
-usr/lib/*/libdtk-2.0.15/DCore/bin/deepin-os-release
 usr/lib/*/libdtkcore.so.2
 usr/lib/*/libdtkcore.so.2.*

diff --git a/debian/libdtkcore2.shlibs b/debian/libdtkcore2.shlibs
index 733ac151f1172d873942a0147fb6fe9fb3d486be..999cef39df022edb675139b045b56223a50905ca 100644 (file)
--- a/debian/libdtkcore2.shlibs
+++ b/debian/libdtkcore2.shlibs
@@ -1 +1 @@
-libdtkcore 2 libdtkcore2 (>= 2.0.11)
+libdtkcore 2 libdtkcore2 (>= 2.1.1)

diff --git a/debian/patches/0001-dtk-translate-Fix-incorrect-interpreter.patch b/debian/patches/0001-dtk-translate-Fix-incorrect-interpreter.patch
new file mode 100644 (file)
index 0000000..65a783d
--- /dev/null
+++ b/debian/patches/0001-dtk-translate-Fix-incorrect-interpreter.patch
@@ -0,0 +1,18 @@
+From: Boyuan Yang <byang@debian.org>
+Date: Mon, 5 Aug 2019 16:40:01 -0400
+Subject: dtk-translate: Fix incorrect interpreter
+
+---
+ tools/script/dtk-translate.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/script/dtk-translate.py b/tools/script/dtk-translate.py
+index 9cb06f8..437cefd 100644
+--- a/tools/script/dtk-translate.py
++++ b/tools/script/dtk-translate.py
+@@ -1,4 +1,4 @@
+-#!env python
++#!/usr/bin/python3
+ 
+ import sys,os,fnmatch
+ from subprocess import call

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..5f875d8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-dtk-translate-Fix-incorrect-interpreter.patch