~rohangarg/kdepim/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_install_headers.diff

  • Committer: Rohan Garg
  • Date: 2011-06-12 11:34:23 UTC
  • Revision ID: rohangarg@kubuntu.org-20110612113423-dx2ihr6iwrqhe5q2
* Merge from debian, remaining changes
  - Update debian/patches/debianize_akregator_default.diff for Ubuntu
    defaults and rename to kubuntu_debianize_akregator_default.diff
  - Remove kleopatra and akdonadiconsole from kdepim metapackage due to
    their being in Universe
  - Simplify kmail and kleopatra pinentry recommends:
  - Remove pinentry-x11 since it does not exist
  - Remove pinentry-qt since this package has been removed from Ubuntu
  - Adjust other kmail recommends/suggests:
    - Drop Suggests on f-prot-installer and annoyance-filter since they are
    not in the archive
  - Consolidate all documentation in kdepim-doc for all packages in kdepim
  - Add kdepim-doc.install
  - debian/akregator,kaddressbook,kalarm,kjots,kmail,knode,knotes,kontact,
    ktimetracker,korganizer{.install}, do not add documentation
  - Add kdepim-dev package (it is not stable, but we rebuild the reverse
    build-depends to account for this)
    - Add kdepim-dev to debian/control
    - Add kdepim-dev.install
  - Provide debian/kalarm-icons and adjust debian/rules to install
  - Do not build-depend on libgnokii-dev because it is in Universe
  - Build against version of Boost in Main, libboost1.46-dev and
    libboost-graph1.46-dev
  - Add libindicate-qt-dev, libxml2-dev, sharutils to build-deps
  - Add kdepim-runtime to depends in kdepim, knode, knotes, konsolekalendar,
    kontact, and korganizer
  - Add kjots depends on akonadi-server
  - Adjust version requirements for Ubuntu packages for conflict/replaces

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Index: kdepim-4.4.11.1/kleopatra/libkleopatraclient/CMakeLists.txt
 
2
===================================================================
 
3
--- kdepim-4.4.11.1.orig/kleopatra/libkleopatraclient/CMakeLists.txt    2011-04-20 22:03:31.000000000 +0200
 
4
+++ kdepim-4.4.11.1/kleopatra/libkleopatraclient/CMakeLists.txt 2011-06-11 16:30:44.000000000 +0200
 
5
@@ -6,3 +6,8 @@
 
6
 
 
7
 add_subdirectory( tests )
 
8
 
 
9
+install(
 
10
+  FILES kleopatraclient_export.h
 
11
+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient
 
12
+  )
 
13
+
 
14
Index: kdepim-4.4.11.1/kleopatra/libkleopatraclient/core/CMakeLists.txt
 
15
===================================================================
 
16
--- kdepim-4.4.11.1.orig/kleopatra/libkleopatraclient/core/CMakeLists.txt       2011-04-20 22:03:31.000000000 +0200
 
17
+++ kdepim-4.4.11.1/kleopatra/libkleopatraclient/core/CMakeLists.txt    2011-06-11 16:30:44.000000000 +0200
 
18
@@ -38,3 +38,11 @@
 
19
   )
 
20
   
 
21
 
 
22
+install(
 
23
+  FILES
 
24
+    initialization.h
 
25
+    command.h
 
26
+    selectcertificatecommand.h
 
27
+    signencryptfilescommand.h
 
28
+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core
 
29
+  )
 
30
\ No newline at end of file
 
31
Index: kdepim-4.4.11.1/kleopatra/libkleopatraclient/gui/CMakeLists.txt
 
32
===================================================================
 
33
--- kdepim-4.4.11.1.orig/kleopatra/libkleopatraclient/gui/CMakeLists.txt        2011-04-20 22:03:31.000000000 +0200
 
34
+++ kdepim-4.4.11.1/kleopatra/libkleopatraclient/gui/CMakeLists.txt     2011-06-11 16:30:44.000000000 +0200
 
35
@@ -20,3 +20,8 @@
 
36
   DESTINATION ${LIB_INSTALL_DIR}
 
37
   )
 
38
 
 
39
+install(
 
40
+  FILES
 
41
+    certificaterequester.h
 
42
+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui
 
43
+  )
 
44
\ No newline at end of file
 
45
Index: kdepim-4.4.11.1/libkleo/CMakeLists.txt
 
46
===================================================================
 
47
--- kdepim-4.4.11.1.orig/libkleo/CMakeLists.txt 2011-04-20 22:03:31.000000000 +0200
 
48
+++ kdepim-4.4.11.1/libkleo/CMakeLists.txt      2011-06-11 16:30:44.000000000 +0200
 
49
@@ -117,4 +117,60 @@
 
50
 set_target_properties(kleo PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
51
 install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS})
 
52
 
 
53
+install( FILES
 
54
+    kleo/cryptplug.h
 
55
+    kleo/cryptplugfactory.h
 
56
+    kleo/cryptplugwrapper.h
 
57
+    kleo/cryptplugwrapperlist.h
 
58
+    kleo/kleo_export.h
 
59
+    kleo/enum.h
 
60
+    kleo/oidmap.h
 
61
+    kleo/cryptobackend.h
 
62
+    kleo/cryptobackendfactory.h
 
63
+    kleo/cryptoconfig.h
 
64
+    kleo/dn.h
 
65
+    kleo/job.h
 
66
+    kleo/keylistjob.h
 
67
+    kleo/keygenerationjob.h
 
68
+    kleo/abstractimportjob.h
 
69
+    kleo/importjob.h
 
70
+    kleo/importfromkeyserverjob.h
 
71
+    kleo/exportjob.h
 
72
+    kleo/changeexpiryjob.h
 
73
+    kleo/changeownertrustjob.h
 
74
+    kleo/downloadjob.h
 
75
+    kleo/deletejob.h
 
76
+    kleo/encryptjob.h
 
77
+    kleo/decryptjob.h
 
78
+    kleo/signjob.h
 
79
+    kleo/specialjob.h
 
80
+    kleo/verifydetachedjob.h
 
81
+    kleo/verifyopaquejob.h
 
82
+    kleo/decryptverifyjob.h
 
83
+    kleo/signencryptjob.h
 
84
+    kleo/signkeyjob.h
 
85
+    kleo/adduseridjob.h
 
86
+    kleo/refreshkeysjob.h
 
87
+    kleo/multideletejob.h
 
88
+    kleo/hierarchicalkeylistjob.h
 
89
+    kleo/keyfilter.h
 
90
+    kleo/keyfiltermanager.h
 
91
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel)
 
92
+
 
93
+install ( FILES
 
94
+    ui/kdhorizontalline.h
 
95
+    ui/messagebox.h
 
96
+    ui/progressbar.h
 
97
+    ui/progressdialog.h
 
98
+    ui/keylistview.h
 
99
+    ui/keyselectiondialog.h
 
100
+    ui/keyrequester.h
 
101
+    ui/keyapprovaldialog.h
 
102
+    ui/backendconfigwidget.h
 
103
+    ui/dnattributeorderconfigwidget.h
 
104
+    ui/cryptoconfigmodule.h
 
105
+    ui/cryptoconfigdialog.h
 
106
+    ui/directoryserviceswidget.h
 
107
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel)
 
108
+
 
109
 install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc )
 
110
Index: kdepim-4.4.11.1/libkpgp/CMakeLists.txt
 
111
===================================================================
 
112
--- kdepim-4.4.11.1.orig/libkpgp/CMakeLists.txt 2011-04-20 22:03:31.000000000 +0200
 
113
+++ kdepim-4.4.11.1/libkpgp/CMakeLists.txt      2011-06-11 16:30:44.000000000 +0200
 
114
@@ -34,3 +34,11 @@
 
115
 install(FILES kpgp.upd  DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
 
116
 install(PROGRAMS kpgp-3.1-upgrade-address-data.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
 
117
 
 
118
+install(FILES
 
119
+        kpgp.h
 
120
+        kpgpbase.h
 
121
+        kpgpblock.h
 
122
+        kpgpkey.h
 
123
+        kpgpui.h
 
124
+        libkpgp_export.h
 
125
+        DESTINATION ${INCLUDE_INSTALL_DIR}/kpgp COMPONENT Devel )