This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit ecd54bfd0b3b7c5c6caa651d4141ebd89e2a00e8 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 03:08:12 2018 +0100 debian/{control,compat}: bump DH compat level to 9. --- debian/changelog | 4 ++++ debian/compat | 2 +- debian/control | 2 +- debian/{config => x2goserver.config} | 0 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 90fd630..7165044 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,10 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (4.1.0.1): - Makefile.PL: adjust embedded version number. + * debian/{control,compat}: + + Bump DH compat level to 9. + * debian/: + + Rename config to x2goserver.config. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 23:14:28 +0100 diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 6f4aa15..963bb40 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Reinhard Tartler <siretart@tauware.de>, Mihai Moldovan <ionic@ionic.de>, Build-Depends: - debhelper (>= 7.0.50~), + debhelper (>= 9~), dh-systemd | hello, man2html-base | man2html, Standards-Version: 3.9.6 diff --git a/debian/config b/debian/x2goserver.config similarity index 100% rename from debian/config rename to debian/x2goserver.config -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit b43f6370cc5246462bd14e90f9e64db7af2cdb2d Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 04:00:39 2018 +0100 debian/x2goserver-x2goagent.install: do not install rgb file/symlink any longer. --- debian/changelog | 2 ++ debian/x2goserver-x2goagent.install | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 76f0a30..238221c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium + Bump DH compat level to 9. * debian/: + Rename config to x2goserver.config. + * debian/x2goserver-x2goagent.install: + + Do not install rgb file/symlink any longer. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 23:14:28 +0100 diff --git a/debian/x2goserver-x2goagent.install b/debian/x2goserver-x2goagent.install index 7afca09..56fe26c 100644 --- a/debian/x2goserver-x2goagent.install +++ b/debian/x2goserver-x2goagent.install @@ -1,11 +1,9 @@ etc/x2go/keystrokes.cfg -etc/x2go/rgb etc/x2go/x2goagent.keyboard etc/x2go/x2goagent.options usr/bin/x2goagent usr/lib/*/nx/bin/x2goagent usr/share/man/man1/x2goagent.1* usr/share/pixmaps/x2go.xpm -usr/share/x2go/rgb usr/share/x2go/versions/VERSION.x2goserver-x2goagent usr/share/x2go/x2gofeature.d/x2goserver-x2goagent.* -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 4397fff783b50df7e8215ef29f2a378b5cd1bcbc Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 04:04:19 2018 +0100 debian/copyright.in: remove reference to rgb file. --- debian/changelog | 2 ++ debian/copyright.in | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9ba73bc..3c4a7dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium + Do not install rgb file/symlink any longer. * x2goserver.spec: + Do not install rgb file/symlink any longer. + * debian/copyright.in: + + Remove reference to rgb file. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 23:14:28 +0100 diff --git a/debian/copyright.in b/debian/copyright.in index e83ea1c..0c696e8 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -84,7 +84,6 @@ Files: INSTALL x2goserver-printing/man/man8/x2goprint.8 x2goserver-x2goagent/Makefile x2goserver-x2goagent/etc/keystrokes.cfg - x2goserver-x2goagent/etc/rgb x2goserver-x2goagent/etc/x2goagent.keyboard x2goserver-x2goagent/etc/x2goagent.options x2goserver-x2goagent/man/man1/x2goagent.1 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 48ee43b95019a02047c3de243b15c1b5540f3577 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 04:03:32 2018 +0100 x2goserver-x2goagent/etc: remove rgb file. --- debian/changelog | 1 + x2goserver-x2goagent/etc/rgb | 754 ------------------------------------------- 2 files changed, 1 insertion(+), 754 deletions(-) diff --git a/debian/changelog b/debian/changelog index eac2de2..9ba73bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium scripts. - x2goserver-x2goagent/Makefile: do not stage rgb file any longer. Obsoleted, is now hardcoded into nxagent directly. + - x2goserver-x2goagent/etc: remove rgb file. * debian/{control,compat}: + Bump DH compat level to 9. * debian/: diff --git a/x2goserver-x2goagent/etc/rgb b/x2goserver-x2goagent/etc/rgb deleted file mode 100644 index b9e56c6..0000000 --- a/x2goserver-x2goagent/etc/rgb +++ /dev/null @@ -1,754 +0,0 @@ -! $Xorg: rgb.txt,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ -255 250 250 snow -248 248 255 ghost white -248 248 255 GhostWhite -245 245 245 white smoke -245 245 245 WhiteSmoke -220 220 220 gainsboro -255 250 240 floral white -255 250 240 FloralWhite -253 245 230 old lace -253 245 230 OldLace -250 240 230 linen -250 235 215 antique white -250 235 215 AntiqueWhite -255 239 213 papaya whip -255 239 213 PapayaWhip -255 235 205 blanched almond -255 235 205 BlanchedAlmond -255 228 196 bisque -255 218 185 peach puff -255 218 185 PeachPuff -255 222 173 navajo white -255 222 173 NavajoWhite -255 228 181 moccasin -255 248 220 cornsilk -255 255 240 ivory -255 250 205 lemon chiffon -255 250 205 LemonChiffon -255 245 238 seashell -240 255 240 honeydew -245 255 250 mint cream -245 255 250 MintCream -240 255 255 azure -240 248 255 alice blue -240 248 255 AliceBlue -230 230 250 lavender -255 240 245 lavender blush -255 240 245 LavenderBlush -255 228 225 misty rose -255 228 225 MistyRose -255 255 255 white - 0 0 0 black - 47 79 79 dark slate gray - 47 79 79 DarkSlateGray - 47 79 79 dark slate grey - 47 79 79 DarkSlateGrey -105 105 105 dim gray -105 105 105 DimGray -105 105 105 dim grey -105 105 105 DimGrey -112 128 144 slate gray -112 128 144 SlateGray -112 128 144 slate grey -112 128 144 SlateGrey -119 136 153 light slate gray -119 136 153 LightSlateGray -119 136 153 light slate grey -119 136 153 LightSlateGrey -190 190 190 gray -190 190 190 grey -211 211 211 light grey -211 211 211 LightGrey -211 211 211 light gray -211 211 211 LightGray - 25 25 112 midnight blue - 25 25 112 MidnightBlue - 0 0 128 navy - 0 0 128 navy blue - 0 0 128 NavyBlue -100 149 237 cornflower blue -100 149 237 CornflowerBlue - 72 61 139 dark slate blue - 72 61 139 DarkSlateBlue -106 90 205 slate blue -106 90 205 SlateBlue -123 104 238 medium slate blue -123 104 238 MediumSlateBlue -132 112 255 light slate blue -132 112 255 LightSlateBlue - 0 0 205 medium blue - 0 0 205 MediumBlue - 65 105 225 royal blue - 65 105 225 RoyalBlue - 0 0 255 blue - 30 144 255 dodger blue - 30 144 255 DodgerBlue - 0 191 255 deep sky blue - 0 191 255 DeepSkyBlue -135 206 235 sky blue -135 206 235 SkyBlue -135 206 250 light sky blue -135 206 250 LightSkyBlue - 70 130 180 steel blue - 70 130 180 SteelBlue -176 196 222 light steel blue -176 196 222 LightSteelBlue -173 216 230 light blue -173 216 230 LightBlue -176 224 230 powder blue -176 224 230 PowderBlue -175 238 238 pale turquoise -175 238 238 PaleTurquoise - 0 206 209 dark turquoise - 0 206 209 DarkTurquoise - 72 209 204 medium turquoise - 72 209 204 MediumTurquoise - 64 224 208 turquoise - 0 255 255 cyan -224 255 255 light cyan -224 255 255 LightCyan - 95 158 160 cadet blue - 95 158 160 CadetBlue -102 205 170 medium aquamarine -102 205 170 MediumAquamarine -127 255 212 aquamarine - 0 100 0 dark green - 0 100 0 DarkGreen - 85 107 47 dark olive green - 85 107 47 DarkOliveGreen -143 188 143 dark sea green -143 188 143 DarkSeaGreen - 46 139 87 sea green - 46 139 87 SeaGreen - 60 179 113 medium sea green - 60 179 113 MediumSeaGreen - 32 178 170 light sea green - 32 178 170 LightSeaGreen -152 251 152 pale green -152 251 152 PaleGreen - 0 255 127 spring green - 0 255 127 SpringGreen -124 252 0 lawn green -124 252 0 LawnGreen - 0 255 0 green -127 255 0 chartreuse - 0 250 154 medium spring green - 0 250 154 MediumSpringGreen -173 255 47 green yellow -173 255 47 GreenYellow - 50 205 50 lime green - 50 205 50 LimeGreen -154 205 50 yellow green -154 205 50 YellowGreen - 34 139 34 forest green - 34 139 34 ForestGreen -107 142 35 olive drab -107 142 35 OliveDrab -189 183 107 dark khaki -189 183 107 DarkKhaki -240 230 140 khaki -238 232 170 pale goldenrod -238 232 170 PaleGoldenrod -250 250 210 light goldenrod yellow -250 250 210 LightGoldenrodYellow -255 255 224 light yellow -255 255 224 LightYellow -255 255 0 yellow -255 215 0 gold -238 221 130 light goldenrod -238 221 130 LightGoldenrod -218 165 32 goldenrod -184 134 11 dark goldenrod -184 134 11 DarkGoldenrod -188 143 143 rosy brown -188 143 143 RosyBrown -205 92 92 indian red -205 92 92 IndianRed -139 69 19 saddle brown -139 69 19 SaddleBrown -160 82 45 sienna -205 133 63 peru -222 184 135 burlywood -245 245 220 beige -245 222 179 wheat -244 164 96 sandy brown -244 164 96 SandyBrown -210 180 140 tan -210 105 30 chocolate -178 34 34 firebrick -165 42 42 brown -233 150 122 dark salmon -233 150 122 DarkSalmon -250 128 114 salmon -255 160 122 light salmon -255 160 122 LightSalmon -255 165 0 orange -255 140 0 dark orange -255 140 0 DarkOrange -255 127 80 coral -240 128 128 light coral -240 128 128 LightCoral -255 99 71 tomato -255 69 0 orange red -255 69 0 OrangeRed -255 0 0 red -255 105 180 hot pink -255 105 180 HotPink -255 20 147 deep pink -255 20 147 DeepPink -255 192 203 pink -255 182 193 light pink -255 182 193 LightPink -219 112 147 pale violet red -219 112 147 PaleVioletRed -176 48 96 maroon -199 21 133 medium violet red -199 21 133 MediumVioletRed -208 32 144 violet red -208 32 144 VioletRed -255 0 255 magenta -238 130 238 violet -221 160 221 plum -218 112 214 orchid -186 85 211 medium orchid -186 85 211 MediumOrchid -153 50 204 dark orchid -153 50 204 DarkOrchid -148 0 211 dark violet -148 0 211 DarkViolet -138 43 226 blue violet -138 43 226 BlueViolet -160 32 240 purple -147 112 219 medium purple -147 112 219 MediumPurple -216 191 216 thistle -255 250 250 snow1 -238 233 233 snow2 -205 201 201 snow3 -139 137 137 snow4 -255 245 238 seashell1 -238 229 222 seashell2 -205 197 191 seashell3 -139 134 130 seashell4 -255 239 219 AntiqueWhite1 -238 223 204 AntiqueWhite2 -205 192 176 AntiqueWhite3 -139 131 120 AntiqueWhite4 -255 228 196 bisque1 -238 213 183 bisque2 -205 183 158 bisque3 -139 125 107 bisque4 -255 218 185 PeachPuff1 -238 203 173 PeachPuff2 -205 175 149 PeachPuff3 -139 119 101 PeachPuff4 -255 222 173 NavajoWhite1 -238 207 161 NavajoWhite2 -205 179 139 NavajoWhite3 -139 121 94 NavajoWhite4 -255 250 205 LemonChiffon1 -238 233 191 LemonChiffon2 -205 201 165 LemonChiffon3 -139 137 112 LemonChiffon4 -255 248 220 cornsilk1 -238 232 205 cornsilk2 -205 200 177 cornsilk3 -139 136 120 cornsilk4 -255 255 240 ivory1 -238 238 224 ivory2 -205 205 193 ivory3 -139 139 131 ivory4 -240 255 240 honeydew1 -224 238 224 honeydew2 -193 205 193 honeydew3 -131 139 131 honeydew4 -255 240 245 LavenderBlush1 -238 224 229 LavenderBlush2 -205 193 197 LavenderBlush3 -139 131 134 LavenderBlush4 -255 228 225 MistyRose1 -238 213 210 MistyRose2 -205 183 181 MistyRose3 -139 125 123 MistyRose4 -240 255 255 azure1 -224 238 238 azure2 -193 205 205 azure3 -131 139 139 azure4 -131 111 255 SlateBlue1 -122 103 238 SlateBlue2 -105 89 205 SlateBlue3 - 71 60 139 SlateBlue4 - 72 118 255 RoyalBlue1 - 67 110 238 RoyalBlue2 - 58 95 205 RoyalBlue3 - 39 64 139 RoyalBlue4 - 0 0 255 blue1 - 0 0 238 blue2 - 0 0 205 blue3 - 0 0 139 blue4 - 30 144 255 DodgerBlue1 - 28 134 238 DodgerBlue2 - 24 116 205 DodgerBlue3 - 16 78 139 DodgerBlue4 - 99 184 255 SteelBlue1 - 92 172 238 SteelBlue2 - 79 148 205 SteelBlue3 - 54 100 139 SteelBlue4 - 0 191 255 DeepSkyBlue1 - 0 178 238 DeepSkyBlue2 - 0 154 205 DeepSkyBlue3 - 0 104 139 DeepSkyBlue4 -135 206 255 SkyBlue1 -126 192 238 SkyBlue2 -108 166 205 SkyBlue3 - 74 112 139 SkyBlue4 -176 226 255 LightSkyBlue1 -164 211 238 LightSkyBlue2 -141 182 205 LightSkyBlue3 - 96 123 139 LightSkyBlue4 -198 226 255 SlateGray1 -185 211 238 SlateGray2 -159 182 205 SlateGray3 -108 123 139 SlateGray4 -202 225 255 LightSteelBlue1 -188 210 238 LightSteelBlue2 -162 181 205 LightSteelBlue3 -110 123 139 LightSteelBlue4 -191 239 255 LightBlue1 -178 223 238 LightBlue2 -154 192 205 LightBlue3 -104 131 139 LightBlue4 -224 255 255 LightCyan1 -209 238 238 LightCyan2 -180 205 205 LightCyan3 -122 139 139 LightCyan4 -187 255 255 PaleTurquoise1 -174 238 238 PaleTurquoise2 -150 205 205 PaleTurquoise3 -102 139 139 PaleTurquoise4 -152 245 255 CadetBlue1 -142 229 238 CadetBlue2 -122 197 205 CadetBlue3 - 83 134 139 CadetBlue4 - 0 245 255 turquoise1 - 0 229 238 turquoise2 - 0 197 205 turquoise3 - 0 134 139 turquoise4 - 0 255 255 cyan1 - 0 238 238 cyan2 - 0 205 205 cyan3 - 0 139 139 cyan4 -151 255 255 DarkSlateGray1 -141 238 238 DarkSlateGray2 -121 205 205 DarkSlateGray3 - 82 139 139 DarkSlateGray4 -127 255 212 aquamarine1 -118 238 198 aquamarine2 -102 205 170 aquamarine3 - 69 139 116 aquamarine4 -193 255 193 DarkSeaGreen1 -180 238 180 DarkSeaGreen2 -155 205 155 DarkSeaGreen3 -105 139 105 DarkSeaGreen4 - 84 255 159 SeaGreen1 - 78 238 148 SeaGreen2 - 67 205 128 SeaGreen3 - 46 139 87 SeaGreen4 -154 255 154 PaleGreen1 -144 238 144 PaleGreen2 -124 205 124 PaleGreen3 - 84 139 84 PaleGreen4 - 0 255 127 SpringGreen1 - 0 238 118 SpringGreen2 - 0 205 102 SpringGreen3 - 0 139 69 SpringGreen4 - 0 255 0 green1 - 0 238 0 green2 - 0 205 0 green3 - 0 139 0 green4 -127 255 0 chartreuse1 -118 238 0 chartreuse2 -102 205 0 chartreuse3 - 69 139 0 chartreuse4 -192 255 62 OliveDrab1 -179 238 58 OliveDrab2 -154 205 50 OliveDrab3 -105 139 34 OliveDrab4 -202 255 112 DarkOliveGreen1 -188 238 104 DarkOliveGreen2 -162 205 90 DarkOliveGreen3 -110 139 61 DarkOliveGreen4 -255 246 143 khaki1 -238 230 133 khaki2 -205 198 115 khaki3 -139 134 78 khaki4 -255 236 139 LightGoldenrod1 -238 220 130 LightGoldenrod2 -205 190 112 LightGoldenrod3 -139 129 76 LightGoldenrod4 -255 255 224 LightYellow1 -238 238 209 LightYellow2 -205 205 180 LightYellow3 -139 139 122 LightYellow4 -255 255 0 yellow1 -238 238 0 yellow2 -205 205 0 yellow3 -139 139 0 yellow4 -255 215 0 gold1 -238 201 0 gold2 -205 173 0 gold3 -139 117 0 gold4 -255 193 37 goldenrod1 -238 180 34 goldenrod2 -205 155 29 goldenrod3 -139 105 20 goldenrod4 -255 185 15 DarkGoldenrod1 -238 173 14 DarkGoldenrod2 -205 149 12 DarkGoldenrod3 -139 101 8 DarkGoldenrod4 -255 193 193 RosyBrown1 -238 180 180 RosyBrown2 -205 155 155 RosyBrown3 -139 105 105 RosyBrown4 -255 106 106 IndianRed1 -238 99 99 IndianRed2 -205 85 85 IndianRed3 -139 58 58 IndianRed4 -255 130 71 sienna1 -238 121 66 sienna2 -205 104 57 sienna3 -139 71 38 sienna4 -255 211 155 burlywood1 -238 197 145 burlywood2 -205 170 125 burlywood3 -139 115 85 burlywood4 -255 231 186 wheat1 -238 216 174 wheat2 -205 186 150 wheat3 -139 126 102 wheat4 -255 165 79 tan1 -238 154 73 tan2 -205 133 63 tan3 -139 90 43 tan4 -255 127 36 chocolate1 -238 118 33 chocolate2 -205 102 29 chocolate3 -139 69 19 chocolate4 -255 48 48 firebrick1 -238 44 44 firebrick2 -205 38 38 firebrick3 -139 26 26 firebrick4 -255 64 64 brown1 -238 59 59 brown2 -205 51 51 brown3 -139 35 35 brown4 -255 140 105 salmon1 -238 130 98 salmon2 -205 112 84 salmon3 -139 76 57 salmon4 -255 160 122 LightSalmon1 -238 149 114 LightSalmon2 -205 129 98 LightSalmon3 -139 87 66 LightSalmon4 -255 165 0 orange1 -238 154 0 orange2 -205 133 0 orange3 -139 90 0 orange4 -255 127 0 DarkOrange1 -238 118 0 DarkOrange2 -205 102 0 DarkOrange3 -139 69 0 DarkOrange4 -255 114 86 coral1 -238 106 80 coral2 -205 91 69 coral3 -139 62 47 coral4 -255 99 71 tomato1 -238 92 66 tomato2 -205 79 57 tomato3 -139 54 38 tomato4 -255 69 0 OrangeRed1 -238 64 0 OrangeRed2 -205 55 0 OrangeRed3 -139 37 0 OrangeRed4 -255 0 0 red1 -238 0 0 red2 -205 0 0 red3 -139 0 0 red4 -215 7 81 DebianRed -255 20 147 DeepPink1 -238 18 137 DeepPink2 -205 16 118 DeepPink3 -139 10 80 DeepPink4 -255 110 180 HotPink1 -238 106 167 HotPink2 -205 96 144 HotPink3 -139 58 98 HotPink4 -255 181 197 pink1 -238 169 184 pink2 -205 145 158 pink3 -139 99 108 pink4 -255 174 185 LightPink1 -238 162 173 LightPink2 -205 140 149 LightPink3 -139 95 101 LightPink4 -255 130 171 PaleVioletRed1 -238 121 159 PaleVioletRed2 -205 104 137 PaleVioletRed3 -139 71 93 PaleVioletRed4 -255 52 179 maroon1 -238 48 167 maroon2 -205 41 144 maroon3 -139 28 98 maroon4 -255 62 150 VioletRed1 -238 58 140 VioletRed2 -205 50 120 VioletRed3 -139 34 82 VioletRed4 -255 0 255 magenta1 -238 0 238 magenta2 -205 0 205 magenta3 -139 0 139 magenta4 -255 131 250 orchid1 -238 122 233 orchid2 -205 105 201 orchid3 -139 71 137 orchid4 -255 187 255 plum1 -238 174 238 plum2 -205 150 205 plum3 -139 102 139 plum4 -224 102 255 MediumOrchid1 -209 95 238 MediumOrchid2 -180 82 205 MediumOrchid3 -122 55 139 MediumOrchid4 -191 62 255 DarkOrchid1 -178 58 238 DarkOrchid2 -154 50 205 DarkOrchid3 -104 34 139 DarkOrchid4 -155 48 255 purple1 -145 44 238 purple2 -125 38 205 purple3 - 85 26 139 purple4 -171 130 255 MediumPurple1 -159 121 238 MediumPurple2 -137 104 205 MediumPurple3 - 93 71 139 MediumPurple4 -255 225 255 thistle1 -238 210 238 thistle2 -205 181 205 thistle3 -139 123 139 thistle4 - 0 0 0 gray0 - 0 0 0 grey0 - 3 3 3 gray1 - 3 3 3 grey1 - 5 5 5 gray2 - 5 5 5 grey2 - 8 8 8 gray3 - 8 8 8 grey3 - 10 10 10 gray4 - 10 10 10 grey4 - 13 13 13 gray5 - 13 13 13 grey5 - 15 15 15 gray6 - 15 15 15 grey6 - 18 18 18 gray7 - 18 18 18 grey7 - 20 20 20 gray8 - 20 20 20 grey8 - 23 23 23 gray9 - 23 23 23 grey9 - 26 26 26 gray10 - 26 26 26 grey10 - 28 28 28 gray11 - 28 28 28 grey11 - 31 31 31 gray12 - 31 31 31 grey12 - 33 33 33 gray13 - 33 33 33 grey13 - 36 36 36 gray14 - 36 36 36 grey14 - 38 38 38 gray15 - 38 38 38 grey15 - 41 41 41 gray16 - 41 41 41 grey16 - 43 43 43 gray17 - 43 43 43 grey17 - 46 46 46 gray18 - 46 46 46 grey18 - 48 48 48 gray19 - 48 48 48 grey19 - 51 51 51 gray20 - 51 51 51 grey20 - 54 54 54 gray21 - 54 54 54 grey21 - 56 56 56 gray22 - 56 56 56 grey22 - 59 59 59 gray23 - 59 59 59 grey23 - 61 61 61 gray24 - 61 61 61 grey24 - 64 64 64 gray25 - 64 64 64 grey25 - 66 66 66 gray26 - 66 66 66 grey26 - 69 69 69 gray27 - 69 69 69 grey27 - 71 71 71 gray28 - 71 71 71 grey28 - 74 74 74 gray29 - 74 74 74 grey29 - 77 77 77 gray30 - 77 77 77 grey30 - 79 79 79 gray31 - 79 79 79 grey31 - 82 82 82 gray32 - 82 82 82 grey32 - 84 84 84 gray33 - 84 84 84 grey33 - 87 87 87 gray34 - 87 87 87 grey34 - 89 89 89 gray35 - 89 89 89 grey35 - 92 92 92 gray36 - 92 92 92 grey36 - 94 94 94 gray37 - 94 94 94 grey37 - 97 97 97 gray38 - 97 97 97 grey38 - 99 99 99 gray39 - 99 99 99 grey39 -102 102 102 gray40 -102 102 102 grey40 -105 105 105 gray41 -105 105 105 grey41 -107 107 107 gray42 -107 107 107 grey42 -110 110 110 gray43 -110 110 110 grey43 -112 112 112 gray44 -112 112 112 grey44 -115 115 115 gray45 -115 115 115 grey45 -117 117 117 gray46 -117 117 117 grey46 -120 120 120 gray47 -120 120 120 grey47 -122 122 122 gray48 -122 122 122 grey48 -125 125 125 gray49 -125 125 125 grey49 -127 127 127 gray50 -127 127 127 grey50 -130 130 130 gray51 -130 130 130 grey51 -133 133 133 gray52 -133 133 133 grey52 -135 135 135 gray53 -135 135 135 grey53 -138 138 138 gray54 -138 138 138 grey54 -140 140 140 gray55 -140 140 140 grey55 -143 143 143 gray56 -143 143 143 grey56 -145 145 145 gray57 -145 145 145 grey57 -148 148 148 gray58 -148 148 148 grey58 -150 150 150 gray59 -150 150 150 grey59 -153 153 153 gray60 -153 153 153 grey60 -156 156 156 gray61 -156 156 156 grey61 -158 158 158 gray62 -158 158 158 grey62 -161 161 161 gray63 -161 161 161 grey63 -163 163 163 gray64 -163 163 163 grey64 -166 166 166 gray65 -166 166 166 grey65 -168 168 168 gray66 -168 168 168 grey66 -171 171 171 gray67 -171 171 171 grey67 -173 173 173 gray68 -173 173 173 grey68 -176 176 176 gray69 -176 176 176 grey69 -179 179 179 gray70 -179 179 179 grey70 -181 181 181 gray71 -181 181 181 grey71 -184 184 184 gray72 -184 184 184 grey72 -186 186 186 gray73 -186 186 186 grey73 -189 189 189 gray74 -189 189 189 grey74 -191 191 191 gray75 -191 191 191 grey75 -194 194 194 gray76 -194 194 194 grey76 -196 196 196 gray77 -196 196 196 grey77 -199 199 199 gray78 -199 199 199 grey78 -201 201 201 gray79 -201 201 201 grey79 -204 204 204 gray80 -204 204 204 grey80 -207 207 207 gray81 -207 207 207 grey81 -209 209 209 gray82 -209 209 209 grey82 -212 212 212 gray83 -212 212 212 grey83 -214 214 214 gray84 -214 214 214 grey84 -217 217 217 gray85 -217 217 217 grey85 -219 219 219 gray86 -219 219 219 grey86 -222 222 222 gray87 -222 222 222 grey87 -224 224 224 gray88 -224 224 224 grey88 -227 227 227 gray89 -227 227 227 grey89 -229 229 229 gray90 -229 229 229 grey90 -232 232 232 gray91 -232 232 232 grey91 -235 235 235 gray92 -235 235 235 grey92 -237 237 237 gray93 -237 237 237 grey93 -240 240 240 gray94 -240 240 240 grey94 -242 242 242 gray95 -242 242 242 grey95 -245 245 245 gray96 -245 245 245 grey96 -247 247 247 gray97 -247 247 247 grey97 -250 250 250 gray98 -250 250 250 grey98 -252 252 252 gray99 -252 252 252 grey99 -255 255 255 gray100 -255 255 255 grey100 -169 169 169 dark grey -169 169 169 DarkGrey -169 169 169 dark gray -169 169 169 DarkGray -0 0 139 dark blue -0 0 139 DarkBlue -0 139 139 dark cyan -0 139 139 DarkCyan -139 0 139 dark magenta -139 0 139 DarkMagenta -139 0 0 dark red -139 0 0 DarkRed -144 238 144 light green -144 238 144 LightGreen -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 16f19ace1528505ce8becffde3c1a3a24fa52ae4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Feb 18 23:27:22 2018 +0100 debian/rules: Add dh-missing --fail-missing override. --- debian/changelog | 2 ++ debian/rules | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index d5bd568..922f1f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium * debian/*: Process with wrap-and-sort -a -s -t -k -b. * debian/x2goserver-printing.postinst: + Make sure /var/spool/x2goprint is always created. + * debian/rules: + + Add dh-missing --fail-missing override. [ Mihai Moldovan ] * New upstream version (4.1.0.1): diff --git a/debian/rules b/debian/rules index 660ed23..3a6a100 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,9 @@ override_dh_auto_install: $(MAKE) -f Makefile build-arch PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh_auto_install +override_dh_missing: + dh_missing --fail-missing + override_dh_auto_clean: rm -f ChangeLog rm -Rfv x2goserver/.build_html -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit ad2a047fba9935cab1f581e8765fabb0435c2dbe Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 03:58:57 2018 +0100 x2goserver-x2goagent/Makefile: do not stage rgb file any longer. Obsoleted, is now hardcoded into nxagent directly. --- debian/changelog | 2 ++ x2goserver-x2goagent/Makefile | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 922f1f3..76f0a30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium - x2goserver/lib/x2gocheckport: remove executable flag. This file is not meant to be executed directly, but rather sourced by other X2Go shell scripts. + - x2goserver-x2goagent/Makefile: do not stage rgb file any longer. + Obsoleted, is now hardcoded into nxagent directly. * debian/{control,compat}: + Bump DH compat level to 9. * debian/: diff --git a/x2goserver-x2goagent/Makefile b/x2goserver-x2goagent/Makefile index f29e2ca..810c9b0 100755 --- a/x2goserver-x2goagent/Makefile +++ b/x2goserver-x2goagent/Makefile @@ -62,14 +62,11 @@ install_scripts: install_data: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/ - $(INSTALL_FILE) etc/rgb $(DESTDIR)$(SHAREDIR)/ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/../pixmaps/ $(INSTALL_FILE) share/pixmaps/x2go.xpm $(DESTDIR)$(SHAREDIR)/../pixmaps/ - $(INSTALL_SYMLINK) $(ETCDIR)/rgb $(DESTDIR)$(SHAREDIR)/ install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/ - $(INSTALL_FILE) etc/rgb $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) etc/x2goagent.options $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) etc/x2goagent.keyboard $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)$(ETCDIR)/ @@ -93,7 +90,7 @@ uninstall_scripts: for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_data: - cd share && for file in pixmaps/x2go.xpm x2go/rgb; do \ + cd share && for file in pixmaps/x2go.xpm; do \ $(RM_FILE) $(DESTDIR)$(SHAREDIR)/../$$file; \ $(RM_DIR) $(shell dirname $(DESTDIR)$(SHAREDIR)/../$$file); \ done -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit e219bd0f1dbd0f33e0b94f8bf53bd19082c8263a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 19 00:12:52 2018 +0100 debian/: drop inert file (due to wrong file suffix): debian/x2goserver.link. --- debian/changelog | 2 ++ debian/x2goserver.link | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2713e94..40322fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium * debian/*.{install,manpages}: + Utilize install target rather than picking all files from the source tree ourselves. + * debian/: + + Drop inert file (due to wrong file suffix): debian/x2goserver.link. [ Mihai Moldovan ] * New upstream version (4.1.0.1): diff --git a/debian/x2goserver.link b/debian/x2goserver.link deleted file mode 100644 index 8722bcf..0000000 --- a/debian/x2goserver.link +++ /dev/null @@ -1,2 +0,0 @@ -# compatibility -/usr/bin/x2goumount-session /usr/bin/x2goumount_session \ No newline at end of file -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 6cb608171ef48fe7e8361e126cf1d4dffb4a5241 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 08:44:31 2018 +0100 debian/x2goserver*{pre,post}*: rework scriptlets, use updated templates, add missing templates, more and better quoting, fix other misc. errors within the scripts. --- debian/changelog | 3 ++ debian/x2goserver-common.postinst | 60 +++++++++++++++---------------- debian/x2goserver-common.postrm | 21 ++++++----- debian/x2goserver-common.preinst | 15 ++++---- debian/x2goserver-fmbindings.postinst | 17 ++++----- debian/x2goserver-fmbindings.postrm | 14 ++++---- debian/x2goserver-printing.postinst | 68 +++++++++++++++++------------------ debian/x2goserver-printing.postrm | 26 +++++++------- debian/x2goserver-x2goagent.postinst | 23 ++++++++++-- debian/x2goserver-x2goagent.postrm | 23 ++++++++++-- debian/x2goserver-x2goagent.preinst | 21 +++++++++-- debian/x2goserver.postinst | 51 ++++++++++++-------------- debian/x2goserver.postrm | 32 ++++++++--------- debian/x2goserver.preinst | 16 ++++----- debian/x2goserver.prerm | 29 +++++++-------- 15 files changed, 229 insertions(+), 190 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ce8157..713491f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,9 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium available. * debian/x2goserver-x2goagent.{{pre,post}inst,postrm}: + Handle /etc/x2go/rgb conffile removal gracefully. + * debian/x2goserver*{pre,post}*: + + Rework scriptlets, use updated templates, add missing templates, more + and better quoting, fix other misc. errors within the scripts. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 23:14:28 +0100 diff --git a/debian/x2goserver-common.postinst b/debian/x2goserver-common.postinst index 03fb701..6f77ddf 100755 --- a/debian/x2goserver-common.postinst +++ b/debian/x2goserver-common.postinst @@ -17,54 +17,52 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package -case "$1" in - configure) - +case "${1}" in + 'configure') ### ### setup X2Go user account (needed for session database) ### # setup x2gouser and group - if ! getent group x2gouser >/dev/null; then - echo "Creating x2gouser group." >&2 - addgroup --system x2gouser + if ! getent 'group' 'x2gouser' >'/dev/null'; then + echo 'Creating x2gouser group.' >&2 + addgroup --system 'x2gouser' else - echo "Group x2gouser already exists." >&2 + echo 'Group x2gouser already exists.' >&2 fi - if ! getent passwd x2gouser >/dev/null; then - echo "Creating x2gouser user." >&2 + + if ! getent 'passwd' 'x2gouser' >'/dev/null'; then + echo 'Creating x2gouser user.' >&2 adduser --system --no-create-home \ --disabled-password --disabled-login \ - --shell /bin/false --group --home /var/lib/x2go x2gouser - - # make sure the home directory belongs to x2gouser:x2gouser - chown x2gouser:x2gouser /var/lib/x2go -Rf + --shell '/bin/false' --group --home '/var/lib/x2go' 'x2gouser' else - echo "User x2gouser already exists." >&2 + echo 'User x2gouser already exists.' >&2 # make sure all settings are appropriate - if [ "`id -gn x2gouser`" != "x2gouser" ]; then - usermod --gid x2gouser x2gouser - test -d /var/lib/x2go && \ - usermod --home /var/lib/x2go x2gouser || \ - usermod --move-home --home /var/lib/x2go x2gouser + if [ "$(id -gn 'x2gouser')" != 'x2gouser' ]; then + usermod --gid 'x2gouser' 'x2gouser' fi - if [ "`ls -1d ~x2gouser`" != "/var/lib/x2go" ]; then - usermod --move-home --home /var/lib/x2go x2gouser + + if [ "$(getent 'passwd' 'x2gouser' | cut -d ':' -f '7')" != '/var/lib/x2go' ]; then + if [ -d '/var/lib/x2go' ]; then + usermod --home '/var/lib/x2go' 'x2gouser' + else + usermod --move-home --home '/var/lib/x2go' 'x2gouser' + fi fi + # we leave user shell alone. we have never set this wrongly # and we need to respect the administrator's choices - - # make sure the home directory belongs to x2gouser:x2gouser - chown x2gouser:x2gouser /var/lib/x2go -Rf fi - ;; - abort-upgrade|abort-remove|abort-deconfigure) + # make sure the home directory belongs to x2gouser:x2gouser + chown -Rf 'x2gouser:x2gouser' '/var/lib/x2go' + ;; + 'abort-upgrade'|'abort-remove'|'abort-deconfigure') ;; - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 + echo "postinst called with unknown argument \`${1}'" >&2 + exit '1' ;; esac @@ -73,6 +71,4 @@ esac #DEBHELPER# -exit 0 - - +exit '0' diff --git a/debian/x2goserver-common.postrm b/debian/x2goserver-common.postrm index 1644a21..f57e911 100755 --- a/debian/x2goserver-common.postrm +++ b/debian/x2goserver-common.postrm @@ -15,20 +15,19 @@ set -e -case "$1" in - purge) - getent passwd x2gouser >/dev/null && deluser x2gouser - getent group x2gouser >/dev/null && delgroup x2gouser - getent group x2gousers >/dev/null && delgroup x2gousers - - rmdir --ignore-fail-on-non-empty /etc/x2go +case "${1}" in + 'purge') + getent 'passwd' 'x2gouser' >'/dev/null' && deluser 'x2gouser' + getent 'group' 'x2gouser' >'/dev/null' && delgroup 'x2gouser' + getent 'group' 'x2gousers' >'/dev/null' && delgroup 'x2gousers' + rmdir --ignore-fail-on-non-empty '/etc/x2go' ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') ;; *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 0 + echo "postrm called with unknown argument \`${1}'" >&2 + exit '0' ;; esac @@ -37,4 +36,4 @@ esac #DEBHELPER# -exit 0 \ No newline at end of file +exit '0' diff --git a/debian/x2goserver-common.preinst b/debian/x2goserver-common.preinst index 0638c70..166f891 100755 --- a/debian/x2goserver-common.preinst +++ b/debian/x2goserver-common.preinst @@ -17,19 +17,18 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package - -case "$1" in - install|upgrade) - if getent group x2gousers >/dev/null; then +case "${1}" in + 'install'|'upgrade') + if getent 'group' 'x2gousers' >'/dev/null'; then echo "The group ,,x2gousers'' is no longer used by X2Go and can be" echo "removed as soon as no users are members of this group anymore." fi ;; - abort-upgrade) + 'abort-upgrade') ;; *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 + echo "preinst called with unknown argument \`${1}'" >&2 + exit '1' ;; esac @@ -38,6 +37,6 @@ esac #DEBHELPER# -exit 0 +exit '0' diff --git a/debian/x2goserver-fmbindings.postinst b/debian/x2goserver-fmbindings.postinst index b64235f..25c9093 100755 --- a/debian/x2goserver-fmbindings.postinst +++ b/debian/x2goserver-fmbindings.postinst @@ -17,19 +17,16 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package - -case "$1" in - configure) +case "${1}" in + 'configure') update-desktop-database - update-mime-database /usr/share/mime + update-mime-database '/usr/share/mime' ;; - - abort-upgrade|abort-remove|abort-deconfigure) + 'abort-upgrade'|'abort-remove'|'abort-deconfigure') ;; - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 + echo "postinst called with unknown argument \`${1}'" >&2 + exit '1' ;; esac @@ -38,4 +35,4 @@ esac #DEBHELPER# -exit 0 +exit '0' diff --git a/debian/x2goserver-fmbindings.postrm b/debian/x2goserver-fmbindings.postrm index f3b3c83..7d3c3e0 100755 --- a/debian/x2goserver-fmbindings.postrm +++ b/debian/x2goserver-fmbindings.postrm @@ -18,16 +18,14 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) +case "${1}" in + 'purge'|'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') update-desktop-database - update-mime-database /usr/share/mime + update-mime-database '/usr/share/mime' ;; - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 + echo "postrm called with unknown argument \`${1}'" >&2 + exit '1' ;; esac @@ -36,4 +34,4 @@ esac #DEBHELPER# -exit 0 +exit '0' diff --git a/debian/x2goserver-printing.postinst b/debian/x2goserver-printing.postinst index 6f72bf9..2977564 100755 --- a/debian/x2goserver-printing.postinst +++ b/debian/x2goserver-printing.postinst @@ -17,69 +17,69 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package - -case "$1" in - configure) +case "${1}" in + 'configure') ### ### X2Go printing ### # setup x2goprint user and x2goprint group - if ! getent group x2goprint >/dev/null; then - echo "Creating x2goprint group." >&2 - addgroup --system x2goprint + if ! getent 'group' 'x2goprint' >'/dev/null'; then + echo 'Creating x2goprint group.' >&2 + addgroup --system 'x2goprint' else - echo "Group x2goprint already exists." >&2 + echo 'Group x2goprint already exists.' >&2 fi - if ! getent passwd x2goprint >/dev/null; then - echo "Creating x2goprint user." >&2 + + if ! getent 'passwd' 'x2goprint' >'/dev/null'; then + echo 'Creating x2goprint user.' >&2 adduser --system \ --disabled-password --disabled-login \ - --shell /bin/sh --group --home /var/spool/x2goprint x2goprint + --shell '/bin/sh' --group --home '/var/spool/x2goprint' 'x2goprint' else # make sure the home dir exists... - mkdir -p /var/spool/x2goprint/ + mkdir -p '/var/spool/x2goprint/' - echo "User x2goprint already exists." >&2 + echo 'User x2goprint already exists.' >&2 # make sure all settings are appropriate - if [ "`id -gn x2goprint`" != "x2goprint" ]; then - usermod --gid x2goprint x2goprint + if [ "$(id -gn 'x2goprint')" != 'x2goprint' ]; then + usermod --gid 'x2goprint' 'x2goprint' fi - if getent passwd x2goprint | egrep -v ".*:x:.*:.*:.*:.*:/bin/sh" 1>/dev/null 2>/dev/null; then - usermod --shell /bin/sh x2goprint + + if [ "$(getent 'passwd' 'x2goprint' | cut -d ':' -f '7')" != '/bin/sh' ]; then + usermod --shell '/bin/sh' 'x2goprint' fi - if [ "`ls -1d ~x2goprint`" != "/var/spool/x2goprint" ]; then - if [ -d "/var/spool/x2goprint" ]; then - usermod --home /var/spool/x2goprint x2goprint + + if [ "$(getent 'passwd' 'x2goprint' | cut -d ':' -f '6')" != '/var/spool/x2goprint' ]; then + if [ -d '/var/spool/x2goprint' ]; then + usermod --home '/var/spool/x2goprint' 'x2goprint' else - usermod --move-home --home /var/spool/x2goprint x2goprint + usermod --move-home --home '/var/spool/x2goprint' 'x2goprint' fi fi - # we leave user shell alone. we have never set this wrongly - # and we need to respect the administrator's choices - fi # make sure x2goprint spool dir permissions are set correctly - chown -R x2goprint:x2goprint /var/spool/x2goprint + chown -R 'x2goprint:x2goprint' '/var/spool/x2goprint' + # egid x2goprint needs write access to the spool dir - chmod 0700 /var/spool/x2goprint + chmod '0700' '/var/spool/x2goprint' # we may be upgrading versions of x2goserver that had # /usr/bin/x2goprint set to setuid x2goprint. - if dpkg-statoverride --list /usr/bin/x2goprint >/dev/null; then - dpkg-statoverride --remove /usr/bin/x2goprint - chown root:root /usr/bin/x2goprint - chmod 0755 /usr/bin/x2goprint + if dpkg-statoverride --list '/usr/bin/x2goprint' >'/dev/null'; then + dpkg-statoverride --remove '/usr/bin/x2goprint' + chown 'root:root' '/usr/bin/x2goprint' + chmod '0755' '/usr/bin/x2goprint' fi ;; - abort-upgrade|abort-remove|abort-deconfigure) + 'abort-upgrade'|'abort-remove'|'abort-deconfigure') ;; *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 + echo "postinst called with unknown argument \`${1}'" >&2 + exit '1' ;; esac @@ -88,6 +88,4 @@ esac #DEBHELPER# -exit 0 - - +exit '0' diff --git a/debian/x2goserver-printing.postrm b/debian/x2goserver-printing.postrm index 16b0f1e..171be49 100755 --- a/debian/x2goserver-printing.postrm +++ b/debian/x2goserver-printing.postrm @@ -1,6 +1,8 @@ #! /bin/sh # postrm script for x2goserver-printing -# + +set -e + # see: dh_installdeb(1) # summary of how this script can be called: # * <postrm> `remove' @@ -10,22 +12,20 @@ # * <new-postrm> `abort-install' # * <new-postrm> `abort-install' <old-version> # * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> # for details, see /usr/share/doc/packaging-manual/ -set -e - - -case "$1" in - purge) - getent passwd x2goprint >/dev/null && deluser x2goprint - getent group x2goprint >/dev/null && delgroup x2goprint +case "${1}" in + 'purge') + getent 'passwd' 'x2goprint' >'/dev/null' && deluser 'x2goprint' + getent 'group' 'x2goprint' >'/dev/null' && delgroup 'x2goprint' ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') ;; *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 0 + echo "postrm called with unknown argument \`${1}'" >&2 + exit '0' ;; esac @@ -34,4 +34,4 @@ esac #DEBHELPER# -exit 0 \ No newline at end of file +exit '0' diff --git a/debian/x2goserver-x2goagent.postinst b/debian/x2goserver-x2goagent.postinst index 36bf948..318da93 100755 --- a/debian/x2goserver-x2goagent.postinst +++ b/debian/x2goserver-x2goagent.postinst @@ -1,8 +1,27 @@ #!/bin/sh +# postinst script for x2goserver-x2goagent set -e -dpkg-maintscript-helper rm_conffile \ - /etc/x2go/rgb "4.1.0.0-999" x2goserver-x2goagent -- "${@}" +# see: dh_installdeb(1) +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +dpkg-maintscript-helper 'rm_conffile' \ + '/etc/x2go/rgb' '4.1.0.0-999' 'x2goserver-x2goagent' -- "${@}" + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. #DEBHELPER# + +exit '0' diff --git a/debian/x2goserver-x2goagent.postrm b/debian/x2goserver-x2goagent.postrm index 36bf948..7e91211 100755 --- a/debian/x2goserver-x2goagent.postrm +++ b/debian/x2goserver-x2goagent.postrm @@ -1,8 +1,27 @@ #!/bin/sh +# postrm script for x2goserver-x2goagent set -e -dpkg-maintscript-helper rm_conffile \ - /etc/x2go/rgb "4.1.0.0-999" x2goserver-x2goagent -- "${@}" +# see: dh_installdeb(1) +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see /usr/share/doc/packaging-manual/ + +dpkg-maintscript-helper 'rm_conffile' \ + '/etc/x2go/rgb' '4.1.0.0-999' 'x2goserver-x2goagent' -- "${@}" + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. #DEBHELPER# + +exit '0' diff --git a/debian/x2goserver-x2goagent.preinst b/debian/x2goserver-x2goagent.preinst index 36bf948..ef6a7e0 100755 --- a/debian/x2goserver-x2goagent.preinst +++ b/debian/x2goserver-x2goagent.preinst @@ -1,8 +1,25 @@ #!/bin/sh +# preinst script for x2goserver-x2goagent set -e -dpkg-maintscript-helper rm_conffile \ - /etc/x2go/rgb "4.1.0.0-999" x2goserver-x2goagent -- "${@}" +# see: dh_installdeb(1) +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +dpkg-maintscript-helper 'rm_conffile' \ + '/etc/x2go/rgb' '4.1.0.0-999' 'x2goserver-x2goagent' -- "${@}" + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. #DEBHELPER# + +exit '0' diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 684eff4..b7f64e4 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -6,7 +6,7 @@ set -e # Source debconf library. -. /usr/share/debconf/confmodule +. '/usr/share/debconf/confmodule' # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> @@ -20,41 +20,39 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package - -case "$1" in - configure) - - ### cleaning ab setgid stuff of older versions of package x2goserver +case "${1}" in + 'configure') + ### cleaning up setgid stuff of older versions of package x2goserver # we may be upgrading from versions of x2goserver that had # /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid x2gouser. This script is # not at that location anymore, we clear the dpkg-statoverride entry. - if dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper.pl >/dev/null; then - dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper.pl + if dpkg-statoverride --list '/usr/lib/x2go/x2gosqlitewrapper.pl' >'/dev/null'; then + dpkg-statoverride --remove '/usr/lib/x2go/x2gosqlitewrapper.pl' fi # we may be upgrading from versions of x2goserver that had # /usr/bin/x2gosqlitewrapper set to setuid or setgid x2gouser, the script itself is not # at this location anymore, we just clear the dpkg-statoverride config entry. - if dpkg-statoverride --list /usr/bin/x2gosqlitewrapper >/dev/null; then - dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper + if dpkg-statoverride --list '/usr/bin/x2gosqlitewrapper' >'/dev/null'; then + dpkg-statoverride --remove '/usr/bin/x2gosqlitewrapper' fi # we may be upgrading from versions of x2goserver that had # /usr/lib/x2go/x2gosqlitewrapper set to setgid x2gouser, the script itself is not # at this location anymore, we just clear the dpkg-statoverride config entry. - if dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper >/dev/null; then - dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper + if dpkg-statoverride --list '/usr/lib/x2go/x2gosqlitewrapper' >'/dev/null'; then + dpkg-statoverride --remove '/usr/lib/x2go/x2gosqlitewrapper' fi # sudoers.d files have to be installed 0440:root:root - if ! dpkg-statoverride --list /etc/sudoers.d/x2goserver >/dev/null; then - dpkg-statoverride --add --update root root 0440 /etc/sudoers.d/x2goserver + if ! dpkg-statoverride --list '/etc/sudoers.d/x2goserver' >'/dev/null'; then + dpkg-statoverride --add --update 'root' 'root' '0440' '/etc/sudoers.d/x2goserver' fi # create /etc/x2go/applications symlink if not already there (as link or as dir) - if ! test -e /etc/x2go/applications; then - ln -s /usr/share/applications /etc/x2go/applications + if ! test -e '/etc/x2go/applications'; then + ln -s '/usr/share/applications' '/etc/x2go/applications' fi # Setup up SQLite3 database, do nothing if PostgeSQL is already configured @@ -63,29 +61,26 @@ case "$1" in # It will only succeed if both packages are installed. As we cannot influence the # installation order, we handle the session DB creation in both packages. One of # then should succeed. - if [ -f /etc/x2go/x2gosql/sql ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null; then - if [ ! -f /var/lib/x2go/x2go_sessions ]; then + if [ -f '/etc/x2go/x2gosql/sql' ] && grep -Eq '^backend=sqlite.*' '/etc/x2go/x2gosql/sql' >'/dev/null'; then + if [ ! -f '/var/lib/x2go/x2go_sessions' ]; then x2godbadmin --createdb else # make sure db permissions are set correctly - chown -R root:x2gouser /var/lib/x2go + chown -R 'root:x2gouser' '/var/lib/x2go' # egid x2gouser needs write access to the db dir (for temporary db journal file) - chmod 0770 /var/lib/x2go + chmod '0770' '/var/lib/x2go' # ... and to the db file itself, of course - chmod 0660 /var/lib/x2go/x2go_sessions + chmod '0660' '/var/lib/x2go/x2go_sessions' fi else echo "X2Go is configured to use a non-SQLite DB backend, leaving the database alone." fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) + 'abort-upgrade'|'abort-remove'|'abort-deconfigure') ;; - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 + echo "postinst called with unknown argument \`${1}'" >&2 + exit '1' ;; esac @@ -94,4 +89,4 @@ esac #DEBHELPER# -exit 0 +exit '0' diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm index 7b1b3a4..32f6646 100755 --- a/debian/x2goserver.postrm +++ b/debian/x2goserver.postrm @@ -1,6 +1,8 @@ #! /bin/sh # postrm script for x2goserver -# + +set -e + # see: dh_installdeb(1) # summary of how this script can be called: # * <postrm> `remove' @@ -10,27 +12,25 @@ # * <new-postrm> `abort-install' # * <new-postrm> `abort-install' <old-version> # * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> +# * <disappearer's-postrm> `disappear' <overwriter>i +# <overwriter-version> # for details, see /usr/share/doc/packaging-manual/ -set -e - - -case "$1" in - purge) - if dpkg-statoverride --list /etc/sudoers.d/x2goserver >/dev/null; then - dpkg-statoverride --remove /etc/sudoers.d/x2goserver +case "${1}" in + 'purge') + if dpkg-statoverride --list '/etc/sudoers.d/x2goserver' >'/dev/null'; then + dpkg-statoverride --remove '/etc/sudoers.d/x2goserver' fi - rm -Rf /etc/x2go/applications - rm -Rf /etc/x2go/x2go_logout.d - rmdir --ignore-fail-on-non-empty /etc/x2go + rm -Rf '/etc/x2go/applications' + rm -Rf '/etc/x2go/x2go_logout.d' + rmdir --ignore-fail-on-non-empty '/etc/x2go' ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') ;; *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 0 + echo "postrm called with unknown argument \`${1}'" >&2 + exit '0' ;; esac @@ -39,4 +39,4 @@ esac #DEBHELPER# -exit 0 +exit '0' diff --git a/debian/x2goserver.preinst b/debian/x2goserver.preinst index 69f32fd..8fd3ef3 100755 --- a/debian/x2goserver.preinst +++ b/debian/x2goserver.preinst @@ -14,16 +14,16 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package -case "$1" in - install|upgrade) +case "${1}" in + 'install'|'upgrade') # cleanup old x2goserver installations - rm -Rfv /var/db/x2go/ + rm -Rfv '/var/db/x2go/' ;; - abort-upgrade) + 'abort-upgrade') ;; *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 + echo "preinst called with unknown argument \`${1}'" >&2 + exit '1' ;; esac @@ -32,6 +32,4 @@ esac #DEBHELPER# -exit 0 - - +exit '0' diff --git a/debian/x2goserver.prerm b/debian/x2goserver.prerm index d37c0ad..99ebc5f 100755 --- a/debian/x2goserver.prerm +++ b/debian/x2goserver.prerm @@ -1,6 +1,8 @@ #! /bin/sh # prerm script for x2goserver -# + +set -e + # see: dh_installdeb(1) # summary of how this script can be called: # * <prerm> `remove' @@ -8,26 +10,25 @@ # * <new-prerm> `failed-upgrade' <old-version> # * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> # * <deconfigured's-prerm> `deconfigure' `in-favour' -# <package-being-installed> <version> `removing' -# <conflicting-package> <version> +# <package-being-installed> <version> `removing' +# <conflicting-package> <version> # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package -set -e - - -case "$1" in - remove) +case "${1}" in + 'remove') # The package is being removed in its own right. - if test -L /etc/x2go/applications; then - rm -f /etc/x2go/applications + if test -L '/etc/x2go/applications'; then + rm -f '/etc/x2go/applications' fi ;; - deconfigure|upgrade|failed-upgrade) + 'deconfigure'|'upgrade'|'failed-upgrade') : ;; - *) echo "$0: didn't understand being called with \`$1'" 1>&2 - exit 1;; + *) + echo "${0}: didn't understand being called with \`${1}'" 1>&2 + exit '1' + ;; esac # dh_installdeb will replace this with shell code automatically @@ -35,4 +36,4 @@ esac #DEBHELPER# -exit 0 +exit '0' -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit dfc7523c82b29ee9618b2af76c5a6f15207b4d18 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 08:49:28 2018 +0100 debian/rules: enable hardening and automatic passing of *FLAGS. --- debian/changelog | 2 ++ debian/rules | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 99e433b..1cfc3d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -76,6 +76,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium * debian/x2goserver*{pre,post}*: + Rework scriptlets, use updated templates, add missing templates, more and better quoting, fix other misc. errors within the scripts. + * debian/rules: + + Enable hardening and automatic passing of *FLAGS. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 23:14:28 +0100 diff --git a/debian/rules b/debian/rules index 3a6a100..08a8f16 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,10 @@ export NXLIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/nx" +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + %: PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh ${@} --with=systemd || PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh ${@} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit c72143def82d6c3587e8c20b3ab1d89a5c694ac2 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 09:25:29 2018 +0100 debian/control: pull in other changes from Debian downstream. --- debian/changelog | 1 + debian/control | 111 +++++++++++++++++++++++++++++-------------------------- 2 files changed, 60 insertions(+), 52 deletions(-) diff --git a/debian/changelog b/debian/changelog index 189b936..25b8872 100644 --- a/debian/changelog +++ b/debian/changelog @@ -72,6 +72,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium + Pre-Depend on new enough dpkg for the dpkg-maintscript-helper to be available. + Change http to https links. + + Pull in other changes from Debian downstream. * debian/x2goserver-x2goagent.{{pre,post}inst,postrm}: + Handle /etc/x2go/rgb conffile removal gracefully. * debian/x2goserver*{pre,post}*: diff --git a/debian/control b/debian/control index 8c674cd..842311f 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,9 @@ Uploaders: Mihai Moldovan <ionic@ionic.de>, Build-Depends: debhelper (>= 9~), + dpkg-dev (>= 1.16.1.1), dh-systemd | hello, - man2html-base | man2html, + man2html-base, Standards-Version: 3.9.6 Homepage: https://code.x2go.org/releases/source/x2goserver Vcs-Git: git://code.x2go.org/x2goserver.git @@ -27,10 +28,12 @@ Depends: libtry-tiny-perl, libx2go-server-perl (<< ${source:Version}.1~), libx2go-server-perl (>= ${source:Version}), + lsb-base, lsof, net-tools, openssh-client, openssh-server, + perl, psmisc, pwgen, x2goserver-common (<< ${source:Version}.1~), @@ -41,6 +44,7 @@ Depends: xfonts-base, xkb-data, ${misc:Depends}, + ${shlibs:Depends}, Recommends: fontconfig, sshfs, @@ -73,17 +77,18 @@ Replaces: x2goserver-home, x2goserver-one, x2goserver-pyhoca, -Description: X2Go server daemon scripts +Description: X2Go server X2Go is a server based computing environment with - session resuming - low bandwidth support - session brokerage support - - client side mass storage mounting support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . - This package contains the main daemon and tools for - X2Go server-side session administrations. + This package contains the main daemon and tools for X2Go server-side + session administrations. Package: libx2go-log-perl Architecture: all @@ -98,7 +103,8 @@ Description: Perl X2Go::Log package - session resuming - low bandwidth support - session brokerage support - - client side mass storage mounting support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . @@ -127,7 +133,8 @@ Description: Perl X2Go::Server:DB package - session resuming - low bandwidth support - session brokerage support - - client side mass storage mounting support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . @@ -152,7 +159,8 @@ Description: Perl X2Go::Server package - session resuming - low bandwidth support - session brokerage support - - client side mass storage mounting support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . @@ -191,16 +199,14 @@ Description: X2Go Server (extension support) - session resuming - low bandwidth support - session brokerage support - - client side mass storage mounting support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . - The X2Go Server extension namespace offers contributors - to add script functionality to X2Go. - . - Make sure you have this package installed on your server - if you want X2Go clients to be able to access your server - without lack of features. + The X2Go server extension namespace offers contributors to add script + functionality to X2Go that is not needed/ignored by the legacy X2Go + client (x2goclient). Package: x2goserver-fmbindings Architecture: all @@ -215,21 +221,22 @@ Description: X2Go Server (file manager bindings) - session resuming - low bandwidth support - session brokerage support - - client side mass storage mounting support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . - This package contains generic MIME type information - for X2Go's local folder sharing. It can be used with all - freedesktop.org compliant desktop shells. + x2goserver-fmbindings contains generic MIME type information for X2Go's + local folder sharing. It can be used with all freedesktop.org compliant + desktop shells. . - However, this package will be superseded by other, more specific - destkop binding components, if installed and being used with the - corresponding desktop shell: + However, this package will be superseded by other, more specific destkop + binding components, if installed and being used with the corresponding + desktop shell: - under LXDE by x2golxdebindings - under GNOMEv2 by x2gognomebindings - - under KDE4 by plasma-widget-x2go - under MATE by x2gomatebindings + - under KDE4/5 by plasma-widget-x2go Package: x2goserver-printing Architecture: all @@ -249,25 +256,24 @@ Description: X2Go server (printing support) - session resuming - low bandwidth support - session brokerage support - - client side mass storage mounting support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . - The X2Go Server printing package provides - client-side printing support for X2Go. + The X2Go Server printing package provides client-side printing support + for X2Go. . - This package has to be installed on X2Go Servers - that shall be able to pass X2Go print jobs on - to the X2Go client. + This package has to be installed on X2Go Servers that shall be able to + pass X2Go print jobs on to the X2Go client. . - This package co-operates with the cups-x2go CUPS - backend. If CUPS server and X2Go Server are hosted - on different machines, then make sure you install - this package on the X2Go Server/s (and the cups-x2go - package on the CUPS server). + This package co-operates with the cups-x2go CUPS backend. If CUPS server + and X2Go Server are hosted on different machines, then make sure you + install this package on the X2Go Server/s (and the cups-x2go package on + the CUPS server). Package: x2goserver-x2goagent -Architecture: all +Architecture: any Pre-Depends: dpkg (>= 1.15.7.2), Depends: @@ -277,24 +283,25 @@ Suggests: x2goserver, Breaks: x2goagent (<< 2:3.5.99.2~), - x2goserver (<< 4.0.1.20~), + x2goserver (<< 4.0.1.99~), Replaces: x2goagent (<< 2:3.5.99.2~), - x2goserver (<< 4.0.1.20~), + x2goserver (<< 4.0.1.99~), Description: X2Go Server's X2Go Agent X2Go is a software suite that uses NX technology for remote desktop computing. . - NX technology implements a very efficient compression of the X11 protocol. - This increases performance when using X applications over a network, - especially a slow one. + NX technology implements a very efficient compression of the X11 + protocol. This increases performance when using X applications over a + network, especially a slow one. . - X2Go agent functionality has been completely incorporated into NX agent's - code base. If the nxagent binary is executed under the name of `x2goagent', - the X2Go functionalities get activated. + X2Go agent functionality has been completely incorporated into NX + agent's code base. If the nxagent binary is executed under the name of + `x2goagent', the X2Go functionalities get activated. . - The x2goagent package is a wrapper that activates X2Go branding in nxagent. - Please refer to the nxagent package's description for more information on NX. + This package is a wrapper that activates X2Go branding in nxagent. + Please refer to the nxagent package's description for more information + on NX. Package: x2goserver-xsession Architecture: all @@ -310,14 +317,14 @@ Description: X2Go Server (Xsession runner) - session resuming - low bandwidth support - session brokerage support - - client side mass storage mounting support + - client-side mass storage mounting support + - client-side printing support - audio support - authentication by smartcard and USB stick . - This X2Go Server add-on enables Xsession script handling - when starting desktop sessions with X2Go. + This X2Go Server add-on enables Xsession script handling when starting + desktop sessions with X2Go. . - Amongst others the parsing of Xsession scripts will - enable desktop-profiles, ssh-agent startups, gpgagent - startups and many more Xsession related features on - X2Go session login automagically. + Amongst others the parsing of Xsession scripts will enable + desktop-profiles, ssh-agent startups, gpgagent startups and many more + Xsession related features on X2Go session login automagically. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 2266324aed2de564a3576f0ae0b90988a6e5d49c Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 06:33:13 2018 +0100 debian/x2goserver.dirs: remove all other obsolete entries that should be handled by the main Makefile and x2goserver.install staging. --- debian/changelog | 2 ++ debian/x2goserver.dirs | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1ab5074..2713e94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium * debian/x2goserver.dirs: + Remove etc/x2go/x2gosql references, already handled by x2goserver-common. + + Remove all other obsolete entries that should be handled by the main + Makefile and x2goserver.install staging. * debian/control: + Bump versioned dependency upon nxagent for x2goserver-x2goagent to the first version that hardcoded the RGB file into nxagent. diff --git a/debian/x2goserver.dirs b/debian/x2goserver.dirs index 873ab36..d9fc4f7 100644 --- a/debian/x2goserver.dirs +++ b/debian/x2goserver.dirs @@ -1,6 +1 @@ -usr/bin -usr/lib/x2go -usr/sbin -usr/share/x2go -usr/share/x2go/versions var/lib/x2go -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 0547dffe336d11eb897c5d87282d44488361b2a4 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 06:12:25 2018 +0100 debian/control: bump versioned dependency upon nxagent for x2goserver-x2goagent to the first version that hardcoded the RGB file into nxagent. --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e7e662f..40ccfda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,9 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium * debian/x2goserver.dirs: + Remove etc/x2go/x2gosql references, already handled by x2goserver-common. + * debian/control: + + Bump versioned dependency upon nxagent for x2goserver-x2goagent to the + first version that hardcoded the RGB file into nxagent. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 23:14:28 +0100 diff --git a/debian/control b/debian/control index 963bb40..03cb34c 100644 --- a/debian/control +++ b/debian/control @@ -269,7 +269,7 @@ Description: X2Go server (printing support) Package: x2goserver-x2goagent Architecture: all Depends: - nxagent (>= 2:3.5.99.3~), + nxagent (>= 2:3.5.99.5~), ${misc:Depends}, Suggests: x2goserver, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit fd3ad299b590f22b3f2f8d63bbe865688143fcbc Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 20 09:28:32 2018 +0100 debian/: remove obsolete x2goserver-fmbindings.dirs file. --- debian/changelog | 1 + debian/x2goserver-fmbindings.dirs | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25b8872..8b3191b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium + Remove obsolete x2goserver-{extensions,printing,xsession}.dirs files, should be correctly handled via the main Makefile and staging by *.install files. + + Remove obsolete x2goserver-fmbindings.dirs file. * debian/x2goserver-x2goagent.install: + Do not install rgb file/symlink any longer. * x2goserver.spec: diff --git a/debian/x2goserver-fmbindings.dirs b/debian/x2goserver-fmbindings.dirs deleted file mode 100644 index 45adc59..0000000 --- a/debian/x2goserver-fmbindings.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/x2go -usr/share/x2go/versions -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git