[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 02/02: remove jessie->stretch transitionals again



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit f55dc04dd8dbf9cc52d507f72fcfdd84af7046c0
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Aug 15 16:20:35 2016 +0200

    remove jessie->stretch transitionals again
---
 changelog                |  2 ++
 control                  | 14 --------------
 control.transitionals.in | 14 --------------
 rules                    |  1 -
 4 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/changelog b/changelog
index 18c049c..d815ee5 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,8 @@ libreoffice (1:5.3.0~alpha0~git20160811-1) UNRELEASED; urgency=medium
 
   * debian/control.{lang,help}.in: use ${help-l10n-virtual-version} as
     versioned Provides
+  * debian/rules, debian/control.transitionals.in: remove jessie->stretch
+    transitionals again
 
  -- Rene Engelhard <rene@debian.org>  Thu, 26 May 2016 20:00:57 +0200
 
diff --git a/control b/control
index 4fbeec5..4788066 100644
--- a/control
+++ b/control
@@ -4454,20 +4454,6 @@ Description: office productivity suite -- GTK+ 2 integration
  with Gtk+ 2 and a Gtk/GNOMEish File Picker and print dialog when running
  under GNOME.
 
-Package: libreoffice-gtk
-Architecture: all
-Section: gnome
-Priority: extra
-Recommends: libreoffice-systray
-Depends: libreoffice-gtk2
-Description: transitional package to upgrade to libreoffice-gtk2
- This package used to contain the Gtk2 integration for LibreOffice.
- .
- It has been renamed to libreoffice-gtk2 (and the systray/"Quickstarter"
- split out to libreoffice-systray.
- .
- You can safely remove this package.
-
 Package: libreoffice-systray
 Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
 Section: misc
diff --git a/control.transitionals.in b/control.transitionals.in
deleted file mode 100644
index f33922c..0000000
--- a/control.transitionals.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Package: libreoffice-gtk
-Architecture: all
-Section: gnome
-Priority: extra
-Recommends: libreoffice-systray
-Depends: libreoffice-gtk2
-Description: transitional package to upgrade to libreoffice-gtk2
- This package used to contain the Gtk2 integration for LibreOffice.
- .
- It has been renamed to libreoffice-gtk2 (and the systray/"Quickstarter"
- split out to libreoffice-systray.
- .
- You can safely remove this package.
-
diff --git a/rules b/rules
index 202931c..c7f0985 100755
--- a/rules
+++ b/rules
@@ -1819,7 +1819,6 @@ ifeq "$(PACKAGE_LOKIT)" "y"
 endif
 ifeq "$(BUILD_GTK)" "y"
 	cat debian/control.gtk2.in >> debian/control
-	cat debian/control.transitionals.in >> debian/control
 endif
 ifeq "$(ENABLE_SYSTRAY)" "y"
 	cat debian/control.systray.in >> debian/control

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: