[X2go-Commits] pinentry-x2go.git - master (branch) updated: 0.7.5.5-2-gfd1376d

[X2Go dev team]

The branch, master has been updated
       via  fd1376d46c31fe6fd1e6737d782787731802ae30 (commit)
       via  d7d308014a508135248d347b4b48b377833a994d (commit)
      from  dfa5d88aeca83fb98260daebcff062b093a3543e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fd1376d46c31fe6fd1e6737d782787731802ae30
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 20 09:38:51 2012 +0200

    Add Conflicts/Replaces entries for pinentry-x2go-gtk.

commit d7d308014a508135248d347b4b48b377833a994d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 20 09:37:40 2012 +0200

    Do not install the pinentry.info file anymore, it conflicts with the info file from the default/original pinentry package.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog          |   10 ++++++++++
 debian/control            |    4 ++++
 debian/pinentry-x2go.info |    1 -
 3 files changed, 14 insertions(+), 1 deletions(-)
 delete mode 100644 debian/pinentry-x2go.info

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a5ff29d..46f22ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pinentry-x2go (0.7.5.6-0~x2go1) UNRELEASED; urgency=low
+
+  * New upstream version (0.7.5.6):
+    - Continue development...
+  * Do not install the pinentry.info file anymore, it conflicts with the info
+    file from the default/original pinentry package.
+  * Add Conflicts/Replaces entries for pinentry-x2go-gtk.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 20 Aug 2012 09:36:13 +0200
+
 pinentry-x2go (0.7.5.5-0~x2go1) unstable; urgency=low
 
   [ Mike Gabriel ]
diff --git a/debian/control b/debian/control
index bd84839..57b267f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,10 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=pinentry-x2go.git;a=summary
 Package: pinentry-x2go
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-gui
+Conflicts:
+ pinentry-x2go-gtk
+Replaces:
+ pinentry-x2go-gtk
 Description: Qt4-based PIN or pass-phrase entry dialog for x2goclient
  This package contains a program that allows for entry of PINs or
  pass phrases.
diff --git a/debian/pinentry-x2go.info b/debian/pinentry-x2go.info
deleted file mode 100644
index 0ce3840..0000000
--- a/debian/pinentry-x2go.info
+++ /dev/null
@@ -1 +0,0 @@
-doc/pinentry.info


hooks/post-receive
-- 
pinentry-x2go.git (PinEntry Dialog (Qt) for X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pinentry-x2go.git" (PinEntry Dialog (Qt) for X2Go Client).