[SCM] kajongg packaging branch, master, updated. debian/4.13.1-1-64-gc3f069c

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jul 29 22:22:09 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kajongg.git;a=commitdiff;h=8957c60

The following commit has been merged in the master branch:
commit 8957c6069e6994602e4e541d120b4eca2402b8dd
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Wed Jun 18 12:20:32 2014 +0100

    Remove upstream_install_missing_files.diff now upstream
---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  1 -
 debian/patches/upstream_install_missing_files.diff | 25 ----------------------
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84c4a83..9b7c3a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kajongg (4:4.13.2-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Jonathan Riddell ]
   * new upstream release
+  * Remove upstream_install_missing_files.diff now upstream
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:42:29 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9e29015..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_install_missing_files.diff
diff --git a/debian/patches/upstream_install_missing_files.diff b/debian/patches/upstream_install_missing_files.diff
deleted file mode 100644
index 1356359..0000000
--- a/debian/patches/upstream_install_missing_files.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-commit f6c50a41d8fccfb212abf1f3e1caa2460b73c18f
-Author: Wolfgang Rohdewald <wolfgang at rohdewald.de>
-Date:   Wed May 21 08:06:33 2014 +0200
-
-    CMakeLists.txt: add missing .py files
-    
-    BUG: 335057
-    FIXED-IN: 4.13.2
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b241377..ea51da1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -74,6 +74,11 @@ src/wall.py
- src/uiwall.py
- src/visible.py
- src/log.py
-+src/qstring.py
-+src/qt.py
-+src/qt4.py
-+src/qt5.py
-+src/configdialog.py
- src/util.py)
- 
- IF(NOT PYQT4_FOUND)

-- 
kajongg packaging



More information about the pkg-kde-commits mailing list